diff --git a/.eslintrc.normal.js b/.eslintrc.normal.js
index ea55de2a3cdf3..5768fca228ddf 100644
--- a/.eslintrc.normal.js
+++ b/.eslintrc.normal.js
@@ -125,7 +125,7 @@ module.exports = {
 
 		// JSDoc plugin overrides
 		'jsdoc/check-alignment': 1, // Recommended
-		'jsdoc/check-examples': 1,
+		'jsdoc/check-examples': 0, // See https://github.com/eslint/eslint/issues/14745
 		'jsdoc/check-indentation': 1,
 		'jsdoc/check-param-names': 1, // Recommended
 		'jsdoc/check-syntax': 1,
diff --git a/.github/files/build-all-projects.sh b/.github/files/build-all-projects.sh
index 51aa0f84d82b1..e1c365ec80933 100755
--- a/.github/files/build-all-projects.sh
+++ b/.github/files/build-all-projects.sh
@@ -30,7 +30,7 @@ echo "::group::Changelogger setup"
 echo "::endgroup::"
 
 echo "::group::Determining build order"
-TMP="$(tools/get-build-order.php)"
+TMP="$(pnpx jetpack dependencies build-order --pretty --ignore-root)"
 SLUGS=()
 mapfile -t SLUGS <<<"$TMP"
 echo "::endgroup::"
@@ -79,7 +79,7 @@ for SLUG in "${SLUGS[@]}"; do
 			OLDLOCK=
 		fi
 	fi
-	if (cd $BASE && pnpx jetpack build "${SLUG}" -v --production); then
+	if (cd $BASE && pnpx jetpack build "${SLUG}" -v --production --timing --no-pnpm-install); then
 		FAIL=false
 	else
 		FAIL=true
@@ -190,7 +190,7 @@ for SLUG in "${SLUGS[@]}"; do
 		# Copy the resulting list of files into the clone.
 		xargs cp --parents --target-directory="$BUILD_DIR"
 
-	if [[ "$SLUG" == "plugins/jetpack" ]]; then
+	if [[ "$SLUG" == "plugins/jetpack" || "$SLUG" == "plugins/backup" ]]; then
 		echo "::group::Copying Jetpack files for backward compatibility."
 
 		OLD_VENDOR_DIR="$BUILD_DIR/vendor"
diff --git a/.github/files/create-e2e-projects-matrix.sh b/.github/files/create-e2e-projects-matrix.sh
new file mode 100755
index 0000000000000..43706bfd34fc6
--- /dev/null
+++ b/.github/files/create-e2e-projects-matrix.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -eo pipefail
+
+PROJECTS=('{"project":"Jetpack","path":"projects/plugins/jetpack/tests/e2e","testArgs":[],"slackArgs":[]}' '{"project":"Boost","path":"projects/plugins/boost/tests/e2e","testArgs":[],"slackArgs":[]}')
+PROJECTS_MATRIX=()
+RUN_NAME=''
+
+if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "push" ]]; then
+	CHANGED_PROJECTS="$(.github/files/list-changed-projects.sh)"
+
+	for PROJECT in "${PROJECTS[@]}"; do
+		PROJECT_PATH=$(jq -r ".path" <<<"$PROJECT")
+		TARGETS=$(jq -r -e ".ci.targets" "$PROJECT_PATH/package.json")
+
+		if [[ "$TARGETS" == "[]" || "$TARGETS" == "" ]]; then
+			# if no target projects are found run the tests
+			PROJECTS_MATRIX+=("$PROJECT")
+		else
+			# iterate over defined target plugins/projects and see if they are changed
+			for TARGET in $(jq -r -e ".[]" <<<"$TARGETS"); do
+				RESULT=$(jq --arg prj "$TARGET" '.[$prj]' <<<"$CHANGED_PROJECTS")
+				if [[ "$RESULT" == true ]]; then
+					PROJECTS_MATRIX+=("$PROJECT")
+					break
+				fi
+			done
+		fi
+	done
+else
+	# gutenberg scheduled run
+	if [ "$CRON" == "0 */12 * * *" ]; then
+		PROJECTS_MATRIX+=('{"project":"Jetpack with Gutenberg","path":"projects/plugins/jetpack/tests/e2e","testArgs":["blocks"],"slackArgs":["--report", "gutenberg"]}')
+		RUN_NAME='gutenberg'
+	fi
+
+	# atomic scheduled run
+	if [ "$CRON" == "30 */4 * * *" ]; then
+		PROJECTS_MATRIX+=('{"project":"Jetpack on Atomic","path":"projects/plugins/jetpack/tests/e2e","testArgs":["blocks", "--grep-invert", "wordads"],"slackArgs":["--report", "atomic"]}')
+		RUN_NAME='atomic'
+	fi
+fi
+
+jq -n -c --arg runName "$RUN_NAME" --argjson projects "$(jq -s -c -r '.' <<<"${PROJECTS_MATRIX[@]}")" '{ "run": $runName, "matrix": $projects }'
diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php
index d852c39f0c0f8..85336222ab802 100755
--- a/.github/files/generate-ci-matrix.php
+++ b/.github/files/generate-ci-matrix.php
@@ -58,7 +58,7 @@
 		'script'  => 'test-php',
 		'php'     => $php,
 		'wp'      => 'latest',
-		'timeout' => 15, // 2021-01-18: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 master run, ~5.5-6 for 7.x and 8.0.
+		'timeout' => 20, // 2022-01-25: 5.6 tests have started timing out at 15 minutes. Previously: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 master run, ~5.5-6 for 7.x and 8.0.
 	);
 }
 // Merge this into the above once we decide PHP 8.1 is stable and WP latest works with 8.1.
diff --git a/.github/files/list-changed-projects.php b/.github/files/list-changed-projects.php
deleted file mode 100755
index 99ebdad8366d8..0000000000000
--- a/.github/files/list-changed-projects.php
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Tool to list whether projects have changed.
- *
- * @package automattic/jetpack
- */
-
-// phpcs:disable WordPress.WP.AlternativeFunctions, WordPress.PHP.DiscouragedPHPFunctions, WordPress.Security.EscapeOutput.OutputNotEscaped
-
-ob_start();
-require_once __DIR__ . '/../../tools/find-project-deps.php';
-ob_end_clean();
-
-// Files that mean all tests should be run.
-// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-$infrastructure_files = array(
-	'.github/actions/tool-setup/action.yml',
-	'.github/files/list-changed-projects.php',
-	'.github/files/generate-ci-matrix.php',
-	'.github/files/process-coverage.sh',
-	'.github/files/setup-wordpress-env.sh',
-	'.github/versions.sh',
-	'.github/workflows/tests.yml',
-);
-
-// Globs that should be ignored. Supports `*`, `**`, and `?`.
-// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-$ignore_globs = array(
-	'**.md',
-	'**.txt',
-);
-
-chdir( __DIR__ . '/../../' );
-
-if ( array_search( '--debug', $argv, true ) !== false ) {
-	/**
-	 * Output debug info.
-	 *
-	 * @param array ...$args Arguments to printf. A newline is automatically appended.
-	 */
-	function debug( ...$args ) {
-		if ( getenv( 'CI' ) ) {
-			$args[0] = "\e[34m${args[0]}\e[0m\n";
-		} else {
-			$args[0] = "\e[1;30m${args[0]}\e[0m\n";
-		}
-		fprintf( STDERR, ...$args );
-	}
-} else {
-	/**
-	 * Do not output debug info.
-	 */
-	function debug() {
-	}
-}
-
-/**
- * Fetch the list of all projects.
- *
- * @return string[]
- */
-function get_all_projects() {
-	static $cache = null;
-
-	if ( null === $cache ) {
-		$cache = array( 'monorepo' );
-		foreach ( glob( 'projects/*/*/composer.json' ) as $file ) {
-			$cache[] = substr( $file, 9, -14 );
-		}
-		ksort( $cache );
-	}
-
-	return $cache;
-}
-
-/**
- * Fetch the list of changed projects.
- *
- * @return string[]
- */
-function get_changed_projects() {
-	global $infrastructure_files, $ignore_globs;
-
-	// Code coverage probably needs to run all tests to avoid confusing metrics.
-	// @todo Determine if that's actually true.
-	if ( 'test-coverage' === getenv( 'TEST_SCRIPT' ) ) {
-		debug( 'TEST_SCRIPT is test-coverage, considering all projects changed.' );
-		return get_all_projects();
-	}
-
-	$event = getenv( 'GITHUB_EVENT_NAME' );
-	if ( 'pull_request' === $event ) {
-		$event_path = getenv( 'GITHUB_EVENT_PATH' );
-		if ( ! $event_path || ! file_exists( $event_path ) ) {
-			fprintf( STDERR, "Missing GITHUB_EVENT_PATH for pull_request event\n" );
-			exit( 1 );
-		}
-		$event = json_decode( file_get_contents( $event_path ) );
-		if ( ! isset( $event->pull_request->base->sha ) || ! isset( $event->pull_request->head->sha ) ) {
-			fprintf( STDERR, "Missing pull_request data in GITHUB_EVENT_PATH file\n" );
-			exit( 1 );
-		}
-		$base = $event->pull_request->base->sha;
-		$head = $event->pull_request->head->sha;
-		debug( 'GITHUB_EVENT_NAME is pull_request, checking diff from %s...%s.', $base, $head );
-	} elseif ( 'push' === $event ) {
-		debug( 'GITHUB_EVENT_NAME is push, considering all projects changed.' );
-		return get_all_projects();
-	} else {
-		fprintf( STDERR, "Unsupported GITHUB_EVENT_NAME \"%s\"\n", $event );
-		exit( 1 );
-	}
-
-	$pipes = null;
-	$p     = proc_open(
-		sprintf( 'git -c core.quotepath=off diff --no-renames --name-only %s...%s', escapeshellarg( $base ), escapeshellarg( $head ) ),
-		array( array( 'pipe', 'r' ), array( 'pipe', 'w' ), STDERR ),
-		$pipes
-	);
-	if ( ! $p ) {
-		exit( 1 );
-	}
-	fclose( $pipes[0] );
-
-	// PHP doesn't seem to have something that'll correctly handle `**`, so munge to a regex.
-	$ignore_regexes = array();
-	foreach ( $ignore_globs as $glob ) {
-		$re = '!^';
-		for ( $i = 0, $l = strlen( $glob ); $i < $l; $i++ ) {
-			$c = $glob[ $i ];
-			switch ( $c ) {
-				case '\\':
-					$re .= preg_quote( $glob[ ++$i ], '!' );
-					break;
-				case '*':
-					if ( '*' === $glob[ $i + 1 ] ) {
-						$i++;
-						$re .= '.*';
-					} else {
-						$re .= '[^/]*';
-					}
-					break;
-				case '?':
-					$re .= '[^/]';
-					break;
-				default:
-					$re .= preg_quote( $c, '!' );
-					break;
-			}
-		}
-		$re                     .= '$!';
-		$ignore_regexes[ $glob ] = $re;
-	}
-
-	$projects = array();
-	// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
-	while ( ( $line = fgets( $pipes[1] ) ) ) {
-		$line = trim( $line );
-		if ( in_array( $line, $infrastructure_files, true ) ) {
-			debug( 'PR touches infrastructure file %s, considering all projects changed.', $line );
-			return get_all_projects();
-		}
-		foreach ( $ignore_regexes as $glob => $re ) {
-			if ( preg_match( $re, $line ) ) {
-				debug( 'PR touches file %s, but ignoring due to match with `%s`.', $line, $glob );
-				continue 2;
-			}
-		}
-		$parts = explode( '/', $line, 4 );
-		if ( count( $parts ) === 4 && 'projects' === $parts[0] ) {
-			$slug = "{$parts[1]}/{$parts[2]}";
-		} else {
-			$slug = 'monorepo';
-		}
-		if ( empty( $projects[ $slug ] ) ) {
-			debug( 'PR touches file %s, marking %s as changed.', $line, $slug );
-			$projects[ $slug ] = true;
-		}
-	}
-	fclose( $pipes[1] );
-
-	$status = proc_close( $p );
-	if ( $status ) {
-		exit( $status );
-	}
-
-	ksort( $projects );
-	return array_keys( $projects );
-}
-
-// Get a list of projects indicating which are changed.
-$projects = array_fill_keys( get_changed_projects(), true ) + array_fill_keys( get_all_projects(), false );
-
-// Figure out if any projects depend on a changed project. Repeat to propagate until none are found.
-$deps = get_dependencies();
-do {
-	$any = false;
-	foreach ( $projects as $project => $changed ) {
-		if ( $changed || ! isset( $deps[ $project ] ) ) {
-			continue;
-		}
-		foreach ( $deps[ $project ] as $slug ) {
-			if ( ! empty( $projects[ $slug ] ) ) {
-				debug( 'Project %s depends on %s, marking it as changed.', $project, $slug );
-				$projects[ $project ] = true;
-				$any                  = true;
-				break;
-			}
-		}
-	}
-} while ( $any );
-
-// Output.
-ksort( $projects );
-echo json_encode( $projects, JSON_FORCE_OBJECT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) . "\n";
diff --git a/.github/files/list-changed-projects.sh b/.github/files/list-changed-projects.sh
new file mode 100755
index 0000000000000..62f5236a2d97f
--- /dev/null
+++ b/.github/files/list-changed-projects.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -eo pipefail
+
+cd $(dirname "${BASH_SOURCE[0]}")/../..
+
+. tools/includes/chalk-lite.sh
+
+function debug {
+	blue "$@" >&2
+}
+
+function die {
+	echo "::error::$*" >&2
+	exit 1
+}
+
+ARGS=( --add-dependents )
+
+# Code coverage probably needs to run all tests to avoid confusing metrics.
+# @todo Switch it to use codecov.io's carryforward: https://about.codecov.io/blog/new-product-test-only-what-you-change-with-carryforward-flags/
+if [[ "$TEST_SCRIPT" == "test-coverage" ]]; then
+	debug "TEST_SCRIPT is test-coverage, considering all projects changed."
+elif [[ "${GITHUB_EVENT_NAME:?}" == "pull_request" ]]; then
+	[[ -f "${GITHUB_EVENT_PATH:?}" ]] || die "GITHUB_EVENT_PATH file $GITHUB_EVENT_PATH does not exist"
+	DIFF="$(jq -r '"\( .pull_request.base.sha )..\( .pull_request.head.sha )"' "$GITHUB_EVENT_PATH")"
+	debug "GITHUB_EVENT_NAME is pull_request, checking diff from $DIFF"
+	ARGS+=( --verbose "--git-changed=$DIFF" )
+elif [[ "${GITHUB_EVENT_NAME:?}" == "push" ]]; then
+	debug "GITHUB_EVENT_NAME is push, considering all projects changed."
+else
+	die "Unsupported GITHUB_EVENT_NAME \"$GITHUB_EVENT_NAME\""
+fi
+
+pnpx jetpack dependencies list "${ARGS[@]}" | jq -ncR 'reduce inputs as $i ({}; .[$i] |= true)'
diff --git a/.github/files/required-review.yaml b/.github/files/required-review.yaml
index 961f2a1b239fa..2137cf8c28b3f 100644
--- a/.github/files/required-review.yaml
+++ b/.github/files/required-review.yaml
@@ -22,6 +22,8 @@
   paths:
    - 'projects/packages/**'
    - 'projects/plugins/jetpack/**'
+   # Exclude packages managed by other teams, which are covered by other blocks below.
+   - '!projects/packages/search/**'
   teams:
    - jetpack-approvers
 
@@ -44,10 +46,11 @@
    - heart-of-gold
    - jetpack-approvers
 
-# The Search team reviews changes to the Search plugin
+# The Search team reviews changes to the Search plugin, and the Search package.
 - name: Search
   paths:
    - 'projects/plugins/search/**'
+   - 'projects/packages/search/**'
   teams:
    - jetpack-search
    - jetpack-approvers
diff --git a/.github/files/setup-wordpress-env.sh b/.github/files/setup-wordpress-env.sh
index 2caa7692c58b5..d98076fd31a8d 100755
--- a/.github/files/setup-wordpress-env.sh
+++ b/.github/files/setup-wordpress-env.sh
@@ -35,12 +35,6 @@ case "$WP_BRANCH" in
 		;;
 	latest)
 		LATEST=$(php ./tools/get-wp-version.php)
-		# 5.8.x still requires a monkey-patched obsolete version of phpunit.
-		# If that's latest, run the coverage test with the upcoming 5.9 instead.
-		# @todo: Remove this once WordPress 5.9 is "latest".
-		if [[ "$LATEST" == 5.8.* && "$TEST_SCRIPT" == "test-coverage" ]]; then
-			LATEST=master
-		fi
 		git clone --depth=1 --branch "$LATEST" git://develop.git.wordpress.org/ /tmp/wordpress-latest
 		;;
 	previous)
diff --git a/.github/renovate.json b/.github/renovate.json
index ab8845b0e46dc..18d7f6454df30 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -24,6 +24,7 @@
 				"@automattic/jetpack-idc",
 				"@automattic/jetpack-licensing",
 				"@automattic/jetpack-partner-coupon",
+				"@automattic/jetpack-shared-extension-utils",
 				"@automattic/jetpack-storybook",
 				"@automattic/jetpack-webpack-config",
 				"@automattic/remove-asset-webpack-plugin",
@@ -57,14 +58,18 @@
 				"automattic/jetpack-partner",
 				"automattic/jetpack-password-checker",
 				"automattic/jetpack-phpcs-filter",
+				"automattic/jetpack-plans",
+				"automattic/jetpack-plugins-installer",
 				"automattic/jetpack-post-list",
+				"automattic/jetpack-publicize",
 				"automattic/jetpack-redirect",
 				"automattic/jetpack-roles",
 				"automattic/jetpack-search",
 				"automattic/jetpack-status",
 				"automattic/jetpack-sync",
 				"automattic/jetpack-terms-of-service",
-				"automattic/jetpack-tracking"
+				"automattic/jetpack-tracking",
+				"automattic/jetpack-waf"
 			],
 			"enabled": false
 		},
diff --git a/.github/workflows/e2e-tests-atomic.yml b/.github/workflows/e2e-tests-atomic.yml
deleted file mode 100644
index b9498e9c372e8..0000000000000
--- a/.github/workflows/e2e-tests-atomic.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-name: Jetpack E2E Tests on Atomic sites
-
-on:
-  schedule:
-    - cron:  '0 */4 * * *'
-
-jobs:
-  e2e-tests:
-    name: "E2E tests"
-    runs-on: ubuntu-latest
-    timeout-minutes: 25
-    env:
-      TEST_SITE: atomic
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup tools
-      uses: ./.github/actions/tool-setup
-      with:
-        php: false
-
-    - name: Install
-      working-directory: projects/plugins/jetpack/tests/e2e
-      env:
-        CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
-      run: |
-        pnpm install
-        pnpm run test-decrypt-all-config
-
-    - name: Run tests
-      working-directory: projects/plugins/jetpack/tests/e2e
-      run: pnpm run test-e2e -- blocks --grep-invert wordads
-
-    - name: Upload test artifacts
-      if: ${{ always() }}
-      continue-on-error: true
-      uses: actions/upload-artifact@v2
-      with:
-        name: test-output-${{ matrix.group }}
-        path: projects/plugins/jetpack/tests/e2e/output
-
-    - name: Send Slack notification
-      if: ${{ failure() }}
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      working-directory: projects/plugins/jetpack/tests/e2e
-      run: pnpm slack -- suite atomic --report atomic
-
-  slack-notification:
-    name: "Slack notification"
-    runs-on: ubuntu-latest
-    needs: e2e-tests
-    env:
-      CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
-      GITHUB_CONTEXT: ${{ toJson(github) }}
-      TEST_SITE: atomic
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup tools
-        uses: ./.github/actions/tool-setup
-        with:
-          php: false
-
-      - name: Send Slack notification
-        working-directory: projects/plugins/jetpack/tests/e2e
-        env:
-          RESULT: ${{ needs.e2e-tests.result }}
-        run: |
-          pnpm install
-          pnpm run test-decrypt-all-config
-          pnpm slack -- status $RESULT --report atomic
-
-  test-reports:
-    name: "Trigger test report workflow"
-    runs-on: ubuntu-latest
-    if: ${{ ! cancelled() }}
-    needs: e2e-tests
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Trigger test report workflow
-        uses: ./.github/actions/test-report-dispatch
-        with:
-          token: ${{ secrets.E2E_TEST_REPORTS_TOKEN }}
-          event_type: e2e
-          report_name: atomic
diff --git a/.github/workflows/e2e-tests-boost.yml b/.github/workflows/e2e-tests-boost.yml
deleted file mode 100644
index 5e6029d85e601..0000000000000
--- a/.github/workflows/e2e-tests-boost.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-name: Jetpack Boost E2E Tests
-
-on:
-  pull_request:
-  push:
-    branches: [ master ]
-concurrency:
-  group: e2e-tests-boost-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    name: "Check if Boost E2E tests should run"
-    runs-on: ubuntu-latest
-    timeout-minutes: 1  # 2021-11-12: Should only take a second.
-    outputs:
-      boost: ${{ steps.check.outputs.boost }}
-    steps:
-      - uses: actions/checkout@v2
-      # For pull requests, list-changed-projects.php needs the merge base.
-      - name: Deepen to merge base
-        if: github.event_name == 'pull_request'
-        uses: ./.github/actions/deepen-to-merge-base
-      - id: check
-        run: |
-          CHANGED="$(.github/files/list-changed-projects.php --debug)"
-          BOOST="$(jq '.["plugins/boost"]' <<<"$CHANGED")"
-          echo "::set-output name=boost::${BOOST}"
-
-  e2e-tests:
-    name: "Boost E2E tests"
-    runs-on: ubuntu-latest
-    timeout-minutes: 25
-    needs: check
-    if: needs.check.outputs.boost == 'true'
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup tools
-        uses: ./.github/actions/tool-setup
-
-      - name: Build Production Jetpack & Jetpack Boost
-        run: |
-          pnpm install
-          pnpx jetpack build plugins/jetpack -v --production
-          pnpx jetpack build plugins/boost -v --production
-
-      - name: Environment set-up
-        working-directory: projects/plugins/boost/tests/e2e
-        env:
-          CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
-        run: |
-          pnpm install
-          pnpm run test-decrypt-config
-          pnpm run env-start
-          pnpm run tunnel-on
-
-      - name: Run tests
-        working-directory: projects/plugins/boost/tests/e2e
-        run: pnpm run test-e2e
-
-      - name: Environment tear-down
-        if: ${{ always() }}
-        working-directory: projects/plugins/boost/tests/e2e
-        continue-on-error: true
-        run: |
-          pnpm run tunnel-off
-          pnpm run tunnel-write-logs
-
-      - name: Upload test artifacts
-        if: ${{ always() }}
-        continue-on-error: true
-        uses: actions/upload-artifact@v2
-        with:
-          name: test-output-boost
-          path: projects/plugins/boost/tests/e2e/output
-
-      - name: Send Slack notification
-        if: ${{ failure() }}
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        working-directory: projects/plugins/boost/tests/e2e
-        run: pnpm slack -- suite boost
-
-  slack-notification:
-    name: "Slack notification"
-    runs-on: ubuntu-latest
-    needs: e2e-tests
-    env:
-      CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
-      GITHUB_CONTEXT: ${{ toJson(github) }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup tools
-        uses: ./.github/actions/tool-setup
-        with:
-          php: false
-
-      - name: Send Slack notification
-        working-directory: projects/plugins/boost/tests/e2e
-        env:
-          RESULT: ${{ needs.e2e-tests.result }}
-        run: |
-          pnpm install
-          pnpm run test-decrypt-config
-          pnpm slack -- status $RESULT
-
-  test-reports:
-    name: "Trigger test report workflow"
-    runs-on: ubuntu-latest
-    needs: e2e-tests
-    if: ${{ ! cancelled() && needs.e2e-tests.result != 'skipped' }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Trigger test report workflow
-        uses: ./.github/actions/test-report-dispatch
-        with:
-          token: ${{ secrets.E2E_TEST_REPORTS_TOKEN }}
-          event_type: e2e
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index d4339d9e6f355..9de4ab34c233b 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -1,4 +1,4 @@
-name: Jetpack E2E Tests
+name: E2E Tests
 
 on:
   pull_request:
@@ -9,42 +9,62 @@ on:
     paths-ignore:
     - '**.md'
   schedule:
-    - cron:  '0 */12 * * *'
+    - cron: '0 */12 * * *' # gutenberg run, every 12 hours - if you update this, also update it in .github/files/create-e2e-projects-matrix.sh
+    - cron: '30 */4 * * *' # atomic run, every 4 hours - if you update this, also update it in .github/files/create-e2e-projects-matrix.sh
+
 concurrency:
   group: e2e-tests-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  create-matrix:
+  create-test-matrix:
     name: "Determine tests matrix"
     runs-on: ubuntu-latest
-    timeout-minutes: 1  # 2021-02-03: Should only take a second.
+    timeout-minutes: 3
     outputs:
-      matrix: ${{ steps.create-matrix.outputs.matrix }}
+      matrix: ${{ steps.evaluate.outputs.matrix }}
+      runName: ${{ steps.evaluate.outputs.runName }}
     steps:
       - uses: actions/checkout@v2
-      - id: create-matrix
+
+      # For pull requests, list-changed-projects.sh needs the merge base.
+      - name: Deepen to merge base
+        if: github.event_name == 'pull_request'
+        uses: ./.github/actions/deepen-to-merge-base
+
+      - name: Setup tools
+        uses: ./.github/actions/tool-setup
+
+      # Required for list-changed-projects.sh
+      - name: Install monorepo
         run: |
-          MATRIX='[{"group":"pre-connection","tests":"specs/pre-connection"},{"group":"connection","tests":"specs/connection"},{"group":"post-connection","tests":"specs/post-connection"}]'
-          if [ "$GITHUB_EVENT_NAME" == schedule ]; then
-            MATRIX=$(echo $MATRIX | jq '. + [{"group": "gutenberg","tests": "blocks"}]' | jq -c .)
-          fi
-          echo $MATRIX
+          pnpm install
+
+      - name: Create test plan
+        id: evaluate
+        env:
+          CRON: ${{ github.event.schedule }}
+        run: |
+          TEST_PLAN="$(.github/files/create-e2e-projects-matrix.sh)"
+          echo "$TEST_PLAN"
+
+          MATRIX=$(jq -r -c ".matrix" <<<"$TEST_PLAN")
+          echo "$MATRIX"
           echo "::set-output name=matrix::$MATRIX"
 
+          RUN_NAME=$(jq -r -c ".run" <<<"$TEST_PLAN")
+          echo "$RUN_NAME"
+          echo "::set-output name=runName::$RUN_NAME"
+
   e2e-tests:
-    name: "E2E ${{ matrix.group }} tests"
+    name: "${{ matrix.project }} e2e tests"
     runs-on: ubuntu-latest
-    needs: create-matrix
-    timeout-minutes: 25  # 2021-04-16: Successful runs seem to take 11-17 minutes
+    needs: create-test-matrix
+    timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson( needs.create-matrix.outputs.matrix ) }}
-    env:
-      GROUP: ${{ matrix.group }}
-      TESTS: ${{ matrix.tests }}
-      GUTENBERG: bundle # default value. Can be overridden later based on matrix.group value
+        include: ${{ fromJson( needs.create-test-matrix.outputs.matrix ) }}
     if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
 
     steps:
@@ -53,86 +73,86 @@ jobs:
     - name: Setup tools
       uses: ./.github/actions/tool-setup
 
-    - name: Build Production Jetpack
-      env:
-        COMPOSER_ROOT_VERSION: "dev-master"
+    - name: Install monorepo
       run: |
         pnpm install
-        pnpx jetpack build packages/search -v --production
-        pnpx jetpack build plugins/jetpack -v --production
 
-    - name: Environment set-up
-      working-directory: projects/plugins/jetpack/tests/e2e
+    - name: Test environment set-up
+      working-directory: ${{ matrix.path }}
       env:
         CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
+        COMPOSER_ROOT_VERSION: "dev-master"
+        RUN_NAME: ${{ needs.create-test-matrix.outputs.runName }}
       run: |
+        echo "::group::Install e2e project"
         pnpm install
-        pnpm run test-decrypt-all-config
-        pnpm run env-start
-        pnpm run tunnel-on
-
-    - name: Set up Gutenberg
-      if: matrix.group == 'gutenberg'
-      working-directory: projects/plugins/jetpack/tests/e2e
-      run: pnpx e2e-env gb-setup
+        echo "::endgroup::"
+
+        echo "::group::Decrypt config"
+        pnpm run config:decrypt
+        echo "::endgroup::"
+
+        if [ "${RUN_NAME}" != atomic ]; then
+          echo "::group::Build plugin(s)"
+          pnpm run build
+          echo "::endgroup::"
+
+          echo "::group::Start docker environment"
+          pnpm run env:up
+          echo "::endgroup::"
+
+          echo "::group::Create tunnel"
+          pnpm run tunnel:up
+          echo "::endgroup::"
+        else
+          echo "TEST_SITE=atomic" >> $GITHUB_ENV
+        fi
+
+        if [ "${RUN_NAME}" == gutenberg ]; then
+            echo "::group::Setting up Gutenberg"
+            pnpx e2e-env gb-setup
+            echo "::endgroup::"
+        fi
+
+    - name: Run ${{ matrix.project }} tests
+      working-directory: ${{ matrix.path }}
+      env:
+        JSON_ARGS: ${{ toJSON(matrix.testArgs) }}
+      run: |
+        mapfile -t TEST_ARGS < <(jq -r '.[]' <<<"$JSON_ARGS")
+        pnpm run test:run -- "${TEST_ARGS[@]}"
 
-    - name: Run ${{ matrix.group }} tests
-      working-directory: projects/plugins/jetpack/tests/e2e
-      run: pnpm run test-e2e -- $TESTS
+    - name: Send Slack notification
+      if: ${{ ! cancelled() }}
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+        SUITE: ${{ matrix.project }}
+        JSON_ARGS: ${{ toJSON(matrix.slackArgs) }}
+      working-directory: ${{ matrix.path }}
+      run: |
+        mapfile -t ARGS < <(jq -r '.[]' <<<"$JSON_ARGS")
+        pnpm run slack -- suite $SUITE "${ARGS[@]}"
 
-    - name: Environment tear-down
+    - name: Test environment tear-down
       if: ${{ always() }}
-      working-directory: projects/plugins/jetpack/tests/e2e
+      working-directory: ${{ matrix.path }}
       continue-on-error: true
       run: |
-        pnpm run tunnel-off
-        pnpm run tunnel-write-logs
+        pnpm run tunnel:down
 
     - name: Upload test artifacts
       if: ${{ always() }}
       continue-on-error: true
       uses: actions/upload-artifact@v2
       with:
-        name: test-output-${{ matrix.group }}
-        path: projects/plugins/jetpack/tests/e2e/output
-
-    - name: Send Slack notification
-      if: ${{ failure() }}
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      working-directory: projects/plugins/jetpack/tests/e2e
-      run: pnpm slack -- suite $GROUP
-
-  slack-notification:
-    name: "Slack notification"
-    runs-on: ubuntu-latest
-    needs: e2e-tests
-    env:
-      CONFIG_KEY: ${{ secrets.E2E_CONFIG_KEY }}
-      GITHUB_CONTEXT: ${{ toJson(github) }}
-
-    steps:
-      - uses: actions/checkout@v2
+        name: test-output-${{ matrix.project }}
+        path: ${{ matrix.path }}/output
 
-      - name: Setup tools
-        uses: ./.github/actions/tool-setup
-        with:
-          php: false
-
-      - name: Send Slack notification
-        working-directory: projects/plugins/jetpack/tests/e2e
-        env:
-          RESULT: ${{ needs.e2e-tests.result }}
-        run: |
-          pnpm install
-          pnpm run test-decrypt-all-config
-          pnpm slack -- status $RESULT
-
-  test-reports:
-    name: "Trigger test report workflow"
+  test-report:
+    name: "Test report"
     runs-on: ubuntu-latest
     if: ${{ ! cancelled() }}
-    needs: e2e-tests
+    needs: [create-test-matrix, e2e-tests]
 
     steps:
       - uses: actions/checkout@v2
@@ -142,3 +162,6 @@ jobs:
         with:
           token: ${{ secrets.E2E_TEST_REPORTS_TOKEN }}
           event_type: e2e
+          report_name: ${{needs.create-test-matrix.outputs.runName}}
+
+
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 3091acd21336a..f1968e3230427 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -484,10 +484,10 @@ jobs:
     timeout-minutes: 1  # 2021-01-18: Successful runs take just a few seconds
     steps:
       - uses: actions/checkout@v2
-      - name: Tool versions
-        run: |
-          which jq
-          jq --version
+      - name: Setup tools
+        uses: ./.github/actions/tool-setup
+        with:
+          php: false
       - run: tools/check-intra-monorepo-deps.sh -v
       - run: .github/files/check-monorepo-package-repos.sh
 
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 423e291979843..c3d402fd2f319 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -22,7 +22,7 @@ jobs:
           days-before-pr-stale: 90
           # Issues and PRs with these labels will never be considered stale.
           exempt-issue-labels: '[Pri] High,[Pri] BLOCKER,[Type] Good For Community,[Type] Good First Bug,FixTheFlows'
-          exempt-pr-labels: '[Pri] High,[Pri] BLOCKER,[Type] Good For Community,[Type] Good First Bug,FixTheFlows'
+          exempt-pr-labels: '[Pri] High,[Pri] BLOCKER,FixTheFlows'
           # Label to use when marking an issue / PR as stale
           stale-pr-label: '[Status] Stale'
           stale-issue-label: '[Status] Stale'
@@ -51,4 +51,3 @@ jobs:
             testing instructions, is it up to date with master, and it is still valid.
             Feel free to close this PR if you think it's not valid anymore — if you
             do, please add a brief explanation.</p>
-          operations-per-run: 2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 942418e97d733..96ac6bd72013d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -56,7 +56,7 @@ jobs:
           # codecov.io requires a fetch depth > 1.
           fetch-depth: 2
 
-      # For pull requests, list-changed-projects.php needs the merge base.
+      # For pull requests, list-changed-projects.sh needs the merge base.
       # But it doesn't have to be checked out, and codecov.io requires it not be.
       - name: Deepen to merge base
         if: github.event_name == 'pull_request'
@@ -71,10 +71,16 @@ jobs:
           coverage: ${{ matrix.script == 'test-coverage' && 'pcov' || 'none' }}
           node: ${{ matrix.node }}
 
+      - name: Monorepo install
+        run: |
+          echo "::group::Pnpm"
+          pnpm install
+          echo "::endgroup::"
+
       - name: Detect changed projects
         id: changed
         run: |
-          CHANGED="$(.github/files/list-changed-projects.php --debug)"
+          CHANGED="$(.github/files/list-changed-projects.sh)"
           ANY_PLUGINS="$(jq --argjson changed "$CHANGED" -n '$changed | with_entries( select( .key | startswith( "plugins/" ) ) ) | any')"
           echo "::set-output name=projects::${CHANGED}"
           echo "::set-output name=any-plugins::${ANY_PLUGINS}"
@@ -83,12 +89,6 @@ jobs:
         if: steps.changed.outputs.any-plugins == 'true' && matrix.wp != 'none'
         run: .github/files/setup-wordpress-env.sh
 
-      - name: Monorepo install
-        run: |
-          echo "::group::Pnpm"
-          pnpm install
-          echo "::endgroup::"
-
       - name: Run project tests
         env:
           EXPERIMENTAL: ${{ matrix.experimental && 'true' || 'false' }}
diff --git a/.gitignore b/.gitignore
index bd9ce9ca8cba6..9f74bee2f5693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ jetpack_vendor/
 /tools/docker/compose-extras.built.yml
 /tools/docker/compose-mappings.built.yml
 /tools/docker/jetpack-docker-config.yml
+/tools/phpcs.log
 
 # File for personal customiziations, if desired.
 /tools/docker/mu-plugins/0-sandbox.php
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index 3f2fd388a97ef..4e8fd21d0086e 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -7,11 +7,6 @@
 	<!-- Default ruleset. -->
 	<rule ref="Jetpack" />
 
-	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
-		<!-- Template files use extracted variables. -->
-		<exclude-pattern>/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/*</exclude-pattern>
-	</rule>
-
 	<rule ref="WordPress.WP.I18n">
 		<properties>
 			<property name="text_domain" type="array">
diff --git a/composer.json b/composer.json
index 2763df5427592..39c1a5b4317ab 100644
--- a/composer.json
+++ b/composer.json
@@ -8,12 +8,13 @@
 		"issues": "https://github.com/Automattic/jetpack/issues"
 	},
 	"require-dev": {
-		"automattic/jetpack-codesniffer": "2.4.x-dev",
+		"automattic/jetpack-codesniffer": "2.5.x-dev",
 		"automattic/jetpack-phpcs-filter": "1.0.x-dev",
 		"dealerdirect/phpcodesniffer-composer-installer": "0.7.1",
 		"php-parallel-lint/php-parallel-lint": "1.3.1",
 		"sirbrillig/phpcs-changed": "2.8.1",
-		"squizlabs/php_codesniffer": "3.6.1"
+		"squizlabs/php_codesniffer": "3.6.1",
+		"wp-coding-standards/wpcs": "dev-develop as 2.3.1"
 	},
 	"scripts": {
 		"php:lint": [
diff --git a/composer.lock b/composer.lock
index a8d7145a4fe4b..d2bf2a12ccb01 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": "cfc3d18e703804b5510c6cdf0f022874",
+    "content-hash": "df73dd15564af4a919363b27f59c7c35",
     "packages": [],
     "packages-dev": [
         {
@@ -62,14 +62,15 @@
             "dist": {
                 "type": "path",
                 "url": "projects/packages/codesniffer",
-                "reference": "0c6a653df0a0baed6fe0b7558b34e733dec3f13c"
+                "reference": "defc334cb374051af045c9f32205a605efc8df09"
             },
             "require": {
+                "automattic/vipwpcs": "^2.3",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
                 "mediawiki/mediawiki-codesniffer": "^38.0",
                 "phpcompatibility/phpcompatibility-wp": "^2.1",
                 "sirbrillig/phpcs-variable-analysis": "^2.10",
-                "wp-coding-standards/wpcs": "^2.3"
+                "wp-coding-standards/wpcs": "dev-develop as 2.3.1"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
@@ -83,7 +84,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-codesniffer/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "2.4.x-dev"
+                    "dev-master": "2.5.x-dev"
                 }
             },
             "autoload": {
@@ -164,6 +165,58 @@
                 "relative": true
             }
         },
+        {
+            "name": "automattic/vipwpcs",
+            "version": "2.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Automattic/VIP-Coding-Standards.git",
+                "reference": "6cd0a6a82bc0ac988dbf9d6a7c2e293dc8ac640b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Automattic/VIP-Coding-Standards/zipball/6cd0a6a82bc0ac988dbf9d6a7c2e293dc8ac640b",
+                "reference": "6cd0a6a82bc0ac988dbf9d6a7c2e293dc8ac640b",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
+                "php": ">=5.4",
+                "sirbrillig/phpcs-variable-analysis": "^2.11.1",
+                "squizlabs/php_codesniffer": "^3.5.5",
+                "wp-coding-standards/wpcs": "^2.3"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^0.5",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
+                "phpcompatibility/php-compatibility": "^9",
+                "phpcsstandards/phpcsdevtools": "^1.0",
+                "phpunit/phpunit": "^4 || ^5 || ^6 || ^7"
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Automattic/VIP-Coding-Standards/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress VIP minimum coding conventions",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "wordpress"
+            ],
+            "support": {
+                "issues": "https://github.com/Automattic/VIP-Coding-Standards/issues",
+                "source": "https://github.com/Automattic/VIP-Coding-Standards",
+                "wiki": "https://github.com/Automattic/VIP-Coding-Standards/wiki"
+            },
+            "time": "2021-09-29T16:20:23+00:00"
+        },
         {
             "name": "composer/semver",
             "version": "3.2.7",
@@ -674,6 +727,130 @@
             },
             "time": "2021-12-30T16:37:40+00:00"
         },
+        {
+            "name": "phpcsstandards/phpcsextra",
+            "version": "1.0.0-alpha3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSExtra.git",
+                "reference": "a8415f9c2b7360e7184aad803a2c7e2b0544b4f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/a8415f9c2b7360e7184aad803a2c7e2b0544b4f1",
+                "reference": "a8415f9c2b7360e7184aad803a2c7e2b0544b4f1",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
+                "php": ">=5.4",
+                "phpcsstandards/phpcsutils": "^1.0 || dev-develop",
+                "squizlabs/php_codesniffer": "^3.3.1"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^0.5",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
+                "phpcsstandards/phpcsdevtools": "^1.0",
+                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSExtra/graphs/contributors"
+                }
+            ],
+            "description": "A collection of sniffs and standards for use with PHP_CodeSniffer.",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues",
+                "source": "https://github.com/PHPCSStandards/PHPCSExtra"
+            },
+            "time": "2020-06-29T03:39:34+00:00"
+        },
+        {
+            "name": "phpcsstandards/phpcsutils",
+            "version": "1.0.0-alpha3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
+                "reference": "a16c989b8421e29c336ece5c4099b48585994673"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/a16c989b8421e29c336ece5c4099b48585994673",
+                "reference": "a16c989b8421e29c336ece5c4099b48585994673",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7",
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^2.6.0 || ^3.1.0 || 4.0.x-dev@dev"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "3.5.3"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-console-highlighter": "^0.5",
+                "php-parallel-lint/php-parallel-lint": "^1.2.0",
+                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "autoload": {
+                "classmap": [
+                    "PHPCSUtils/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors"
+                }
+            ],
+            "description": "A suite of utility functions for use with PHP_CodeSniffer",
+            "homepage": "https://phpcsutils.com/",
+            "keywords": [
+                "PHP_CodeSniffer",
+                "phpcbf",
+                "phpcodesniffer-standard",
+                "phpcs",
+                "phpcs2",
+                "phpcs3",
+                "standards",
+                "tokens",
+                "utility"
+            ],
+            "support": {
+                "docs": "https://phpcsutils.com/",
+                "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "source": "https://github.com/PHPCSStandards/PHPCSUtils"
+            },
+            "time": "2020-06-28T21:57:33+00:00"
+        },
         {
             "name": "sirbrillig/phpcs-changed",
             "version": "v2.8.1",
@@ -704,15 +881,15 @@
             ],
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "PhpcsChanged\\": "PhpcsChanged/"
-                },
                 "files": [
                     "PhpcsChanged/Cli.php",
                     "PhpcsChanged/SvnWorkflow.php",
                     "PhpcsChanged/GitWorkflow.php",
                     "PhpcsChanged/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "PhpcsChanged\\": "PhpcsChanged/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -841,31 +1018,32 @@
         },
         {
             "name": "wp-coding-standards/wpcs",
-            "version": "2.3.0",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
-                "reference": "7da1894633f168fe244afc6de00d141f27517b62"
+                "reference": "73f3d69b3a200935b80f5fd265bfbee8d642d082"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62",
-                "reference": "7da1894633f168fe244afc6de00d141f27517b62",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/73f3d69b3a200935b80f5fd265bfbee8d642d082",
+                "reference": "73f3d69b3a200935b80f5fd265bfbee8d642d082",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^3.3.1"
+                "phpcsstandards/phpcsextra": "^1.0",
+                "phpcsstandards/phpcsutils": "^1.0",
+                "squizlabs/php_codesniffer": "^3.5.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6",
+                "php-parallel-lint/php-console-highlighter": "^0.5",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
                 "phpcompatibility/php-compatibility": "^9.0",
                 "phpcsstandards/phpcsdevtools": "^1.0",
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
-            "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
-            },
+            "default-branch": true,
             "type": "phpcodesniffer-standard",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -888,14 +1066,22 @@
                 "source": "https://github.com/WordPress/WordPress-Coding-Standards",
                 "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
             },
-            "time": "2020-05-13T23:57:56+00:00"
+            "time": "2021-12-30T19:26:09+00:00"
+        }
+    ],
+    "aliases": [
+        {
+            "package": "wp-coding-standards/wpcs",
+            "version": "dev-develop",
+            "alias": "2.3.1",
+            "alias_normalized": "2.3.1.0"
         }
     ],
-    "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
         "automattic/jetpack-codesniffer": 20,
-        "automattic/jetpack-phpcs-filter": 20
+        "automattic/jetpack-phpcs-filter": 20,
+        "wp-coding-standards/wpcs": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 4a352646bd7b6..ed8ec86a7ede3 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -25,7 +25,7 @@ Once your development environment is ready, you can get started and [create your
 If you'd like to contribute but don't know where to get started, you can take a look at existing issues:
 
 - ["Good First Bug"](https://github.com/Automattic/jetpack/labels/%5BType%5D%20Good%20First%20Bug) issues are a good entry point to get familiar with Jetpack's code base.
-- All issues labeled with [the "Good For Community" label](https://github.com/Automattic/Jetpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22%5BType%5D+Good+For+Community%22) are fair game. That's a great way to contribute new features and fix small issues within Jetpack.
+- All issues labeled with [the "Good For Community" label](https://github.com/Automattic/jetpack/issues?q=is%3Aopen+sort%3Aupdated-desc+label%3A%22Good+For+Community%22) are fair game. That's a great way to contribute new features and fix small issues within Jetpack.
 
 ### We’re Here To Help
 
diff --git a/docs/examples/bootstrap.php b/docs/examples/bootstrap.php
index d6ed85d124e11..ac0abb95220a1 100644
--- a/docs/examples/bootstrap.php
+++ b/docs/examples/bootstrap.php
@@ -61,10 +61,12 @@
 	if ( ! class_exists( PHPUnit\Framework\MockObject\InvocationMocker::class, false ) &&
 		file_exists( "$_tests_dir/includes/phpunit7/MockObject/InvocationMocker.php" )
 	) {
+		// phpcs:disable WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 		require "$_tests_dir/includes/phpunit7/MockObject/Builder/NamespaceMatch.php";
 		require "$_tests_dir/includes/phpunit7/MockObject/Builder/ParametersMatch.php";
 		require "$_tests_dir/includes/phpunit7/MockObject/InvocationMocker.php";
 		require "$_tests_dir/includes/phpunit7/MockObject/MockMethod.php";
+		// phpcs:enable
 	} else {
 		fprintf(
 			STDOUT,
diff --git a/docs/monorepo.md b/docs/monorepo.md
index 6e8a705c2c0ae..9af553b192126 100644
--- a/docs/monorepo.md
+++ b/docs/monorepo.md
@@ -128,7 +128,8 @@ We use `composer.json` to hold metadata about projects. Much of our generic tool
 * `.extra.autotagger`: Set truthy to enable automatic release-version tagging in the mirror repo. See [Mirror repositories > Autotagger](#autotagger) for details.
 * `.extra.changelogger`: Configuration object for [Changelogger](#jetpack-changelogger). See [its documentation](https://github.com/Automattic/jetpack-changelogger#configuration) for details.
 * `.extra.changelogger-default-type`: Certain of our tools automatically create Changelogger change entries. This is the value to use for `--type` when doing so. Default type is `changed`.
-* `.extra.dependencies`: This optional array specifies the "slugs" of any within-monorepo dependencies that can't otherwise be inferred. The "slug" consists of the two levels of directory under `projects/`, e.g. `plugins/jetpack` or `packages/lazy-images`. See [Testing](#testing) for details.
+* `.extra.dependencies.build`: This optional array specifies the "slugs" of any within-monorepo build dependencies that can't otherwise be inferred. The "slug" consists of the two levels of directory under `projects/`, e.g. `plugins/jetpack` or `packages/lazy-images`.
+* `.extra.dependencies.test`: This optional array specifies the "slugs" of any within-monorepo testing dependencies that can't otherwise be inferred. The "slug" consists of the two levels of directory under `projects/`, e.g. `plugins/jetpack` or `packages/lazy-images`. See [Testing](#testing) for details.
 * `.extra.dev-releases`: Indicate that the plugin will have developer alpha releases. Instead of the mirror repositories showing "VER-alpha", they'll start at "VER-a.0" and you can use the `-a` flag to the release tooling to release "VER-a.1".
 * `.extra.mirror-repo`: This specifies the name of the GitHub mirror repo, i.e. the "Automattic/jetpack-_something_" in "<span>https://</span>github.com/Automattic/jetpack-_something_".
 * `.extra.npmjs-autopublish`: Set truthy to enable automatic publishing of tagged versions to npmjs.com. See [Mirror repositories > Npmjs Auto-publisher](#npmjs-auto-publisher) for details.
@@ -169,7 +170,8 @@ The Jetpack Monorepo includes GitHub actions to run a number of CI checks on all
 Tests for a project are only run for a PR if changes are made to the project or its dependencies. Dependencies may be specified as:
 
 * For Composer packages included in the monorepo, via `.require` and `.require-dev` in `composer.json`.
-* For any other dependencies, via `.extra.dependencies` in `composer.json`.
+* For JavaScript packages included in the monorepo, via `.dependencies` and `.devDependencies` in `package.json`.
+* For any other dependencies, via `.extra.dependencies.test` in `composer.json`.
 
 The test environment will be set up with appropriate tools, including node, pnpm, php, phpdbg, and composer. Unless otherwise specified below, the versions of node and php will be those specified in `.github/versions.sh`. Other necessary tools may be pulled in via composer and pnpm.
 
diff --git a/docs/quick-start.md b/docs/quick-start.md
index fad5a0676f952..73d9eee30e43f 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -11,7 +11,9 @@ This guide assumes you are using MacOS or a Linux machine and are an Automattici
 ### Using the installation script
 
 To speed up the installation process, you may use our monorepo installation script. To do so:
- - clone the Jetpack repo: `git clone https://github.com/Automattic/jetpack.git`
+ - clone the Jetpack repo using one of these two methods: 
+ 	- A public SSH key ([recommended](https://github.com/Automattic/jetpack/blob/master/docs/development-environment.md#clone-the-repository)): `git clone git@github.com:Automattic/Jetpack.git` 
+	- HTTPS: `git clone https://github.com/Automattic/jetpack.git` 
  - `cd` into the cloned `jetpack` folder.
  - run `tools/install-monorepo.sh` from the monorepo root.
  Once the installation is complete, continue onto the section [Running Jetpack locally](#running-jetpack-locally). 
@@ -25,8 +27,9 @@ Prior to installation, we recommend using [`Homebrew`](https://brew.sh/) to mana
 
 The Jetpack Monorepo requires the following to be installed on your machine:
 
-- Start by cloning the GitHub repo:
-	- `git clone https://github.com/Automattic/jetpack.git`
+- Start by cloning the GitHub repo using one of these two methods:
+ 	- A public SSH key ([recommended](https://github.com/Automattic/jetpack/blob/master/docs/development-environment.md#clone-the-repository)): `git clone git@github.com:Automattic/Jetpack.git` 
+	- HTTPS: `git clone https://github.com/Automattic/jetpack.git` 
 	- If you're not an Automattician, you can [fork the repo following the instructions here](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).
 - Bash (will need to be updated from default Mac version): `brew install bash`
 - jq (JSON processor used in scripts): `brew install jq` 
@@ -47,10 +50,10 @@ To setup Docker:
 	- Mac: `brew install --cask docker` (This will take a while!)
 	- Linux: `brew install docker` 
 	- `open -a Docker` (or open the app from your Applications folder) to open the GUI application. You will likely need to enter your device password and accept their terms for a first time setup.
-- Copy the settings file: `cp tools/docker/default.env tools/docker/.env`
+- Copy the settings file from within the monorepo root: `cp tools/docker/default.env tools/docker/.env`
 - Open `tools/docker/.env` and make any modifications you'd like.	
 	- It's strongly recommend you at least change `WP_ADMIN_PASSWORD` to something more secure.
-- Start the Docker container using `jetpack docker up` (this may take some time for the first setup)
+- Start the Docker container using `jetpack docker up -d` (this may take some time for the first setup)
 - Install WordPress in your Docker container using `jetpack docker install` 
 - Open up http://localhost to see your site!
 
@@ -60,7 +63,9 @@ For more in depth Docker instructions, follow the [Docker environment for Jetpac
 
 In order to test features that require a WordPress.com connection and other network related Jetpack features, you'll need a test site that can create local HTTP tunnels. If you're an Automattician, we recommend using Jurassic Tube:
 
-- Add a subdomain on [jurassic.tube](https://jurassic.tube/)
+**Warning: This creates a tunnel to your local machine which should not be trusted as secure. If it is compromised, so is your computer and everything it has access to. Only `jetpack docker jt-up` when needed for testing things that require the site to be publicly accessible, and `jetpack docker jt-down` when completed.**
+
+- Visit the [jurassic.tube](https://jurassic.tube/) homepage to create a subdomain
 - Make sure you've run `pnpm install && pnpm cli-link`
 - Make sure Docker is running `jetpack docker up -d`
 - Stand on the monorepo root in your terminal and run `mkdir tools/docker/bin/jt`
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a1abf1735894a..53d650b9d960a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,8 +77,8 @@ importers:
 
   projects/js-packages/api:
     specifiers:
-      '@automattic/jetpack-config': workspace:^0.1.3-alpha
-      '@wordpress/url': 3.3.1
+      '@automattic/jetpack-config': workspace:^0.1.3
+      '@wordpress/url': 3.4.0
       chai-fetch-mock: 3.0.0
       fetch-mock: 9.11.0
       jetpack-js-test-runner: workspace:*
@@ -86,7 +86,7 @@ importers:
       nyc: 15.1.0
     dependencies:
       '@automattic/jetpack-config': link:../config
-      '@wordpress/url': 3.3.1
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     devDependencies:
       chai-fetch-mock: 3.0.0_fetch-mock@9.11.0
@@ -109,20 +109,20 @@ importers:
 
   projects/js-packages/base-styles:
     specifiers:
-      '@wordpress/base-styles': 4.0.4
+      '@wordpress/base-styles': 4.1.0
     devDependencies:
-      '@wordpress/base-styles': 4.0.4
+      '@wordpress/base-styles': 4.1.0
 
   projects/js-packages/components:
     specifiers:
       '@automattic/format-currency': 1.0.0-alpha.0
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/components': 19.1.6
-      '@wordpress/date': 4.2.3
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/components': 19.3.0
+      '@wordpress/date': 4.3.0
+      '@wordpress/i18n': 4.3.0
       classnames: 2.3.1
       jetpack-js-test-runner: workspace:*
       lodash: 4.17.21
@@ -134,9 +134,9 @@ importers:
     dependencies:
       '@automattic/format-currency': 1.0.0-alpha.0_react@17.0.2
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/components': 19.1.6_aae888dfa296766acacf1a733aa50b3a
-      '@wordpress/date': 4.2.3
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/date': 4.3.0
+      '@wordpress/i18n': 4.3.0
       classnames: 2.3.1
       lodash: 4.17.21
       prop-types: 15.8.1
@@ -153,24 +153,26 @@ importers:
   projects/js-packages/config:
     specifiers:
       jetpack-js-test-runner: workspace:*
+      nyc: 15.1.0
     devDependencies:
       jetpack-js-test-runner: link:../../../tools/js-test-runner
+      nyc: 15.1.0
 
   projects/js-packages/connection:
     specifiers:
-      '@automattic/jetpack-analytics': workspace:^0.1.7-alpha
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-config': workspace:^0.1.3-alpha
+      '@automattic/jetpack-analytics': workspace:^0.1.7
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-config': workspace:^0.1.3
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0
-      '@wordpress/base-styles': 4.0.4
+      '@wordpress/base-styles': 4.1.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/components': 19.1.6
-      '@wordpress/data': 6.1.5
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/components': 19.3.0
+      '@wordpress/data': 6.2.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       jetpack-js-test-runner: workspace:*
       lodash: 4.17.21
       nyc: 15.1.0
@@ -183,12 +185,12 @@ importers:
       '@automattic/jetpack-api': link:../api
       '@automattic/jetpack-components': link:../components
       '@automattic/jetpack-config': link:../config
-      '@wordpress/base-styles': 4.0.4
+      '@wordpress/base-styles': 4.1.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/components': 19.1.6_aae888dfa296766acacf1a733aa50b3a
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       lodash: 4.17.21
       prop-types: 15.8.1
     devDependencies:
@@ -206,7 +208,7 @@ importers:
       '@babel/preset-react': 7.16.0
       chalk: 4.1.2
       commander: 7.2.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       jetpack-js-test-runner: workspace:*
       nyc: 15.1.0
       parse-diff: 0.8.1
@@ -216,7 +218,7 @@ importers:
       commander: 7.2.0
       parse-diff: 0.8.1
     devDependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       jetpack-js-test-runner: link:../../../tools/js-test-runner
       nyc: 15.1.0
 
@@ -226,7 +228,7 @@ importers:
       '@wordpress/browserslist-config': 4.1.0
       browserslist: ^4.17.6
       debug: ^4.3.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-plugin-es: 4.1.0
       jest: 27.3.1
       semver: ^7.3.5
@@ -237,8 +239,8 @@ importers:
       semver: 7.3.5
     devDependencies:
       '@wordpress/browserslist-config': 4.1.0
-      eslint: 7.32.0
-      eslint-plugin-es: 4.1.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-plugin-es: 4.1.0_eslint@8.8.0
       jest: 27.3.1
 
   projects/js-packages/i18n-check-webpack-plugin:
@@ -256,36 +258,34 @@ importers:
 
   projects/js-packages/i18n-loader-webpack-plugin:
     specifiers:
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0
+      '@wordpress/i18n': 4.3.0
       debug: ^4.3.2
       jest: 27.3.1
-      md5-es: ^1.8.2
       webpack: 5.65.0
     dependencies:
       debug: 4.3.3
-      md5-es: 1.8.2
     devDependencies:
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1_webpack@5.65.0
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0_webpack@5.65.0
+      '@wordpress/i18n': 4.3.0
       jest: 27.3.1
       webpack: 5.65.0
 
   projects/js-packages/idc:
     specifiers:
-      '@automattic/jetpack-analytics': workspace:^0.1.7-alpha
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
+      '@automattic/jetpack-analytics': workspace:^0.1.7
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/components': 19.1.6
-      '@wordpress/compose': 5.0.7
-      '@wordpress/data': 6.1.5
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/url': 3.3.1
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/components': 19.3.0
+      '@wordpress/compose': 5.1.0
+      '@wordpress/data': 6.2.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/url': 3.4.0
       jetpack-js-test-runner: workspace:*
       nyc: 15.1.0
       prop-types: ^15.7.2
@@ -297,13 +297,13 @@ importers:
       '@automattic/jetpack-api': link:../api
       '@automattic/jetpack-base-styles': link:../base-styles
       '@automattic/jetpack-components': link:../components
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/components': 19.1.6_aae888dfa296766acacf1a733aa50b3a
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/url': 3.3.1
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/url': 3.4.0
       prop-types: 15.8.1
     devDependencies:
       '@babel/core': 7.16.0
@@ -316,56 +316,60 @@ importers:
 
   projects/js-packages/licensing:
     specifiers:
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0
-      '@wordpress/components': 19.1.6
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
+      '@wordpress/components': 19.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       jetpack-js-test-runner: workspace:*
+      nyc: 15.1.0
       prop-types: 15.7.2
       react: 17.0.2
       react-test-renderer: 17.0.2
     dependencies:
       '@automattic/jetpack-api': link:../api
       '@automattic/jetpack-components': link:../components
-      '@wordpress/components': 19.1.6_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       prop-types: 15.7.2
     devDependencies:
       '@automattic/jetpack-base-styles': link:../base-styles
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0_@babel+core@7.16.0
       jetpack-js-test-runner: link:../../../tools/js-test-runner
+      nyc: 15.1.0
       react: 17.0.2
       react-test-renderer: 17.0.2_react@17.0.2
 
   projects/js-packages/partner-coupon:
     specifiers:
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-connection': workspace:^0.14.0-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-connection': workspace:^0.15.1-alpha
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/i18n': 4.3.0
       classnames: 2.3.1
       jetpack-js-test-runner: workspace:*
+      nyc: 15.1.0
       prop-types: 15.7.2
       react: 17.0.2
     dependencies:
       '@automattic/jetpack-components': link:../components
       '@automattic/jetpack-connection': link:../connection
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/i18n': 4.3.0
       classnames: 2.3.1
       prop-types: 15.7.2
     devDependencies:
       '@babel/core': 7.16.0
       '@babel/preset-react': 7.16.0_@babel+core@7.16.0
       jetpack-js-test-runner: link:../../../tools/js-test-runner
+      nyc: 15.1.0
       react: 17.0.2
 
   projects/js-packages/remove-asset-webpack-plugin:
@@ -379,9 +383,17 @@ importers:
       jest: 27.3.1
       webpack: 5.65.0
 
+  projects/js-packages/shared-extension-utils:
+    specifiers:
+      jetpack-js-test-runner: workspace:*
+      nyc: 15.1.0
+    devDependencies:
+      jetpack-js-test-runner: link:../../../tools/js-test-runner
+      nyc: 15.1.0
+
   projects/js-packages/storybook:
     specifiers:
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
       '@babel/core': 7.16.0
       '@babel/plugin-syntax-jsx': 7.16.0
       '@babel/preset-react': 7.16.0
@@ -403,12 +415,12 @@ importers:
       '@storybook/builder-webpack5': 6.4.10
       '@storybook/manager-webpack5': 6.4.10
       '@storybook/react': 6.4.10
-      '@wordpress/babel-preset-default': 6.4.1
-      '@wordpress/block-editor': 8.0.12
-      '@wordpress/block-library': 6.0.17
-      '@wordpress/components': 19.1.6
-      '@wordpress/format-library': 3.0.18
-      '@wordpress/postcss-plugins-preset': 3.2.5
+      '@wordpress/babel-preset-default': 6.5.0
+      '@wordpress/block-editor': 8.1.0
+      '@wordpress/block-library': 6.1.0
+      '@wordpress/components': 19.3.0
+      '@wordpress/format-library': 3.1.0
+      '@wordpress/postcss-plugins-preset': 3.3.0
       babel-plugin-inline-json-import: 0.3.2
       concurrently: 6.0.2
       css-loader: 6.5.1
@@ -440,12 +452,12 @@ importers:
       '@storybook/builder-webpack5': 6.4.10_react@17.0.2
       '@storybook/manager-webpack5': 6.4.10_react@17.0.2
       '@storybook/react': 6.4.10_e92bd153364abdbbdd93b0e4261d62de
-      '@wordpress/babel-preset-default': 6.4.1
-      '@wordpress/block-editor': 8.0.12_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/block-library': 6.0.17_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/components': 19.1.6_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/format-library': 3.0.18_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/postcss-plugins-preset': 3.2.5
+      '@wordpress/babel-preset-default': 6.5.0
+      '@wordpress/block-editor': 8.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/block-library': 6.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/format-library': 3.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/postcss-plugins-preset': 3.3.0
       babel-plugin-inline-json-import: 0.3.2
       concurrently: 6.0.2
       css-loader: 6.5.1_webpack@5.65.0
@@ -458,9 +470,9 @@ importers:
   projects/js-packages/webpack-config:
     specifiers:
       '@automattic/babel-plugin-preserve-i18n': 1.0.0
-      '@automattic/babel-plugin-replace-textdomain': workspace:^1.0.2-alpha
-      '@automattic/i18n-check-webpack-plugin': workspace:^1.0.3-alpha
-      '@automattic/i18n-loader-webpack-plugin': workspace:^1.0.3-alpha
+      '@automattic/babel-plugin-replace-textdomain': workspace:^1.0.2
+      '@automattic/i18n-check-webpack-plugin': workspace:^1.0.4
+      '@automattic/i18n-loader-webpack-plugin': workspace:^2.0.1-alpha
       '@automattic/webpack-rtl-plugin': 5.1.0
       '@babel/compat-data': 7.16.4
       '@babel/core': 7.16.0
@@ -472,13 +484,14 @@ importers:
       '@babel/preset-typescript': 7.16.0
       '@babel/runtime': 7.16.3
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0
       babel-loader: 8.2.3
       browserslist: 4.19.1
       css-loader: 6.5.1
       css-minimizer-webpack-plugin: 3.1.4
       duplicate-package-checker-webpack-plugin: 3.0.0
       mini-css-extract-plugin: 2.4.5
+      nyc: 15.1.0
       terser-webpack-plugin: 5.2.5
       thread-loader: 3.0.4
       webpack: 5.65.0
@@ -497,7 +510,7 @@ importers:
       '@babel/preset-react': 7.16.0_@babel+core@7.16.0
       '@babel/preset-typescript': 7.16.0_@babel+core@7.16.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1_webpack@5.65.0
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0_webpack@5.65.0
       babel-loader: 8.2.3_8dd2b11efd9b7265f9b7da54f0e73ab1
       browserslist: 4.19.1
       css-loader: 6.5.1_webpack@5.65.0
@@ -509,24 +522,37 @@ importers:
     devDependencies:
       '@babel/core': 7.16.0
       '@babel/runtime': 7.16.3
+      nyc: 15.1.0
       webpack: 5.65.0_webpack-cli@4.9.1
       webpack-cli: 4.9.1_webpack@5.65.0
 
   projects/packages/admin-ui:
     specifiers: {}
 
+  projects/packages/assets:
+    specifiers:
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
+      jest: 27.3.1
+      md5-es: 1.8.2
+      webpack: 5.65.0
+    devDependencies:
+      '@automattic/jetpack-webpack-config': link:../../js-packages/webpack-config
+      jest: 27.3.1
+      md5-es: 1.8.2
+      webpack: 5.65.0
+
   projects/packages/connection-ui:
     specifiers:
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-connection': workspace:^0.14.0-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-connection': workspace:^0.15.1-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@babel/core': 7.16.0
       '@babel/preset-env': 7.16.4
       '@babel/register': 7.16.0
       '@babel/runtime': 7.16.3
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/data': 6.1.5
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/data': 6.2.0
+      '@wordpress/i18n': 4.3.0
       enzyme: 3.11.0
       jest: 27.3.1
       react: 17.0.2
@@ -538,7 +564,7 @@ importers:
     dependencies:
       '@automattic/jetpack-api': link:../../js-packages/api
       '@automattic/jetpack-connection': link:../../js-packages/connection
-      '@wordpress/data': 6.1.5_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
     devDependencies:
       '@automattic/jetpack-webpack-config': link:../../js-packages/webpack-config
       '@babel/core': 7.16.0
@@ -546,7 +572,7 @@ importers:
       '@babel/register': 7.16.0_@babel+core@7.16.0
       '@babel/runtime': 7.16.3
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/i18n': 4.3.0
       enzyme: 3.11.0
       jest: 27.3.1
       react: 17.0.2
@@ -558,14 +584,14 @@ importers:
 
   projects/packages/identity-crisis:
     specifiers:
-      '@automattic/jetpack-idc': workspace:^0.9.0-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-idc': workspace:^0.9.2-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@babel/core': 7.16.0
       '@babel/preset-env': 7.16.4
       '@babel/register': 7.16.0
       '@babel/runtime': 7.16.3
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/data': 6.1.5
+      '@wordpress/data': 6.2.0
       fancy-log: 1.3.3
       react: 17.0.2
       react-dom: 17.0.2
@@ -574,7 +600,7 @@ importers:
       webpack: 5.65.0
     dependencies:
       '@automattic/jetpack-idc': link:../../js-packages/idc
-      '@wordpress/data': 6.1.5_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
     devDependencies:
       '@automattic/jetpack-webpack-config': link:../../js-packages/webpack-config
       '@babel/core': 7.16.0
@@ -591,7 +617,7 @@ importers:
 
   projects/packages/jitm:
     specifiers:
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@wordpress/browserslist-config': 4.1.0
       sass: 1.43.3
       sass-loader: 12.4.0
@@ -607,7 +633,7 @@ importers:
 
   projects/packages/lazy-images:
     specifiers:
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       copy-webpack-plugin: 10.2.0
       intersection-observer: 0.12.0
       webpack: 5.65.0
@@ -619,11 +645,12 @@ importers:
 
   projects/packages/my-jetpack:
     specifiers:
-      '@automattic/jetpack-analytics': workspace:^0.1.7-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-connection': workspace:^0.14.0-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/format-currency': 1.0.0-alpha.0
+      '@automattic/jetpack-analytics': workspace:^0.1.7
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-connection': workspace:^0.15.1-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@babel/core': 7.16.0
       '@babel/preset-env': 7.16.4
       '@babel/register': 7.16.0
@@ -634,9 +661,11 @@ importers:
       '@testing-library/react': 11.2.7
       '@testing-library/react-hooks': 4.0.1
       '@testing-library/user-event': 12.8.3
-      '@wordpress/components': 19.1.6
-      '@wordpress/data': 6.1.5
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/components': 19.3.0
+      '@wordpress/data': 6.2.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       classnames: 2.3.1
       enzyme: 3.11.0
       jest: 27.3.1
@@ -644,19 +673,24 @@ importers:
       prop-types: 15.8.1
       react: 17.0.2
       react-dom: 17.0.2
+      react-router-dom: '6'
       sass: 1.43.3
       sass-loader: 12.4.0
       storybook-addon-mock: 2.0.2
       webpack: 5.65.0
     dependencies:
+      '@automattic/format-currency': 1.0.0-alpha.0_react@17.0.2
       '@automattic/jetpack-analytics': link:../../js-packages/analytics
       '@automattic/jetpack-components': link:../../js-packages/components
       '@automattic/jetpack-connection': link:../../js-packages/connection
-      '@wordpress/components': 19.1.6_aae888dfa296766acacf1a733aa50b3a
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       classnames: 2.3.1
       prop-types: 15.8.1
+      react-router-dom: 6.2.1_react-dom@17.0.2+react@17.0.2
     devDependencies:
       '@automattic/jetpack-base-styles': link:../../js-packages/base-styles
       '@automattic/jetpack-webpack-config': link:../../js-packages/webpack-config
@@ -684,10 +718,10 @@ importers:
     specifiers:
       '@automattic/calypso-color-schemes': 2.1.1
       '@automattic/color-studio': 2.5.0
-      '@automattic/jetpack-analytics': workspace:^0.1.7-alpha
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-analytics': workspace:^0.1.7
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@babel/core': 7.16.0
       '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.0
       '@babel/preset-env': 7.16.4
@@ -696,14 +730,14 @@ importers:
       '@size-limit/preset-app': 6.0.3
       '@testing-library/jest-dom': 5.14.1
       '@testing-library/preact': 2.0.1
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/block-editor': 8.0.12
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/block-editor': 8.1.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/data': 6.1.5
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
+      '@wordpress/data': 6.2.0
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       classnames: 2.3.1
       concurrently: 6.4.0
       fast-json-stable-stringify: 2.1.0
@@ -735,12 +769,12 @@ importers:
       '@automattic/jetpack-analytics': link:../../js-packages/analytics
       '@automattic/jetpack-api': link:../../js-packages/api
       '@automattic/jetpack-components': link:../../js-packages/components
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/block-editor': 8.0.12_b4e1ce88a10f1ab0bbeb2b9720317029
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/block-editor': 8.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
       classnames: 2.3.1
       fast-json-stable-stringify: 2.1.0
       gridicons: 3.3.1_react@17.0.2
@@ -768,7 +802,7 @@ importers:
       '@testing-library/jest-dom': 5.14.1
       '@testing-library/preact': 2.0.1_preact@10.5.15
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1_webpack@5.65.0
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0_webpack@5.65.0
       concurrently: 6.4.0
       jest: 27.3.1
       jest-environment-jsdom: 27.3.1
@@ -781,21 +815,21 @@ importers:
 
   projects/plugins/backup:
     specifiers:
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-connection': workspace:^0.14.0-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-connection': workspace:^0.15.1-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@babel/core': 7.16.0
       '@babel/preset-env': 7.16.4
       '@babel/register': 7.16.0
       '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
+      '@wordpress/api-fetch': 6.0.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/data': 6.1.5
-      '@wordpress/date': 4.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/data': 6.2.0
+      '@wordpress/date': 4.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       concurrently: 6.0.2
       react: 17.0.2
       react-dom: 17.0.2
@@ -807,11 +841,11 @@ importers:
       '@automattic/jetpack-api': link:../../js-packages/api
       '@automattic/jetpack-components': link:../../js-packages/components
       '@automattic/jetpack-connection': link:../../js-packages/connection
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
     devDependencies:
@@ -837,12 +871,12 @@ importers:
       '@rollup/plugin-typescript': 8.2.5
       '@sveltejs/eslint-config': github:sveltejs/eslint-config
       '@tsconfig/svelte': 2.0.1
-      '@typescript-eslint/eslint-plugin': 4.33.0
-      '@typescript-eslint/parser': 4.33.0
-      '@wordpress/components': 19.1.6
-      '@wordpress/e2e-test-utils': 5.4.10
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@typescript-eslint/eslint-plugin': 5.10.2
+      '@typescript-eslint/parser': 5.10.2
+      '@wordpress/components': 19.3.0
+      '@wordpress/e2e-test-utils': 6.0.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       eslint-plugin-import: 2.25.4
       eslint-plugin-svelte3: 3.2.1
       jetpack-boost-critical-css-gen: github:automattic/jetpack-boost-critical-css-gen#release-0.0.2
@@ -863,8 +897,8 @@ importers:
       tslib: 2.3.1
       typescript: 4.3.5
     dependencies:
-      '@wordpress/components': 19.1.6_@babel+core@7.16.0
-      '@wordpress/element': 4.0.4
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0
+      '@wordpress/element': 4.1.0
       jetpack-boost-critical-css-gen: github.com/automattic/jetpack-boost-critical-css-gen/0232a05d6681315f40365143c7ed93707933f7e3
     devDependencies:
       '@babel/core': 7.16.0
@@ -872,12 +906,12 @@ importers:
       '@rollup/plugin-commonjs': 19.0.2_rollup@2.56.3
       '@rollup/plugin-node-resolve': 13.0.6_rollup@2.56.3
       '@rollup/plugin-typescript': 8.2.5_fb60d1099d0f1062e1f455c5bc85cce0
-      '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/8a67624e4080bd7997606eb34981aa3346bc8de2_0ca1a0e6c61895213d3918b4d67bc4f3
+      '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/8a67624e4080bd7997606eb34981aa3346bc8de2_948a3e55fb7525b40c6fc4d3c0529949
       '@tsconfig/svelte': 2.0.1
-      '@typescript-eslint/eslint-plugin': 4.33.0_8c654464cf7de6904a251c0e456613ed
-      '@typescript-eslint/parser': 4.33.0_typescript@4.3.5
-      '@wordpress/e2e-test-utils': 5.4.10
-      '@wordpress/i18n': 4.2.4
+      '@typescript-eslint/eslint-plugin': 5.10.2_9b53d4b455d21bf3af38fdac900301d2
+      '@typescript-eslint/parser': 5.10.2_typescript@4.3.5
+      '@wordpress/e2e-test-utils': 6.0.0
+      '@wordpress/i18n': 4.3.0
       eslint-plugin-import: 2.25.4
       eslint-plugin-svelte3: 3.2.1_svelte@3.42.4
       node-wp-i18n: 1.2.6
@@ -903,16 +937,16 @@ importers:
       '@automattic/color-studio': 2.5.0
       '@automattic/components': 1.0.0-alpha.3
       '@automattic/format-currency': 1.0.0-alpha.0
-      '@automattic/jetpack-analytics': workspace:^0.1.7-alpha
-      '@automattic/jetpack-api': workspace:^0.8.3-alpha
-      '@automattic/jetpack-base-styles': workspace:^0.1.7-alpha
-      '@automattic/jetpack-components': workspace:^0.10.3-alpha
-      '@automattic/jetpack-connection': workspace:^0.14.0-alpha
-      '@automattic/jetpack-licensing': workspace:^0.4.4-alpha
-      '@automattic/jetpack-partner-coupon': workspace:^0.1.6-alpha
-      '@automattic/jetpack-webpack-config': workspace:^1.0.3-alpha
+      '@automattic/jetpack-analytics': workspace:^0.1.7
+      '@automattic/jetpack-api': workspace:^0.8.4-alpha
+      '@automattic/jetpack-base-styles': workspace:^0.1.8-alpha
+      '@automattic/jetpack-components': workspace:^0.10.5-alpha
+      '@automattic/jetpack-connection': workspace:^0.15.1-alpha
+      '@automattic/jetpack-licensing': workspace:^0.4.6-alpha
+      '@automattic/jetpack-partner-coupon': workspace:^0.1.8-alpha
+      '@automattic/jetpack-webpack-config': workspace:^1.1.2-alpha
       '@automattic/popup-monitor': 1.0.0
-      '@automattic/remove-asset-webpack-plugin': workspace:^1.0.3-alpha
+      '@automattic/remove-asset-webpack-plugin': workspace:^1.0.3
       '@automattic/request-external-access': 1.0.0
       '@automattic/social-previews': 1.1.1
       '@automattic/viewport': 1.0.0
@@ -932,26 +966,26 @@ importers:
       '@testing-library/react': 11.2.7
       '@testing-library/react-hooks': 4.0.1
       '@testing-library/user-event': 12.8.3
-      '@wordpress/annotations': 2.2.8
+      '@wordpress/annotations': 2.3.0
       '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/block-editor': 8.0.12
-      '@wordpress/blocks': 11.1.5
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/block-editor': 8.1.0
+      '@wordpress/blocks': 11.2.0
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/components': 19.1.6
-      '@wordpress/compose': 5.0.7
-      '@wordpress/core-data': 4.0.9
-      '@wordpress/data': 6.1.5
-      '@wordpress/date': 4.2.3
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1
-      '@wordpress/editor': 12.0.15
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/server-side-render': 3.0.16
-      '@wordpress/url': 3.3.1
-      '@wordpress/viewport': 4.0.7
+      '@wordpress/components': 19.3.0
+      '@wordpress/compose': 5.1.0
+      '@wordpress/core-data': 4.1.0
+      '@wordpress/data': 6.2.0
+      '@wordpress/date': 4.3.0
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0
+      '@wordpress/editor': 12.1.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/server-side-render': 3.1.0
+      '@wordpress/url': 3.4.0
+      '@wordpress/viewport': 4.1.0
       bounding-client-rect: 1.0.5
       chai: 4.3.4
       chalk: 4.1.2
@@ -970,7 +1004,7 @@ importers:
       email-validator: 2.0.4
       enzyme: 3.11.0
       enzyme-to-json: 3.6.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       fancy-log: 1.3.3
       fast-json-stable-stringify: 2.1.0
       focus-trap: 6.3.0
@@ -1058,22 +1092,22 @@ importers:
       '@automattic/jetpack-partner-coupon': link:../../js-packages/partner-coupon
       '@automattic/popup-monitor': 1.0.0
       '@automattic/request-external-access': 1.0.0
-      '@automattic/social-previews': 1.1.1_b23a2df06df1cb7d0e5a2ce752eda4cf
+      '@automattic/social-previews': 1.1.1_d6aa0d5b77ebdc587ad2683e8fb8389a
       '@automattic/viewport': 1.0.0
-      '@wordpress/annotations': 2.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/base-styles': 4.0.4
-      '@wordpress/block-editor': 8.0.12_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
+      '@wordpress/annotations': 2.3.0_react@17.0.2
+      '@wordpress/base-styles': 4.1.0
+      '@wordpress/block-editor': 8.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/blocks': 11.2.0_react@17.0.2
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/date': 4.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/url': 3.3.1
-      '@wordpress/viewport': 4.0.7_react@17.0.2+redux@4.0.5
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/url': 3.4.0
+      '@wordpress/viewport': 4.1.0_react@17.0.2
       bounding-client-rect: 1.0.5
       classnames: 2.3.1
       click-outside: 2.0.2
@@ -1159,11 +1193,11 @@ importers:
       '@testing-library/react-hooks': 4.0.1_509016fd322278d497c1e58f6164ce1d
       '@testing-library/user-event': 12.8.3_@testing-library+dom@7.31.2
       '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.0
-      '@wordpress/components': 19.1.6_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/core-data': 4.0.9_react@17.0.2+redux@4.0.5
-      '@wordpress/dependency-extraction-webpack-plugin': 3.2.1_webpack@5.65.0
-      '@wordpress/editor': 12.0.15_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/server-side-render': 3.0.16_595f56c80e7e5fab2a648c0f724c83ea
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/core-data': 4.1.0_react@17.0.2
+      '@wordpress/dependency-extraction-webpack-plugin': 3.3.0_webpack@5.65.0
+      '@wordpress/editor': 12.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/server-side-render': 3.1.0_aae888dfa296766acacf1a733aa50b3a
       chai: 4.3.4
       chalk: 4.1.2
       commander: 7.2.0
@@ -1171,7 +1205,7 @@ importers:
       css-loader: 6.5.1_webpack@5.65.0
       enzyme: 3.11.0
       enzyme-to-json: 3.6.2_enzyme@3.11.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       fs-extra: 10.0.0
       glob: 7.1.6
       jest: 27.3.1
@@ -1210,17 +1244,22 @@ importers:
       envfile: 6.17.0
       execa: 5.0.0
       glob: 7.1.6
+      ignore: 5.1.8
       inquirer: 7.3.3
       js-yaml: 4.1.0
       listr: 0.14.3
+      listr-silent-renderer: 1.1.1
       listr-update-renderer: 0.5.0
       listr-verbose-renderer: 0.6.0
       mocha: 8.4.0
+      p-limit: 4.0.0
       path-name: 1.0.0
       pluralize: 8.0.0
       process: 0.11.10
+      semver: 7.3.5
       simple-git: 2.37.0
       sinon: 9.2.4
+      sprintf-js: 1.1.2
       yargs: 16.2.0
       yargs-parser: 20.2.4
     dependencies:
@@ -1231,15 +1270,20 @@ importers:
       envfile: 6.17.0
       execa: 5.0.0
       glob: 7.1.6
+      ignore: 5.1.8
       inquirer: 7.3.3
       js-yaml: 4.1.0
       listr: 0.14.3
+      listr-silent-renderer: 1.1.1
       listr-update-renderer: 0.5.0_listr@0.14.3
       listr-verbose-renderer: 0.6.0
+      p-limit: 4.0.0
       path-name: 1.0.0
       pluralize: 8.0.0
       process: 0.11.10
+      semver: 7.3.5
       simple-git: 2.37.0
+      sprintf-js: 1.1.2
       yargs: 16.2.0
     devDependencies:
       chai: 4.3.4
@@ -1261,7 +1305,7 @@ importers:
       '@testing-library/react-hooks': 4.0.1
       '@testing-library/user-event': 12.8.3
       '@wojtekmaj/enzyme-adapter-react-17': 0.6.3
-      '@wordpress/jest-preset-default': 7.1.3
+      '@wordpress/jest-preset-default': 8.0.0
       babel-jest: 27.3.1
       chai: 4.3.4
       chai-dom: 1.11.0
@@ -1289,7 +1333,7 @@ importers:
       '@testing-library/react-hooks': 4.0.1
       '@testing-library/user-event': 12.8.3_@testing-library+dom@8.11.1
       '@wojtekmaj/enzyme-adapter-react-17': 0.6.3_enzyme@3.11.0
-      '@wordpress/jest-preset-default': 7.1.3_@babel+core@7.16.0+jest@27.3.1
+      '@wordpress/jest-preset-default': 8.0.0_@babel+core@7.16.0+jest@27.3.1
       babel-jest: 27.3.1_@babel+core@7.16.0
       chai: 4.3.4
       chai-dom: 1.11.0_chai@4.3.4+mocha@8.4.0
@@ -1313,20 +1357,20 @@ importers:
       '@babel/eslint-parser': 7.16.3
       '@octokit/auth-token': 2.4.5
       '@octokit/rest': 18.6.7
-      '@wordpress/eslint-plugin': 9.3.0
+      '@wordpress/eslint-plugin': 10.0.0
       chalk: 4.1.2
       debug: 4.3.3
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-config-prettier: 8.3.0
       eslint-config-wpcalypso: 6.1.0
       eslint-plugin-es: 4.1.0
       eslint-plugin-es5: 1.5.0
-      eslint-plugin-inclusive-language: 1.2.1
-      eslint-plugin-jest: 24.7.0
-      eslint-plugin-jsdoc: 36.1.1
+      eslint-plugin-inclusive-language: 2.2.0
+      eslint-plugin-jest: 26.0.0
+      eslint-plugin-jsdoc: 37.7.0
       eslint-plugin-jsx-a11y: 6.5.1
       eslint-plugin-lodash: 7.3.0
-      eslint-plugin-prettier: 3.4.1
+      eslint-plugin-prettier: 4.0.0
       eslint-plugin-react: 7.28.0
       eslint-plugin-react-hooks: 4.3.0
       eslint-plugin-wpcalypso: 5.0.0
@@ -1344,26 +1388,26 @@ importers:
       '@automattic/eslint-changed': link:../../projects/js-packages/eslint-changed
       '@automattic/eslint-config-target-es': link:../../projects/js-packages/eslint-config-target-es
       '@babel/core': 7.16.0
-      '@babel/eslint-parser': 7.16.3_@babel+core@7.16.0+eslint@7.32.0
+      '@babel/eslint-parser': 7.16.3_@babel+core@7.16.0+eslint@8.8.0
       '@octokit/auth-token': 2.4.5
       '@octokit/rest': 18.6.7
-      '@wordpress/eslint-plugin': 9.3.0_@babel+core@7.16.0+eslint@7.32.0
+      '@wordpress/eslint-plugin': 10.0.0_@babel+core@7.16.0+eslint@8.8.0
       chalk: 4.1.2
       debug: 4.3.3
-      eslint: 7.32.0
-      eslint-config-prettier: 8.3.0_eslint@7.32.0
-      eslint-config-wpcalypso: 6.1.0_3eb42fe7d0610a71481faeb55adacf83
-      eslint-plugin-es: 4.1.0_eslint@7.32.0
-      eslint-plugin-es5: 1.5.0_eslint@7.32.0
-      eslint-plugin-inclusive-language: 1.2.1
-      eslint-plugin-jest: 24.7.0_eslint@7.32.0
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
-      eslint-plugin-lodash: 7.3.0_eslint@7.32.0
-      eslint-plugin-prettier: 3.4.1_b003eb7dfbbe32a2afc96a18053e1e13
-      eslint-plugin-react: 7.28.0_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.3.0_eslint@7.32.0
-      eslint-plugin-wpcalypso: 5.0.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
+      eslint-config-wpcalypso: 6.1.0_11dfa443dfb9bfd86a5486c959f4047a
+      eslint-plugin-es: 4.1.0_eslint@8.8.0
+      eslint-plugin-es5: 1.5.0_eslint@8.8.0
+      eslint-plugin-inclusive-language: 2.2.0
+      eslint-plugin-jest: 26.0.0_eslint@8.8.0
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.8.0
+      eslint-plugin-lodash: 7.3.0_eslint@8.8.0
+      eslint-plugin-prettier: 4.0.0_5208900944bd53d50aafd0e7d193e6c3
+      eslint-plugin-react: 7.28.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      eslint-plugin-wpcalypso: 5.0.0_eslint@8.8.0
       glob: 7.1.6
       ignore: 5.1.8
       inquirer: 7.3.3
@@ -1459,13 +1503,13 @@ packages:
       '@automattic/popup-monitor': 1.0.0
     dev: false
 
-  /@automattic/social-previews/1.1.1_b23a2df06df1cb7d0e5a2ce752eda4cf:
+  /@automattic/social-previews/1.1.1_d6aa0d5b77ebdc587ad2683e8fb8389a:
     resolution: {integrity: sha512-yt15yIatJcGRJKhDVGpj7i7Q6l4uQnMvzjgoOU3uUC/wwLZRji+0tRrD8xfsq12hXwnx1cEkEQeSoSozZzsAtA==}
     peerDependencies:
       react: ^16.12.0
     dependencies:
       '@babel/runtime': 7.16.3
-      '@wordpress/components': 12.0.9_b23a2df06df1cb7d0e5a2ce752eda4cf
+      '@wordpress/components': 12.0.9_d6aa0d5b77ebdc587ad2683e8fb8389a
       '@wordpress/i18n': 3.20.0
       classnames: 2.3.1
       lodash: 4.17.21
@@ -1499,12 +1543,6 @@ packages:
       '@babel/highlight': 7.16.7
     dev: true
 
-  /@babel/code-frame/7.12.11:
-    resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
-    dependencies:
-      '@babel/highlight': 7.16.7
-    dev: true
-
   /@babel/code-frame/7.16.7:
     resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
@@ -1583,7 +1621,7 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/eslint-parser/7.16.3_@babel+core@7.16.0+eslint@7.32.0:
+  /@babel/eslint-parser/7.16.3_@babel+core@7.16.0+eslint@8.8.0:
     resolution: {integrity: sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
@@ -1591,7 +1629,7 @@ packages:
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
       '@babel/core': 7.16.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-scope: 5.1.1
       eslint-visitor-keys: 2.1.0
       semver: 6.3.0
@@ -1672,6 +1710,24 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helper-create-class-features-plugin/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-create-regexp-features-plugin/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==}
     engines: {node: '>=6.9.0'}
@@ -1682,6 +1738,17 @@ packages:
       '@babel/helper-annotate-as-pure': 7.16.7
       regexpu-core: 4.8.0
 
+  /@babel/helper-create-regexp-features-plugin/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      regexpu-core: 4.8.0
+    dev: true
+
   /@babel/helper-define-polyfill-provider/0.1.5_@babel+core@7.16.0:
     resolution: {integrity: sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==}
     peerDependencies:
@@ -1700,6 +1767,24 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-define-polyfill-provider/0.1.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/traverse': 7.16.3
+      debug: 4.3.3
+      lodash.debounce: 4.0.8
+      resolve: 1.21.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-define-polyfill-provider/0.3.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==}
     peerDependencies:
@@ -1717,6 +1802,24 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helper-define-polyfill-provider/0.3.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/traverse': 7.16.7
+      debug: 4.3.3
+      lodash.debounce: 4.0.8
+      resolve: 1.21.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-environment-visitor/7.16.7:
     resolution: {integrity: sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==}
     engines: {node: '>=6.9.0'}
@@ -1881,6 +1984,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==}
     engines: {node: '>=6.9.0'}
@@ -1892,6 +2005,18 @@ packages:
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
       '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
 
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-async-generator-functions/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-TTXBT3A5c11eqRzaC6beO6rlFT3Mo9C2e8eB44tTr52ESXSK2CIc2fOp1ynpAwQA8HhBMho+WXhMHWlAe3xkpw==}
     engines: {node: '>=6.9.0'}
@@ -1905,6 +2030,20 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-proposal-async-generator-functions/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-TTXBT3A5c11eqRzaC6beO6rlFT3Mo9C2e8eB44tTr52ESXSK2CIc2fOp1ynpAwQA8HhBMho+WXhMHWlAe3xkpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.7
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-class-properties/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==}
     engines: {node: '>=6.9.0'}
@@ -1930,6 +2069,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
     engines: {node: '>=6.9.0'}
@@ -1943,6 +2095,20 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-decorators/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ==}
     engines: {node: '>=6.9.0'}
@@ -1957,6 +2123,20 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/plugin-proposal-decorators/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-decorators': 7.16.7_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
     engines: {node: '>=6.9.0'}
@@ -1967,6 +2147,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-export-default-from/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-+cENpW1rgIjExn+o5c8Jw/4BuH4eGKKYvkMB8/0ZxFQ9mC0t4z09VsPIwNg6waF69QYC81zxGeAsREGuqQoKeg==}
     engines: {node: '>=6.9.0'}
@@ -1978,6 +2169,17 @@ packages:
       '@babel/plugin-syntax-export-default-from': 7.16.7_@babel+core@7.16.0
     dev: true
 
+  /@babel/plugin-proposal-export-default-from/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-+cENpW1rgIjExn+o5c8Jw/4BuH4eGKKYvkMB8/0ZxFQ9mC0t4z09VsPIwNg6waF69QYC81zxGeAsREGuqQoKeg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-export-default-from': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==}
     engines: {node: '>=6.9.0'}
@@ -1988,6 +2190,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-json-strings/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
     engines: {node: '>=6.9.0'}
@@ -1998,6 +2211,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-json-strings/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
     engines: {node: '>=6.9.0'}
@@ -2008,6 +2232,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-nullish-coalescing-operator/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==}
     engines: {node: '>=6.9.0'}
@@ -2029,6 +2264,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
     engines: {node: '>=6.9.0'}
@@ -2039,6 +2285,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-object-rest-spread/7.12.1_@babel+core@7.12.9:
     resolution: {integrity: sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==}
     peerDependencies:
@@ -2063,6 +2320,20 @@ packages:
       '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0
       '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-object-rest-spread/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.4
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
     engines: {node: '>=6.9.0'}
@@ -2073,6 +2344,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
     engines: {node: '>=6.9.0'}
@@ -2084,6 +2366,18 @@ packages:
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
 
+  /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-private-methods/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==}
     engines: {node: '>=6.9.0'}
@@ -2096,6 +2390,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-proposal-private-methods/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==}
     engines: {node: '>=6.9.0'}
@@ -2110,6 +2417,21 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-unicode-property-regex/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
     engines: {node: '>=4'}
@@ -2120,6 +2442,17 @@ packages:
       '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-proposal-unicode-property-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -2178,6 +2511,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-decorators/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw==}
     engines: {node: '>=6.9.0'}
@@ -2188,6 +2531,16 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
+  /@babel/plugin-syntax-decorators/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.0:
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
@@ -2196,6 +2549,15 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.7:
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-export-default-from/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==}
     engines: {node: '>=6.9.0'}
@@ -2206,6 +2568,16 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
+  /@babel/plugin-syntax-export-default-from/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.0:
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
@@ -2214,6 +2586,15 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.7:
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-flow/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==}
     engines: {node: '>=6.9.0'}
@@ -2294,6 +2675,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
@@ -2408,6 +2799,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.0:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
@@ -2453,6 +2854,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-async-to-generator/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-pFEfjnK4DfXCfAlA5I98BYdDJD8NltMzx19gt6DAmfE+2lXRfPUoa0/5SUjT4+TDE1W/rcxU/1lgN55vpAjjdg==}
     engines: {node: '>=6.9.0'}
@@ -2466,6 +2877,20 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-async-to-generator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-pFEfjnK4DfXCfAlA5I98BYdDJD8NltMzx19gt6DAmfE+2lXRfPUoa0/5SUjT4+TDE1W/rcxU/1lgN55vpAjjdg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
     engines: {node: '>=6.9.0'}
@@ -2475,6 +2900,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-block-scoping/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
     engines: {node: '>=6.9.0'}
@@ -2484,6 +2919,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-block-scoping/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-classes/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
     engines: {node: '>=6.9.0'}
@@ -2502,6 +2947,25 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-classes/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-computed-properties/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
     engines: {node: '>=6.9.0'}
@@ -2511,6 +2975,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-computed-properties/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-destructuring/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==}
     engines: {node: '>=6.9.0'}
@@ -2520,6 +2994,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-destructuring/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
     engines: {node: '>=6.9.0'}
@@ -2530,6 +3014,17 @@ packages:
       '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-duplicate-keys/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
     engines: {node: '>=6.9.0'}
@@ -2539,6 +3034,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-duplicate-keys/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
     engines: {node: '>=6.9.0'}
@@ -2549,6 +3054,17 @@ packages:
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-flow-strip-types/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
     engines: {node: '>=6.9.0'}
@@ -2569,6 +3085,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-for-of/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
     engines: {node: '>=6.9.0'}
@@ -2580,6 +3106,18 @@ packages:
       '@babel/helper-function-name': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-literals/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
     engines: {node: '>=6.9.0'}
@@ -2589,6 +3127,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
     engines: {node: '>=6.9.0'}
@@ -2598,6 +3146,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-modules-amd/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
     engines: {node: '>=6.9.0'}
@@ -2611,23 +3169,52 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/plugin-transform-modules-commonjs/7.16.7_@babel+core@7.16.0:
-    resolution: {integrity: sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==}
+  /@babel/plugin-transform-modules-amd/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       '@babel/helper-module-transforms': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
-      '@babel/helper-simple-access': 7.16.7
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
-  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.0:
-    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-transform-modules-commonjs/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/plugin-transform-modules-commonjs/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -2640,6 +3227,22 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-modules-umd/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
     engines: {node: '>=6.9.0'}
@@ -2652,6 +3255,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-modules-umd/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-named-capturing-groups-regex/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-kFy35VwmwIQwCjwrAQhl3+c/kr292i4KdLPKp5lPH03Ltc51qnFlIADoyPxc/6Naz3ok3WdYKg+KK6AH+D4utg==}
     engines: {node: '>=6.9.0'}
@@ -2661,6 +3277,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
 
+  /@babel/plugin-transform-named-capturing-groups-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-kFy35VwmwIQwCjwrAQhl3+c/kr292i4KdLPKp5lPH03Ltc51qnFlIADoyPxc/6Naz3ok3WdYKg+KK6AH+D4utg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-transform-new-target/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
     engines: {node: '>=6.9.0'}
@@ -2670,6 +3296,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-new-target/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
     engines: {node: '>=6.9.0'}
@@ -2682,6 +3318,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-parameters/7.16.7_@babel+core@7.12.9:
     resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
     engines: {node: '>=6.9.0'}
@@ -2701,6 +3350,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-parameters/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
     engines: {node: '>=6.9.0'}
@@ -2710,6 +3369,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-react-display-name/7.16.7:
     resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
     engines: {node: '>=6.9.0'}
@@ -2728,6 +3397,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-react-jsx-development/7.16.7:
     resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
     engines: {node: '>=6.9.0'}
@@ -2746,6 +3425,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.0
 
+  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-transform-react-jsx/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==}
     engines: {node: '>=6.9.0'}
@@ -2786,6 +3475,20 @@ packages:
       '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.16.0
       '@babel/types': 7.16.7
 
+  /@babel/plugin-transform-react-jsx/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/types': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-react-pure-annotations/7.16.7:
     resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
     engines: {node: '>=6.9.0'}
@@ -2806,6 +3509,17 @@ packages:
       '@babel/helper-annotate-as-pure': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-regenerator/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
     engines: {node: '>=6.9.0'}
@@ -2815,6 +3529,16 @@ packages:
       '@babel/core': 7.16.0
       regenerator-transform: 0.14.5
 
+  /@babel/plugin-transform-regenerator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      regenerator-transform: 0.14.5
+    dev: true
+
   /@babel/plugin-transform-reserved-words/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
     engines: {node: '>=6.9.0'}
@@ -2824,6 +3548,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-reserved-words/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-runtime/7.16.4_@babel+core@7.16.0:
     resolution: {integrity: sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A==}
     engines: {node: '>=6.9.0'}
@@ -2840,18 +3574,18 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/plugin-transform-runtime/7.16.7_@babel+core@7.16.0:
+  /@babel/plugin-transform-runtime/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-2FoHiSAWkdq4L06uaDN3rS43i6x28desUVxq+zAFuE6kbWYQeiLPJI5IC7Sg9xKYVcrBKSQkVUfH6aeQYbl9QA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       '@babel/helper-module-imports': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
-      babel-plugin-polyfill-corejs2: 0.3.0_@babel+core@7.16.0
-      babel-plugin-polyfill-corejs3: 0.4.0_@babel+core@7.16.0
-      babel-plugin-polyfill-regenerator: 0.3.0_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs2: 0.3.0_@babel+core@7.16.7
+      babel-plugin-polyfill-corejs3: 0.4.0_@babel+core@7.16.7
+      babel-plugin-polyfill-regenerator: 0.3.0_@babel+core@7.16.7
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
@@ -2866,6 +3600,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-spread/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
     engines: {node: '>=6.9.0'}
@@ -2876,6 +3620,17 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
 
+  /@babel/plugin-transform-spread/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+    dev: true
+
   /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
     engines: {node: '>=6.9.0'}
@@ -2885,6 +3640,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-template-literals/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
     engines: {node: '>=6.9.0'}
@@ -2894,6 +3659,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-template-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-typeof-symbol/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
     engines: {node: '>=6.9.0'}
@@ -2903,6 +3678,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-typeof-symbol/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-typescript/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA==}
     engines: {node: '>=6.9.0'}
@@ -2916,6 +3701,20 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/plugin-transform-typescript/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-typescript': 7.16.7_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
     engines: {node: '>=6.9.0'}
@@ -2925,6 +3724,16 @@ packages:
       '@babel/core': 7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
     engines: {node: '>=6.9.0'}
@@ -2935,6 +3744,17 @@ packages:
       '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
       '@babel/helper-plugin-utils': 7.16.7
 
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/preset-env/7.16.4_@babel+core@7.16.0:
     resolution: {integrity: sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA==}
     engines: {node: '>=6.9.0'}
@@ -3104,21 +3924,106 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/preset-flow/7.16.7_@babel+core@7.16.0:
-    resolution: {integrity: sha512-6ceP7IyZdUYQ3wUVqyRSQXztd1YmFHWI4Xv11MIqAlE4WqxBSd/FZ61V9k+TS5Gd4mkHOtQtPp9ymRpxH4y1Ug==}
+  /@babel/preset-env/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-urX3Cee4aOZbRWOSa3mKPk0aqDikfILuo+C7qq7HY0InylGNZ1fekq9jmlr3pLWwZHF4yD7heQooc2Pow2KMyQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/compat-data': 7.16.4
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
       '@babel/helper-plugin-utils': 7.16.7
       '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.16.0
-    dev: true
-
-  /@babel/preset-modules/0.1.5_@babel+core@7.16.0:
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
-    peerDependencies:
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-async-generator-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-class-static-block': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-json-strings': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-logical-assignment-operators': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-private-methods': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-private-property-in-object': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-async-to-generator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-computed-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-duplicate-keys': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-amd': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-commonjs': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-systemjs': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-umd': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-new-target': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-regenerator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-reserved-words': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-typeof-symbol': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-modules': 0.1.5_@babel+core@7.16.7
+      '@babel/types': 7.16.7
+      babel-plugin-polyfill-corejs2: 0.3.0_@babel+core@7.16.7
+      babel-plugin-polyfill-corejs3: 0.4.0_@babel+core@7.16.7
+      babel-plugin-polyfill-regenerator: 0.3.0_@babel+core@7.16.7
+      core-js-compat: 3.20.2
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/preset-flow/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-6ceP7IyZdUYQ3wUVqyRSQXztd1YmFHWI4Xv11MIqAlE4WqxBSd/FZ61V9k+TS5Gd4mkHOtQtPp9ymRpxH4y1Ug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.16.0
+    dev: true
+
+  /@babel/preset-modules/0.1.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
@@ -3128,6 +4033,19 @@ packages:
       '@babel/types': 7.16.7
       esutils: 2.0.3
 
+  /@babel/preset-modules/0.1.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/types': 7.16.7
+      esutils: 2.0.3
+    dev: true
+
   /@babel/preset-react/7.16.0:
     resolution: {integrity: sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw==}
     engines: {node: '>=6.9.0'}
@@ -3171,6 +4089,21 @@ packages:
       '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.16.0
     dev: true
 
+  /@babel/preset-react/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.16.7
+    dev: true
+
   /@babel/preset-typescript/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-txegdrZYgO9DlPbv+9QOVpMnKbOtezsLHWsnsRF4AjbSIsVaujrq1qg8HK0mxQpWv0jnejt0yEoW1uWpvbrDTg==}
     engines: {node: '>=6.9.0'}
@@ -3198,6 +4131,20 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/preset-typescript/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-typescript': 7.16.7_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/register/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-lzl4yfs0zVXnooeLE0AAfYaT7F3SPA8yB2Bj4W1BiZwLbMS3MZH35ZvCWSRHvneUugwuM+Wsnrj7h0F7UmU3NQ==}
     engines: {node: '>=6.9.0'}
@@ -3211,13 +4158,13 @@ packages:
       pirates: 4.0.4
       source-map-support: 0.5.21
 
-  /@babel/register/7.16.7_@babel+core@7.16.0:
+  /@babel/register/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-Ft+cuxorVxFj4RrPDs9TbJNE7ZbuJTyazUC6jLWRvBQT/qIDZPMe7MHgjlrA+11+XDLh+I0Pnx7sxPp4LRhzcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -3322,6 +4269,7 @@ packages:
     dependencies:
       exec-sh: 0.3.6
       minimist: 1.2.5
+    dev: true
 
   /@discoveryjs/json-ext/0.5.6:
     resolution: {integrity: sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==}
@@ -3735,26 +4683,26 @@ packages:
   /@emotion/weak-memoize/0.2.5:
     resolution: {integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==}
 
-  /@es-joy/jsdoccomment/0.10.8:
-    resolution: {integrity: sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /@es-joy/jsdoccomment/0.18.0:
+    resolution: {integrity: sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     dependencies:
-      comment-parser: 1.2.4
+      comment-parser: 1.3.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.1.1
+      jsdoc-type-pratt-parser: 2.2.2
     dev: true
 
-  /@eslint/eslintrc/0.4.3:
-    resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@eslint/eslintrc/1.0.5:
+    resolution: {integrity: sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.3
-      espree: 7.3.1
+      espree: 9.3.0
       globals: 13.12.0
       ignore: 4.0.6
       import-fresh: 3.3.0
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       minimatch: 3.0.4
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
@@ -3780,8 +4728,8 @@ packages:
       through2: 2.0.5
     dev: false
 
-  /@humanwhocodes/config-array/0.5.0:
-    resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==}
+  /@humanwhocodes/config-array/0.9.3:
+    resolution: {integrity: sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -3965,7 +4913,7 @@ packages:
     resolution: {integrity: sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==}
     engines: {node: '>= 10.14.2'}
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       '@jest/types': 26.6.2
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
@@ -3982,6 +4930,7 @@ packages:
       write-file-atomic: 3.0.3
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@jest/transform/27.4.6:
     resolution: {integrity: sha512-9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw==}
@@ -5460,34 +6409,34 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@babel/core': 7.16.0
-      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-decorators': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-export-default-from': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-proposal-private-methods': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
-      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-env': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-react': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-typescript': 7.16.7_@babel+core@7.16.0
-      '@babel/register': 7.16.7_@babel+core@7.16.0
+      '@babel/core': 7.16.7
+      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-decorators': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-export-default-from': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-private-methods': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-env': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-react': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-typescript': 7.16.7_@babel+core@7.16.7
+      '@babel/register': 7.16.7_@babel+core@7.16.7
       '@storybook/node-logger': 6.4.10
       '@storybook/semver': 7.3.2
       '@types/node': 14.18.5
       '@types/pretty-hrtime': 1.0.1
-      babel-loader: 8.2.3_8dd2b11efd9b7265f9b7da54f0e73ab1
+      babel-loader: 8.2.3_c391fd7145c194be609b87ed083bbc6a
       babel-plugin-macros: 3.1.0
-      babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.16.7
       chalk: 4.1.2
       core-js: 3.20.2
       express: 4.17.2
@@ -5751,11 +6700,11 @@ packages:
   /@storybook/csf-tools/6.4.10:
     resolution: {integrity: sha512-2s6t1lgtHaLkAZZPZJsrU/1IQu8CUa4GpOt+nrRXph4t5vZyETY0LU8ElS1d4V4/+JHGHN6E20r+E+gSjHq+Jw==}
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       '@babel/generator': 7.16.7
       '@babel/parser': 7.16.7
-      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-env': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-env': 7.16.7_@babel+core@7.16.7
       '@babel/traverse': 7.16.3
       '@babel/types': 7.16.7
       '@mdx-js/mdx': 1.6.22
@@ -6573,6 +7522,12 @@ packages:
     resolution: {integrity: sha512-FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==}
     dependencies:
       '@types/react': 16.14.21
+    dev: false
+
+  /@types/react-dom/17.0.11:
+    resolution: {integrity: sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==}
+    dependencies:
+      '@types/react': 17.0.38
 
   /@types/react-redux/7.1.21:
     resolution: {integrity: sha512-bLdglUiBSQNzWVVbmNPKGYYjrzp3/YDPwfOH3nLEz99I4awLlaRAPWjo6bZ2POpxztFWtDDXIPxBLVykXqBt+w==}
@@ -6600,6 +7555,7 @@ packages:
       '@types/prop-types': 15.7.4
       '@types/scheduler': 0.16.2
       csstype: 3.0.10
+    dev: false
 
   /@types/react/17.0.38:
     resolution: {integrity: sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==}
@@ -6694,22 +7650,23 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e:
-    resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/eslint-plugin/5.10.2_0d682450f1ef58680b7f0316f2e82e26:
+    resolution: {integrity: sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^4.0.0
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/scope-manager': 4.33.0
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/type-utils': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
       debug: 4.3.3
-      eslint: 7.32.0
+      eslint: 8.8.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
@@ -6719,20 +7676,21 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin/4.33.0_8c654464cf7de6904a251c0e456613ed:
-    resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/eslint-plugin/5.10.2_9b53d4b455d21bf3af38fdac900301d2:
+    resolution: {integrity: sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^4.0.0
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.33.0_typescript@4.3.5
-      '@typescript-eslint/parser': 4.33.0_typescript@4.3.5
-      '@typescript-eslint/scope-manager': 4.33.0
+      '@typescript-eslint/parser': 5.10.2_typescript@4.3.5
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/type-utils': 5.10.2_typescript@4.3.5
+      '@typescript-eslint/utils': 5.10.2_typescript@4.3.5
       debug: 4.3.3
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
@@ -6744,103 +7702,117 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/experimental-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-stRnIlxDduzxtaVLtEohESoXI1k7J6jvJHGyIkOT2pvXbg5whPM6f9tzJ51bJJxaJTdmvwgVFDNCopFRb2F5Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
-      eslint: 7.32.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@7.32.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/experimental-utils/4.33.0_typescript@4.3.5:
-    resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/parser/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.3.5
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      debug: 4.3.3
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
-      - typescript
     dev: true
 
-  /@typescript-eslint/parser/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/parser/5.10.2_typescript@4.3.5:
+    resolution: {integrity: sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2_typescript@4.3.5
       debug: 4.3.3
-      eslint: 7.32.0
+      typescript: 4.3.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/4.33.0_typescript@4.3.5:
-    resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/scope-manager/5.10.2:
+    resolution: {integrity: sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
+    dev: true
+
+  /@typescript-eslint/type-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: '*'
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0_typescript@4.3.5
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
       debug: 4.3.3
-      typescript: 4.3.5
+      eslint: 8.8.0
+      tsutils: 3.21.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/4.33.0:
-    resolution: {integrity: sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/type-utils/5.10.2_typescript@4.3.5:
+    resolution: {integrity: sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@typescript-eslint/utils': 5.10.2_typescript@4.3.5
+      debug: 4.3.3
+      tsutils: 3.21.0_typescript@4.3.5
+      typescript: 4.3.5
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@typescript-eslint/types/4.33.0:
-    resolution: {integrity: sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/types/5.10.2:
+    resolution: {integrity: sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/4.33.0:
-    resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/typescript-estree/5.10.2:
+    resolution: {integrity: sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
       debug: 4.3.3
       globby: 11.1.0
       is-glob: 4.0.3
@@ -6850,17 +7822,17 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree/4.33.0_typescript@4.3.5:
-    resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/typescript-estree/5.10.2_typescript@4.3.5:
+    resolution: {integrity: sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
       debug: 4.3.3
       globby: 11.1.0
       is-glob: 4.0.3
@@ -6871,12 +7843,47 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/visitor-keys/4.33.0:
-    resolution: {integrity: sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      eslint-visitor-keys: 2.1.0
+      '@types/json-schema': 7.0.9
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      eslint: 8.8.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.8.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/utils/5.10.2_typescript@4.3.5:
+    resolution: {integrity: sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.9
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2_typescript@4.3.5
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.10.2:
+    resolution: {integrity: sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      eslint-visitor-keys: 3.2.0
     dev: true
 
   /@ungap/promise-all-settled/1.1.2:
@@ -7038,46 +8045,45 @@ packages:
   /@wordpress/a11y/2.15.3:
     resolution: {integrity: sha512-uoCznHY3/TaNWeXutLI6juC198ykaBwZ34P51PNHHQqi3WzVoBhFx6AnAR/9Uupl3tZcekefpkVHy7AJHMAPIA==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/dom-ready': 2.13.2
       '@wordpress/i18n': 3.20.0
     dev: false
 
-  /@wordpress/a11y/3.2.4:
-    resolution: {integrity: sha512-RhDZciRy6XUx/hegJdJTgAtC/6i7DjfpUYJdy6McwvWXs56tMmCo+wBYQvC3G//+2VYdYYkwDZ8Z6eVUBSJ17w==}
+  /@wordpress/a11y/3.3.0:
+    resolution: {integrity: sha512-PiLX+4M3NZtCY/Nndn8D1naBTBJLVGokL6sFfaAGYhajiXg0KywCYILw19h6aNAxWpLREeBYpwiD3LsDrz+3Wg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/dom-ready': 3.2.3
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/dom-ready': 3.3.0
+      '@wordpress/i18n': 4.3.0
 
-  /@wordpress/annotations/2.2.8_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-cT+Mk6oEsSYHvaXtxO+JExCsP34Un21GahOIQK74lq1hJUy34TxqzuftbdDLvu9gbrKRnzVlPH9Uv6RHVHkXbg==}
+  /@wordpress/annotations/2.3.0_react@17.0.2:
+    resolution: {integrity: sha512-MdvQaQluQlORjPQIwpl5INocqv5q+CZd7XPWh/6tfywbE2cM1nGD2eZjcFEaRHF/akC66kAb9aqb9IE3jg9D0A==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
+      '@babel/runtime': 7.16.7
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
       lodash: 4.17.21
       rememo: 3.0.0
       uuid: 8.3.2
     transitivePeerDependencies:
       - react
-      - redux
     dev: false
 
-  /@wordpress/api-fetch/5.2.6:
-    resolution: {integrity: sha512-AG8KdCHwtYJWR38AAU7nEI+UbumUSqSBthQj3rShLUVyFbYGkQdpwXJJG6vFj7FjIp41zljiyj3K1Fh3cqdaAw==}
+  /@wordpress/api-fetch/6.0.0:
+    resolution: {integrity: sha512-pSfqdzaOO7/SrIDkFJDhVDs0DLy1WmrtIxz4rTub+H538MolyHmUh9xs1aIyakgC9PH7DrkzVmj00d8QXBcVcw==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/url': 3.3.1
+      '@babel/runtime': 7.16.7
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/url': 3.4.0
 
-  /@wordpress/autop/3.2.3:
-    resolution: {integrity: sha512-o66vC+aZPmJGMie+Emqa5gtfQYKbLXqGCESTfingXyMxXEpCa4qOEOi1D6vwX61sf3+k2qJ4bvKwJ5nZXjDaSQ==}
+  /@wordpress/autop/3.3.0:
+    resolution: {integrity: sha512-z31raAcFIw2kUqtHXMMI0iei5DoJzVXHlqmbpR6rv3J4BgXKMmvevArvvjoe2SH+M9rrjJD2GIxFsfWZ5Tvccw==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
@@ -7091,118 +8097,78 @@ packages:
       '@babel/core': 7.16.0
     dev: true
 
-  /@wordpress/babel-preset-default/6.4.1:
-    resolution: {integrity: sha512-T0+dPOn0Hus/FSP043H3C2awjGNWLJcSahm7LhLqT5uUtgdg6QD9yf4jSr7G5mpLO/DXgz2ZnaYMUj+d1/gk9w==}
+  /@wordpress/babel-plugin-import-jsx-pragma/3.1.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-518mL3goaSeXtJCQcPK9OYHUUiA0sjXuoGWHBwRalkyTIQZZy5ZZzlwrlSc9ESZcOw9BZ+Uo8CJRjV2OWnx+Zw==}
     engines: {node: '>=12'}
+    peerDependencies:
+      '@babel/core': ^7.12.9
     dependencies:
-      '@babel/core': 7.16.0
-      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.0
-      '@babel/plugin-transform-runtime': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-env': 7.16.7_@babel+core@7.16.0
-      '@babel/preset-typescript': 7.16.7_@babel+core@7.16.0
+      '@babel/core': 7.16.7
+    dev: true
+
+  /@wordpress/babel-preset-default/6.5.0:
+    resolution: {integrity: sha512-F2bv78gNz8FsSP88tEabNffiynvwgepcfustDCbhXXWZoMQoTmyu+jj1h7sjriH+9lIUmfcJifKy+QstCR1Y4w==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-runtime': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-env': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-typescript': 7.16.7_@babel+core@7.16.7
       '@babel/runtime': 7.16.7
-      '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.0
+      '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.7
       '@wordpress/browserslist-config': 4.1.0
-      '@wordpress/element': 4.0.4
-      '@wordpress/warning': 2.2.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/warning': 2.3.0
       browserslist: 4.19.1
       core-js: 3.20.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@wordpress/base-styles/4.0.4:
-    resolution: {integrity: sha512-qXiIhWLdTHWxBWawcqigJUUMeb2jkn9ElUEUC/Cn3DK2i62jiUWXOLp6tFIaf5eQMNXsYqtp5r7n2F/OllngQA==}
+  /@wordpress/base-styles/4.1.0:
+    resolution: {integrity: sha512-rjyMWFs0WWE16w77sHffaXBFosg15iUUVpQr/H4eEElHE/JpXFZJczMbM3yx5tSH+72S3sPFVn5NYn4qHLP7Rg==}
 
-  /@wordpress/blob/3.2.2:
-    resolution: {integrity: sha512-uzOlmwcTtxZFBoQc6nDYdkTvPnd6QMK5GEmmrHt6Q1OYOZ6V2vOdC6w0IdynbQYpuNnaWwhyfcsTRh/+97UoRg==}
+  /@wordpress/blob/3.3.0:
+    resolution: {integrity: sha512-5kwl/Wv+LuF9sTzCCbmavlV34Vl9o+eFdwb4ILgvixxSgUzyTL02/ZcC6zcEq6wPtIzkpRm87iU5Y4SLIFZh0g==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
 
-  /@wordpress/block-editor/8.0.12_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-wif8ntsph9N9s6wAh6xfEOQMzXg0uTnqaczoK01K+5gou01JILvGwaApTbWucgPDrLvU3CVW1Mt8USvBB2ujhw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@react-spring/web': 9.4.1_react-dom@17.0.2+react@17.0.2
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/components': 19.2.0_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/shortcode': 3.2.3
-      '@wordpress/token-list': 2.2.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/warning': 2.2.2
-      '@wordpress/wordcount': 3.2.3
-      classnames: 2.3.1
-      colord: 2.9.2
-      css-mediaquery: 0.1.2
-      diff: 4.0.2
-      dom-scroll-into-view: 1.2.1
-      inherits: 2.0.4
-      lodash: 4.17.21
-      memize: 1.1.0
-      react-autosize-textarea: 7.1.0_react-dom@17.0.2+react@17.0.2
-      react-easy-crop: 3.5.3_react-dom@17.0.2+react@17.0.2
-      redux-multi: 0.1.12
-      rememo: 3.0.0
-      traverse: 0.6.6
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
-
-  /@wordpress/block-editor/8.0.12_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-wif8ntsph9N9s6wAh6xfEOQMzXg0uTnqaczoK01K+5gou01JILvGwaApTbWucgPDrLvU3CVW1Mt8USvBB2ujhw==}
+  /@wordpress/block-editor/8.1.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-/Qw/N2e8OuEZoh1Wt7LfeiNNGIjQ0nuo/lfO0HfJnAyspQSfB3fVByAl7cODPOLxmFbbfRg00JVyyybguueyrg==}
     engines: {node: '>=12'}
+    peerDependencies:
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@react-spring/web': 9.4.1_react@17.0.2
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/components': 19.2.0_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/shortcode': 3.2.3
-      '@wordpress/token-list': 2.2.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/warning': 2.2.2
-      '@wordpress/wordcount': 3.2.3
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/block-serialization-default-parser': 4.3.0
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keyboard-shortcuts': 3.1.0_react@17.0.2
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/shortcode': 3.3.0
+      '@wordpress/token-list': 2.3.0
+      '@wordpress/url': 3.4.0
+      '@wordpress/warning': 2.3.0
+      '@wordpress/wordcount': 3.3.0
       classnames: 2.3.1
       colord: 2.9.2
       css-mediaquery: 0.1.2
@@ -7211,6 +8177,7 @@ packages:
       inherits: 2.0.4
       lodash: 4.17.21
       memize: 1.1.0
+      react: 17.0.2
       react-autosize-textarea: 7.1.0_react@17.0.2
       react-easy-crop: 3.5.3_react@17.0.2
       redux-multi: 0.1.12
@@ -7219,96 +8186,42 @@ packages:
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
-  /@wordpress/block-editor/8.0.12_b4e1ce88a10f1ab0bbeb2b9720317029:
-    resolution: {integrity: sha512-wif8ntsph9N9s6wAh6xfEOQMzXg0uTnqaczoK01K+5gou01JILvGwaApTbWucgPDrLvU3CVW1Mt8USvBB2ujhw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@react-spring/web': 9.4.1_react-dom@17.0.2+react@17.0.2
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/components': 19.2.0_b4e1ce88a10f1ab0bbeb2b9720317029
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2+redux@4.1.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2+redux@4.1.1
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.1.1
-      '@wordpress/shortcode': 3.2.3
-      '@wordpress/token-list': 2.2.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/warning': 2.2.2
-      '@wordpress/wordcount': 3.2.3
-      classnames: 2.3.1
-      colord: 2.9.2
-      css-mediaquery: 0.1.2
-      diff: 4.0.2
-      dom-scroll-into-view: 1.2.1
-      inherits: 2.0.4
-      lodash: 4.17.21
-      memize: 1.1.0
-      react-autosize-textarea: 7.1.0_react-dom@17.0.2+react@17.0.2
-      react-easy-crop: 3.5.3_react-dom@17.0.2+react@17.0.2
-      redux-multi: 0.1.12
-      rememo: 3.0.0
-      traverse: 0.6.6
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
-    dev: false
-
-  /@wordpress/block-editor/8.0.13_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-U/0Hj6wwayOFqBZg8ObR6XaDMpEnq1PXsNemxKp4BhLixiBDKMC0eXC0kBQJYm6BouMVwiw2r0StIyvl+XFovA==}
+  /@wordpress/block-editor/8.1.0_aae888dfa296766acacf1a733aa50b3a:
+    resolution: {integrity: sha512-/Qw/N2e8OuEZoh1Wt7LfeiNNGIjQ0nuo/lfO0HfJnAyspQSfB3fVByAl7cODPOLxmFbbfRg00JVyyybguueyrg==}
     engines: {node: '>=12'}
+    peerDependencies:
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@react-spring/web': 9.4.1_react-dom@17.0.2+react@17.0.2
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/components': 19.2.0_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/shortcode': 3.2.3
-      '@wordpress/token-list': 2.2.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/warning': 2.2.2
-      '@wordpress/wordcount': 3.2.3
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/block-serialization-default-parser': 4.3.0
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keyboard-shortcuts': 3.1.0_react@17.0.2
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/shortcode': 3.3.0
+      '@wordpress/token-list': 2.3.0
+      '@wordpress/url': 3.4.0
+      '@wordpress/warning': 2.3.0
+      '@wordpress/wordcount': 3.3.0
       classnames: 2.3.1
       colord: 2.9.2
       css-mediaquery: 0.1.2
@@ -7317,7 +8230,9 @@ packages:
       inherits: 2.0.4
       lodash: 4.17.21
       memize: 1.1.0
+      react: 17.0.2
       react-autosize-textarea: 7.1.0_react-dom@17.0.2+react@17.0.2
+      react-dom: 17.0.2_react@17.0.2
       react-easy-crop: 3.5.3_react-dom@17.0.2+react@17.0.2
       redux-multi: 0.1.12
       rememo: 3.0.0
@@ -7325,99 +8240,40 @@ packages:
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
-    dev: true
-
-  /@wordpress/block-editor/8.0.13_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-U/0Hj6wwayOFqBZg8ObR6XaDMpEnq1PXsNemxKp4BhLixiBDKMC0eXC0kBQJYm6BouMVwiw2r0StIyvl+XFovA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@react-spring/web': 9.4.1_react@17.0.2
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/components': 19.2.0_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/shortcode': 3.2.3
-      '@wordpress/token-list': 2.2.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/warning': 2.2.2
-      '@wordpress/wordcount': 3.2.3
-      classnames: 2.3.1
-      colord: 2.9.2
-      css-mediaquery: 0.1.2
-      diff: 4.0.2
-      dom-scroll-into-view: 1.2.1
-      inherits: 2.0.4
-      lodash: 4.17.21
-      memize: 1.1.0
-      react-autosize-textarea: 7.1.0_react@17.0.2
-      react-easy-crop: 3.5.3_react@17.0.2
-      redux-multi: 0.1.12
-      rememo: 3.0.0
-      traverse: 0.6.6
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
-    dev: true
 
-  /@wordpress/block-library/6.0.17_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-/YC1eOHcb5ZokSODx04rcA5Qco3EDi3nIVZVyx1VMeJHxWB+qaYb49dnliqvnG/A5DoaEJeV5YsOMMbHbz914Q==}
+  /@wordpress/block-library/6.1.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-HFN/ZFOd2ZFoIz6a34q9jLWVXqZRkuv0aYO0CDRLxMfuULMRYuCOwHvEVSF5ObaKX2+0Z0czy1V08vKANb/UVA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/autop': 3.2.3
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-editor': 8.0.12_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/components': 19.1.6_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/core-data': 4.0.9_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/escape-html': 2.2.3
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/interface': 4.1.15_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/notices': 3.2.8_react@17.0.2
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/reusable-blocks': 3.0.19_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/server-side-render': 3.0.17_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/url': 3.3.1
-      '@wordpress/viewport': 4.0.7_react@17.0.2
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/autop': 3.3.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/block-editor': 8.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/core-data': 4.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/escape-html': 2.3.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/primitives': 3.1.0
+      '@wordpress/reusable-blocks': 3.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/server-side-render': 3.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/url': 3.4.0
+      '@wordpress/viewport': 4.1.0_react@17.0.2
       classnames: 2.3.1
       colord: 2.9.2
       fast-average-color: 4.3.0
@@ -7430,93 +8286,32 @@ packages:
       - '@types/react'
       - react
       - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
-  /@wordpress/block-serialization-default-parser/4.2.3:
-    resolution: {integrity: sha512-VAgRRijd/gZ0ET7lXXEG4/efK5zaBH4RqFV2VJsnuNDQe8CmtmHoCxQC2cUHHhnm9KpubffvVtK+R0mscSmH2Q==}
+  /@wordpress/block-serialization-default-parser/4.3.0:
+    resolution: {integrity: sha512-7wydVvSKp3ZOaYxrzZBWZXr+/yQQyNKaxarmoHsa4aF9Vu6YMMzrF38IUJrHsaFX1pYK/zq/nleEq+HUDi6isQ==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
 
-  /@wordpress/blocks/11.1.5_react@17.0.2:
-    resolution: {integrity: sha512-r4xNTQPpUqJ7vqsJqH4D5+GeRQVOLF+9dkeNxkKQnJSFZ5y6POd28d0gMsOcTdGtAzXN6sak104DaKry2SWQNA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/autop': 3.2.3
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/shortcode': 3.2.3
-      colord: 2.9.2
-      hpq: 1.3.0
-      lodash: 4.17.21
-      rememo: 3.0.0
-      showdown: 1.9.1
-      simple-html-tokenizer: 0.5.11
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: true
-
-  /@wordpress/blocks/11.1.5_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-r4xNTQPpUqJ7vqsJqH4D5+GeRQVOLF+9dkeNxkKQnJSFZ5y6POd28d0gMsOcTdGtAzXN6sak104DaKry2SWQNA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/autop': 3.2.3
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/shortcode': 3.2.3
-      colord: 2.9.2
-      hpq: 1.3.0
-      lodash: 4.17.21
-      rememo: 3.0.0
-      showdown: 1.9.1
-      simple-html-tokenizer: 0.5.11
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - react
-      - redux
-
-  /@wordpress/blocks/11.1.5_react@17.0.2+redux@4.1.1:
-    resolution: {integrity: sha512-r4xNTQPpUqJ7vqsJqH4D5+GeRQVOLF+9dkeNxkKQnJSFZ5y6POd28d0gMsOcTdGtAzXN6sak104DaKry2SWQNA==}
+  /@wordpress/blocks/11.2.0_react@17.0.2:
+    resolution: {integrity: sha512-8/ES5wm38/Ydo7Zol4lZT4xlLxE05fLrgjysE14hMBZUYUivqJFRhYxoSrMHW03LBmUUi2fYcdrCh+JRLGbLuw==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/autop': 3.2.3
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-serialization-default-parser': 4.2.3
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/shortcode': 3.2.3
+      '@babel/runtime': 7.16.7
+      '@wordpress/autop': 3.3.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/block-serialization-default-parser': 4.3.0
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/shortcode': 3.3.0
       colord: 2.9.2
       hpq: 1.3.0
       lodash: 4.17.21
@@ -7526,349 +8321,142 @@ packages:
       uuid: 8.3.2
     transitivePeerDependencies:
       - react
-      - redux
-    dev: false
 
   /@wordpress/browserslist-config/4.1.0:
     resolution: {integrity: sha512-RSJhgY2xmz6yAdDNhz/NvAO6JS+91vv9cVL7VDG2CftbyjTXBef05vWt3FzZhfeF0xUrYdpZL1PVpxmJiKvbEg==}
     engines: {node: '>=12'}
 
-  /@wordpress/components/12.0.9_b23a2df06df1cb7d0e5a2ce752eda4cf:
+  /@wordpress/components/12.0.9_d6aa0d5b77ebdc587ad2683e8fb8389a:
     resolution: {integrity: sha512-J6uM20Jpchr/NywQmAeVqx/LohwKizi2F8HylqN1Xt2mYzuOrDirlEhQT1wmfqiEqEt0l+mefZEBlxeknMfBag==}
     dependencies:
       '@babel/runtime': 7.16.3
       '@emotion/core': 10.3.1_react@17.0.2
-      '@emotion/css': 10.0.27
-      '@emotion/native': 10.0.27_316248eb6686a2fd4fbadcfd00de37f3
-      '@emotion/styled': 10.3.0_316248eb6686a2fd4fbadcfd00de37f3
-      '@wordpress/a11y': 2.15.3
-      '@wordpress/compose': 3.25.3_react@17.0.2
-      '@wordpress/date': 3.15.1
-      '@wordpress/deprecated': 2.12.3
-      '@wordpress/dom': 2.18.0
-      '@wordpress/element': 2.20.3
-      '@wordpress/hooks': 2.12.3
-      '@wordpress/i18n': 3.20.0
-      '@wordpress/icons': 2.10.3
-      '@wordpress/is-shallow-equal': 3.1.3
-      '@wordpress/keycodes': 2.19.3
-      '@wordpress/primitives': 1.12.3
-      '@wordpress/rich-text': 3.25.3_react@17.0.2
-      '@wordpress/warning': 1.4.2
-      '@wp-g2/components': 0.0.140_39aa9b824a3099e0a8f080749de9ea5d
-      '@wp-g2/context': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
-      '@wp-g2/styles': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
-      '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
-      classnames: 2.3.1
-      dom-scroll-into-view: 1.2.1
-      downshift: 6.1.7_react@17.0.2
-      gradient-parser: 0.1.5
-      highlight-words-core: 1.2.2
-      lodash: 4.17.21
-      memize: 1.1.0
-      moment: 2.29.1
-      re-resizable: 6.9.1_react-dom@17.0.2+react@17.0.2
-      react-dates: 17.2.0_d0804d3726ad84366bcc42e494508e1e
-      react-merge-refs: 1.1.0
-      react-resize-aware: 3.1.1_react@17.0.2
-      react-spring: 8.0.27_react-dom@17.0.2+react@17.0.2
-      react-use-gesture: 9.1.3_react@17.0.2
-      reakit: 1.3.11_react-dom@17.0.2+react@17.0.2
-      rememo: 3.0.0
-      tinycolor2: 1.4.2
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@wordpress/data'
-      - react
-      - react-dom
-      - react-native
-    dev: false
-
-  /@wordpress/components/19.1.6_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-+Vmj+w7aLudXUzBdAOA/1a/RKoFvVSckGfuF/qpsFCVv80t2a22sgG8ZVnjm6f+L5dcCQdr3xgvqyRgE4lOvqQ==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      reakit-utils: ^0.15.1
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@emotion/cache': 11.7.1
-      '@emotion/css': 11.7.1_@babel+core@7.16.0
-      '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
-      '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
-      '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/warning': 2.2.2
-      classnames: 2.3.1
-      colord: 2.9.2
-      dom-scroll-into-view: 1.2.1
-      downshift: 6.1.7_react@17.0.2
-      framer-motion: 4.1.17_react-dom@17.0.2+react@17.0.2
-      gradient-parser: 0.1.5
-      highlight-words-core: 1.2.2
-      lodash: 4.17.21
-      memize: 1.1.0
-      moment: 2.29.1
-      re-resizable: 6.9.1_react-dom@17.0.2+react@17.0.2
-      react-colorful: 5.5.1_react-dom@17.0.2+react@17.0.2
-      react-dates: 17.2.0_d0804d3726ad84366bcc42e494508e1e
-      react-resize-aware: 3.1.1_react@17.0.2
-      react-use-gesture: 9.1.3_react@17.0.2
-      reakit: 1.3.11_react-dom@17.0.2+react@17.0.2
-      rememo: 3.0.0
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - redux
-    dev: true
-
-  /@wordpress/components/19.1.6_@babel+core@7.16.0:
-    resolution: {integrity: sha512-+Vmj+w7aLudXUzBdAOA/1a/RKoFvVSckGfuF/qpsFCVv80t2a22sgG8ZVnjm6f+L5dcCQdr3xgvqyRgE4lOvqQ==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      reakit-utils: ^0.15.1
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@emotion/cache': 11.7.1
-      '@emotion/css': 11.7.1_@babel+core@7.16.0
-      '@emotion/react': 11.7.1_@babel+core@7.16.0
-      '@emotion/styled': 11.6.0_6ec88188b67a9243b8ff91fb3d96cf5c
-      '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7
-      '@wordpress/warning': 2.2.2
-      classnames: 2.3.1
-      colord: 2.9.2
-      dom-scroll-into-view: 1.2.1
-      downshift: 6.1.7
-      framer-motion: 4.1.17
-      gradient-parser: 0.1.5
-      highlight-words-core: 1.2.2
-      lodash: 4.17.21
-      memize: 1.1.0
-      moment: 2.29.1
-      re-resizable: 6.9.1
-      react-colorful: 5.5.1
-      react-dates: 17.2.0_moment@2.29.1
-      react-resize-aware: 3.1.1
-      react-use-gesture: 9.1.3
-      reakit: 1.3.11
-      rememo: 3.0.0
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - redux
-    dev: false
-
-  /@wordpress/components/19.1.6_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-+Vmj+w7aLudXUzBdAOA/1a/RKoFvVSckGfuF/qpsFCVv80t2a22sgG8ZVnjm6f+L5dcCQdr3xgvqyRgE4lOvqQ==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      reakit-utils: ^0.15.1
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@emotion/cache': 11.7.1
-      '@emotion/css': 11.7.1_@babel+core@7.16.0
-      '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
-      '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
-      '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/warning': 2.2.2
-      classnames: 2.3.1
-      colord: 2.9.2
-      dom-scroll-into-view: 1.2.1
-      downshift: 6.1.7_react@17.0.2
-      framer-motion: 4.1.17_react@17.0.2
-      gradient-parser: 0.1.5
-      highlight-words-core: 1.2.2
-      lodash: 4.17.21
-      memize: 1.1.0
-      moment: 2.29.1
-      re-resizable: 6.9.1_react@17.0.2
-      react-colorful: 5.5.1_react@17.0.2
-      react-dates: 17.2.0_moment@2.29.1+react@17.0.2
-      react-resize-aware: 3.1.1_react@17.0.2
-      react-use-gesture: 9.1.3_react@17.0.2
-      reakit: 1.3.11_react@17.0.2
-      rememo: 3.0.0
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - redux
-
-  /@wordpress/components/19.1.6_aae888dfa296766acacf1a733aa50b3a:
-    resolution: {integrity: sha512-+Vmj+w7aLudXUzBdAOA/1a/RKoFvVSckGfuF/qpsFCVv80t2a22sgG8ZVnjm6f+L5dcCQdr3xgvqyRgE4lOvqQ==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      reakit-utils: ^0.15.1
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@emotion/cache': 11.7.1
-      '@emotion/css': 11.7.1_@babel+core@7.16.0
-      '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
-      '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
-      '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/warning': 2.2.2
+      '@emotion/css': 10.0.27
+      '@emotion/native': 10.0.27_316248eb6686a2fd4fbadcfd00de37f3
+      '@emotion/styled': 10.3.0_316248eb6686a2fd4fbadcfd00de37f3
+      '@wordpress/a11y': 2.15.3
+      '@wordpress/compose': 3.25.3_react@17.0.2
+      '@wordpress/date': 3.15.1
+      '@wordpress/deprecated': 2.12.3
+      '@wordpress/dom': 2.18.0
+      '@wordpress/element': 2.20.3
+      '@wordpress/hooks': 2.12.3
+      '@wordpress/i18n': 3.20.0
+      '@wordpress/icons': 2.10.3
+      '@wordpress/is-shallow-equal': 3.1.3
+      '@wordpress/keycodes': 2.19.3
+      '@wordpress/primitives': 1.12.3
+      '@wordpress/rich-text': 3.25.3_react@17.0.2
+      '@wordpress/warning': 1.4.2
+      '@wp-g2/components': 0.0.140_cbbf6db973bdf4a4a0954a832637d63f
+      '@wp-g2/context': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
+      '@wp-g2/styles': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
+      '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
       classnames: 2.3.1
-      colord: 2.9.2
       dom-scroll-into-view: 1.2.1
       downshift: 6.1.7_react@17.0.2
-      framer-motion: 4.1.17_react-dom@17.0.2+react@17.0.2
       gradient-parser: 0.1.5
       highlight-words-core: 1.2.2
       lodash: 4.17.21
       memize: 1.1.0
       moment: 2.29.1
       re-resizable: 6.9.1_react-dom@17.0.2+react@17.0.2
-      react-colorful: 5.5.1_react-dom@17.0.2+react@17.0.2
       react-dates: 17.2.0_d0804d3726ad84366bcc42e494508e1e
+      react-merge-refs: 1.1.0
       react-resize-aware: 3.1.1_react@17.0.2
+      react-spring: 8.0.27_react-dom@17.0.2+react@17.0.2
       react-use-gesture: 9.1.3_react@17.0.2
       reakit: 1.3.11_react-dom@17.0.2+react@17.0.2
       rememo: 3.0.0
+      tinycolor2: 1.4.2
       uuid: 8.3.2
     transitivePeerDependencies:
-      - '@babel/core'
       - '@types/react'
+      - '@wordpress/data'
       - react
       - react-dom
-      - redux
+      - react-native
     dev: false
 
-  /@wordpress/components/19.2.0_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-IFvbH7Jo9jqbH+ZXCMm+tLaJDn95Q783aNtm9GVA+z3nJSyh4Dl2MXsRfOSE/mLd2iToPDCrpuHi51hr/lrGcw==}
+  /@wordpress/components/19.3.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-uzw6LMPVQUC25NKNqcgC4Xe6pD/Jz9LwA+U3IVbpzE2OIPj6Ko+ghfpQpknc+ZS7+8wtePLlA/YaQrI8R7X2vA==}
     engines: {node: '>=12'}
     peerDependencies:
-      reakit-utils: ^0.15.1
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@emotion/cache': 11.7.1
       '@emotion/css': 11.7.1_@babel+core@7.16.0
-      '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
-      '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
+      '@emotion/react': 11.7.1_@babel+core@7.16.0
+      '@emotion/serialize': 1.0.2
+      '@emotion/styled': 11.6.0_6ec88188b67a9243b8ff91fb3d96cf5c
       '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/warning': 2.2.2
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/compose': 5.1.0
+      '@wordpress/date': 4.3.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/primitives': 3.1.0
+      '@wordpress/rich-text': 5.1.0
+      '@wordpress/warning': 2.3.0
       classnames: 2.3.1
       colord: 2.9.2
       dom-scroll-into-view: 1.2.1
-      downshift: 6.1.7_react@17.0.2
-      framer-motion: 4.1.17_react-dom@17.0.2+react@17.0.2
+      downshift: 6.1.7
+      framer-motion: 4.1.17
       gradient-parser: 0.1.5
       highlight-words-core: 1.2.2
       lodash: 4.17.21
       memize: 1.1.0
       moment: 2.29.1
-      re-resizable: 6.9.1_react-dom@17.0.2+react@17.0.2
-      react-colorful: 5.5.1_react-dom@17.0.2+react@17.0.2
-      react-dates: 17.2.0_d0804d3726ad84366bcc42e494508e1e
-      react-resize-aware: 3.1.1_react@17.0.2
-      react-use-gesture: 9.1.3_react@17.0.2
-      reakit: 1.3.11_react-dom@17.0.2+react@17.0.2
+      re-resizable: 6.9.1
+      react-colorful: 5.5.1
+      react-dates: 17.2.0_moment@2.29.1
+      react-resize-aware: 3.1.1
+      react-use-gesture: 9.1.3
+      reakit: 1.3.11
       rememo: 3.0.0
       uuid: 8.3.2
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - redux
+    dev: false
 
-  /@wordpress/components/19.2.0_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-IFvbH7Jo9jqbH+ZXCMm+tLaJDn95Q783aNtm9GVA+z3nJSyh4Dl2MXsRfOSE/mLd2iToPDCrpuHi51hr/lrGcw==}
+  /@wordpress/components/19.3.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-uzw6LMPVQUC25NKNqcgC4Xe6pD/Jz9LwA+U3IVbpzE2OIPj6Ko+ghfpQpknc+ZS7+8wtePLlA/YaQrI8R7X2vA==}
     engines: {node: '>=12'}
     peerDependencies:
-      reakit-utils: ^0.15.1
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@emotion/cache': 11.7.1
       '@emotion/css': 11.7.1_@babel+core@7.16.0
       '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
+      '@emotion/serialize': 1.0.2
       '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
       '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/warning': 2.2.2
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/primitives': 3.1.0
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/warning': 2.3.0
       classnames: 2.3.1
       colord: 2.9.2
       dom-scroll-into-view: 1.2.1
@@ -7880,6 +8468,7 @@ packages:
       memize: 1.1.0
       moment: 2.29.1
       re-resizable: 6.9.1_react@17.0.2
+      react: 17.0.2
       react-colorful: 5.5.1_react@17.0.2
       react-dates: 17.2.0_moment@2.29.1+react@17.0.2
       react-resize-aware: 3.1.1_react@17.0.2
@@ -7890,37 +8479,35 @@ packages:
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - redux
-    dev: true
 
-  /@wordpress/components/19.2.0_b4e1ce88a10f1ab0bbeb2b9720317029:
-    resolution: {integrity: sha512-IFvbH7Jo9jqbH+ZXCMm+tLaJDn95Q783aNtm9GVA+z3nJSyh4Dl2MXsRfOSE/mLd2iToPDCrpuHi51hr/lrGcw==}
+  /@wordpress/components/19.3.0_aae888dfa296766acacf1a733aa50b3a:
+    resolution: {integrity: sha512-uzw6LMPVQUC25NKNqcgC4Xe6pD/Jz9LwA+U3IVbpzE2OIPj6Ko+ghfpQpknc+ZS7+8wtePLlA/YaQrI8R7X2vA==}
     engines: {node: '>=12'}
     peerDependencies:
-      reakit-utils: ^0.15.1
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@emotion/cache': 11.7.1
       '@emotion/css': 11.7.1_@babel+core@7.16.0
       '@emotion/react': 11.7.1_@babel+core@7.16.0+react@17.0.2
+      '@emotion/serialize': 1.0.2
       '@emotion/styled': 11.6.0_0ab14c9fee32f6b27cdf64a62c8d8465
       '@emotion/utils': 1.0.0
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/primitives': 3.0.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.1.1
-      '@wordpress/warning': 2.2.2
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/primitives': 3.1.0
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/warning': 2.3.0
       classnames: 2.3.1
       colord: 2.9.2
       dom-scroll-into-view: 1.2.1
@@ -7932,8 +8519,10 @@ packages:
       memize: 1.1.0
       moment: 2.29.1
       re-resizable: 6.9.1_react-dom@17.0.2+react@17.0.2
+      react: 17.0.2
       react-colorful: 5.5.1_react-dom@17.0.2+react@17.0.2
       react-dates: 17.2.0_d0804d3726ad84366bcc42e494508e1e
+      react-dom: 17.0.2_react@17.0.2
       react-resize-aware: 3.1.1_react@17.0.2
       react-use-gesture: 9.1.3_react@17.0.2
       reakit: 1.3.11_react-dom@17.0.2+react@17.0.2
@@ -7942,10 +8531,6 @@ packages:
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - redux
-    dev: false
 
   /@wordpress/compose/3.25.3_react@17.0.2:
     resolution: {integrity: sha512-tCO2EnJCkCH548OqA0uU8V1k/1skz2QwBlHs8ZQSpimqUS4OWWsAlndCEFe4U4vDTqFt2ow7tzAir+05Cw8MAg==}
@@ -7967,112 +8552,88 @@ packages:
       - react
     dev: false
 
-  /@wordpress/compose/5.0.7:
-    resolution: {integrity: sha512-5PJmxW85tlw4lteiXKKycloZ3tNzcKSCYpnZa07XHKHYvq5aoKRrHwh+t3oSnLjjavczVd6Lcd7EQPpD18MSbw==}
+  /@wordpress/compose/5.1.0:
+    resolution: {integrity: sha512-brQWd3WXB+uUjMOdqmwM4Laxts6Kt+bObPDSsFg5mwiWUvD/12DkucGMuYbJaqxexbdvYzfr++lGvEcmi6V/aA==}
     engines: {node: '>=12'}
+    peerDependencies:
+      react: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@types/lodash': 4.14.178
       '@types/mousetrap': 1.6.9
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/priority-queue': 2.2.3
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/priority-queue': 2.3.0
       clipboard: 2.0.8
       lodash: 4.17.21
       mousetrap: 1.6.5
       react-resize-aware: 3.1.1
       use-memo-one: 1.1.2
-    transitivePeerDependencies:
-      - react
     dev: false
 
-  /@wordpress/compose/5.0.7_react@17.0.2:
-    resolution: {integrity: sha512-5PJmxW85tlw4lteiXKKycloZ3tNzcKSCYpnZa07XHKHYvq5aoKRrHwh+t3oSnLjjavczVd6Lcd7EQPpD18MSbw==}
+  /@wordpress/compose/5.1.0_react@17.0.2:
+    resolution: {integrity: sha512-brQWd3WXB+uUjMOdqmwM4Laxts6Kt+bObPDSsFg5mwiWUvD/12DkucGMuYbJaqxexbdvYzfr++lGvEcmi6V/aA==}
     engines: {node: '>=12'}
+    peerDependencies:
+      react: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
       '@types/lodash': 4.14.178
       '@types/mousetrap': 1.6.9
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/priority-queue': 2.2.3
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/priority-queue': 2.3.0
       clipboard: 2.0.8
       lodash: 4.17.21
       mousetrap: 1.6.5
+      react: 17.0.2
       react-resize-aware: 3.1.1_react@17.0.2
       use-memo-one: 1.1.2_react@17.0.2
-    transitivePeerDependencies:
-      - react
-
-  /@wordpress/core-data/4.0.9_react@17.0.2:
-    resolution: {integrity: sha512-BCHqGWLre2GBClI901ar9+S5T0EmNQ56wdYqPE6aZJlTV3/QWgFoL241NqGvjAJ6ipC9+clpwwndX7JFG3juKw==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/url': 3.3.1
-      equivalent-key-map: 0.2.2
-      lodash: 4.17.21
-      rememo: 3.0.0
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: true
 
-  /@wordpress/core-data/4.0.9_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-BCHqGWLre2GBClI901ar9+S5T0EmNQ56wdYqPE6aZJlTV3/QWgFoL241NqGvjAJ6ipC9+clpwwndX7JFG3juKw==}
+  /@wordpress/core-data/4.1.0_react@17.0.2:
+    resolution: {integrity: sha512-8bwgLAAk8bctPUXMToO78sHEOUQzGe4dTq1/72lzHcHB+Whb2wVCcgAVbzvu12s0KHkrLWwNIhW3pe323Ok3BQ==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/url': 3.3.1
+      '@babel/runtime': 7.16.7
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/url': 3.4.0
       equivalent-key-map: 0.2.2
       lodash: 4.17.21
       rememo: 3.0.0
       uuid: 8.3.2
     transitivePeerDependencies:
       - react
-      - redux
     dev: true
 
-  /@wordpress/data-controls/2.2.8_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-hoaYLeZEmgUBJvHsv5SeGUKx433HfQfJ5sPu/8PiouUK/vr+8rMGM02ydTye6saWAMOHxvOxa08rzIWvWnZg/w==}
+  /@wordpress/data-controls/2.3.0_react@17.0.2:
+    resolution: {integrity: sha512-qA0tpZuebJO5i/qgdL49OGKov9CfGwxoMPq4TOhY2lxCqHBHqoccIB9G83uatH1MZiAHbiZtcdywPUvNclmmtg==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
+      '@babel/runtime': 7.16.7
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
     transitivePeerDependencies:
       - react
-      - redux
     dev: true
 
   /@wordpress/data/4.27.3_react@17.0.2:
     resolution: {integrity: sha512-5763NgNV9IIa1CC3Q80dAvrH6108tJtj3IrHfUCZmUk1atSNsOMBCkLdQ7tGTTi2JFejeGEMg1LJI22JD5zM6Q==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/compose': 3.25.3_react@17.0.2
       '@wordpress/deprecated': 2.12.3
       '@wordpress/element': 2.20.3
@@ -8090,147 +8651,98 @@ packages:
       - react
     dev: false
 
-  /@wordpress/data/6.1.5:
-    resolution: {integrity: sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==}
+  /@wordpress/data/6.2.0:
+    resolution: {integrity: sha512-GQaZtJ4kXCoHc2H/Gb43kWDmrY2KLUkNnWeDE+xZLD7nXkgZ5AuZZ0CF1FFQUGFzzhltySNTpe/itdJakXn6DA==}
     engines: {node: '>=12'}
     peerDependencies:
-      redux: ^4.1.0
+      react: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/priority-queue': 2.2.3
-      '@wordpress/redux-routine': 4.2.2
+      '@wordpress/compose': 5.1.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/priority-queue': 2.3.0
+      '@wordpress/redux-routine': 4.3.0_redux@4.1.2
       equivalent-key-map: 0.2.2
       is-promise: 4.0.0
       lodash: 4.17.21
       memize: 1.1.0
+      redux: 4.1.2
       turbo-combine-reducers: 1.0.2
       use-memo-one: 1.1.2
-    transitivePeerDependencies:
-      - react
     dev: false
 
-  /@wordpress/data/6.1.5_react@17.0.2:
-    resolution: {integrity: sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      redux: ^4.1.0
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/priority-queue': 2.2.3
-      '@wordpress/redux-routine': 4.2.2
-      equivalent-key-map: 0.2.2
-      is-promise: 4.0.0
-      lodash: 4.17.21
-      memize: 1.1.0
-      redux: 4.0.5
-      turbo-combine-reducers: 1.0.2
-      use-memo-one: 1.1.2_react@17.0.2
-    transitivePeerDependencies:
-      - react
-
-  /@wordpress/data/6.1.5_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      redux: ^4.1.0
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/priority-queue': 2.2.3
-      '@wordpress/redux-routine': 4.2.2
-      equivalent-key-map: 0.2.2
-      is-promise: 4.0.0
-      lodash: 4.17.21
-      memize: 1.1.0
-      redux: 4.0.5
-      turbo-combine-reducers: 1.0.2
-      use-memo-one: 1.1.2_react@17.0.2
-    transitivePeerDependencies:
-      - react
-
-  /@wordpress/data/6.1.5_react@17.0.2+redux@4.1.1:
-    resolution: {integrity: sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==}
+  /@wordpress/data/6.2.0_react@17.0.2:
+    resolution: {integrity: sha512-GQaZtJ4kXCoHc2H/Gb43kWDmrY2KLUkNnWeDE+xZLD7nXkgZ5AuZZ0CF1FFQUGFzzhltySNTpe/itdJakXn6DA==}
     engines: {node: '>=12'}
     peerDependencies:
-      redux: ^4.1.0
+      react: ^17.0.0
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/priority-queue': 2.2.3
-      '@wordpress/redux-routine': 4.2.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/priority-queue': 2.3.0
+      '@wordpress/redux-routine': 4.3.0_redux@4.1.2
       equivalent-key-map: 0.2.2
       is-promise: 4.0.0
       lodash: 4.17.21
       memize: 1.1.0
-      redux: 4.1.1
+      react: 17.0.2
+      redux: 4.1.2
       turbo-combine-reducers: 1.0.2
       use-memo-one: 1.1.2_react@17.0.2
-    transitivePeerDependencies:
-      - react
-    dev: false
 
   /@wordpress/date/3.15.1:
     resolution: {integrity: sha512-SuHiObvjbegL8RpaSQ6JqFnG+QyGP+oUhx1FZDMdt1nOQA9HE7D5ssVlZFlMEAdo6iS8xMuW+4SgJN3Eo1fb4w==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       moment: 2.29.1
       moment-timezone: 0.5.34
     dev: false
 
-  /@wordpress/date/4.2.3:
-    resolution: {integrity: sha512-5hZDhFwTtKcbJGZdqvIzoLsW/QgBjUjf4ohgDqRlMBX8Zi6/n11O8LDRPOpmJLVSnIx1fgNSGkzXOzzQmbWuqQ==}
+  /@wordpress/date/4.3.0:
+    resolution: {integrity: sha512-c2A3HZa9Sr0QfdIkqps/Ox2e9Xd4txFp2S8WqW0K9ZXpFhSZ5ieeomKvrzWBCsYuoDItMYGNB3N8EeY/aJUsOQ==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       moment: 2.29.1
       moment-timezone: 0.5.34
 
-  /@wordpress/dependency-extraction-webpack-plugin/3.2.1_webpack@5.65.0:
-    resolution: {integrity: sha512-Ltd+1CJb7PMh6iN2Mse+3yN/oMORug5qXSj/3xmuZERzZO2SO6xNEJGml8yK9ev747cbHktEpitK4H+8VO3Ekg==}
+  /@wordpress/dependency-extraction-webpack-plugin/3.3.0_webpack@5.65.0:
+    resolution: {integrity: sha512-bUBRkT1keDoD+Mv+YBkJGB5DPLes+zK1e34/SyrX+NIGOEngxsoUOdKPyX/Hex/t/0w6Bhqb5+2lYaNR6ar8IQ==}
     engines: {node: '>=12'}
     peerDependencies:
       webpack: ^4.8.3 || ^5.0.0
     dependencies:
       json2php: 0.0.4
       webpack: 5.65.0
-      webpack-sources: 2.3.1
+      webpack-sources: 3.2.2
 
   /@wordpress/deprecated/2.12.3:
     resolution: {integrity: sha512-qr+yDfTQfI3M4h6oY6IeHWwoHr4jxbILjSlV+Ht6Jjto9Owap6OuzSqR13Ev4xqIoG4C7b5B3gZXVfwVDae1zg==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/hooks': 2.12.3
     dev: false
 
-  /@wordpress/deprecated/3.2.3:
-    resolution: {integrity: sha512-YoJos/hW216PIlxbtNyb24kPR3TUFTSsfeVT23SxudW4jhmwM12vkl3KY1RDbhD/qi89OE4k+8xsBo5cM3lCSw==}
+  /@wordpress/deprecated/3.3.0:
+    resolution: {integrity: sha512-roTwhqAi+55tTMkDtbGnC6x7MXcO1l+sN2iUQRMSYv7Rpb3YW/6oR3VKeoRxcH/tKNByROreciPL3OQueB2TpA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/hooks': 3.2.2
+      '@wordpress/hooks': 3.3.0
 
   /@wordpress/dom-ready/2.13.2:
     resolution: {integrity: sha512-COH7n2uZfBq4FtluSbl37N3nCEcdMXzV42ETCWKUcumiP1Zd3qnkfQKcsxTaHWY8aVt/358RvJ7ghWe3xAd+fg==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
     dev: false
 
-  /@wordpress/dom-ready/3.2.3:
-    resolution: {integrity: sha512-AvHrfYFflycWRX8CIU7UGty05aXrKvILwrNT2YRXmOmgh+POud98QQU54hitwL2cyVkWUt8dvCNRK4nnjBqqJQ==}
+  /@wordpress/dom-ready/3.3.0:
+    resolution: {integrity: sha512-iQD0/oCJPohKabnheW7TQCWrhzRIVLoytUYoyiLPa7OJnFS0PucJs9I4NpY5oNx3uMySc0QGTsOdPEeHiWXKeQ==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
@@ -8238,28 +8750,28 @@ packages:
   /@wordpress/dom/2.18.0:
     resolution: {integrity: sha512-tM2WeQuSObl3nzWjUTF0/dyLnA7sdl/MXaSe32D64OF89bjSyJvjUipI7gjKzI3kJ7ddGhwcTggGvSB06MOoCQ==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       lodash: 4.17.21
     dev: false
 
-  /@wordpress/dom/3.2.7:
-    resolution: {integrity: sha512-/e7sFaiwKHWmgqUFsClYw9YI6Wq/eZ1iBsxtGgqX5zrU8KyFJaziNeHDE8tTZLkiURS1vlBQm0mY6bX7Bo4CEA==}
+  /@wordpress/dom/3.3.0:
+    resolution: {integrity: sha512-gxgSXu32X7IxPD52uJqtuzBnd89g4ytlAVq1qbu8Zi23VbYXe8dCE6ml9VFbVUdFuHsNrXYewqklks9q8FdPqA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       lodash: 4.17.21
 
-  /@wordpress/e2e-test-utils/5.4.10:
-    resolution: {integrity: sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==}
+  /@wordpress/e2e-test-utils/6.0.0:
+    resolution: {integrity: sha512-cG2zUkf4/GE4rvYhzD5BeW7+6RnlbgV/TPnYfzm+yhuuEn5jwXQKOgzLQzmF31PFRz1OTDasrZqnqzhlm5GAXA==}
     engines: {node: '>=12'}
     peerDependencies:
-      jest: '>=26'
-      puppeteer: '>=1.19.0'
+      jest: '>=27'
+      puppeteer-core: '>=11'
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/url': 3.3.1
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/url': 3.4.0
       form-data: 4.0.0
       lodash: 4.17.21
       node-fetch: 2.6.7
@@ -8267,57 +8779,58 @@ packages:
       - encoding
     dev: true
 
-  /@wordpress/editor/12.0.15_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-eJ2ne6GYHnso6GPbRVRRhwTz3Eg4sp/HfV5bacfiKsdN4yd/3Ci1ABvhJD4JtFq2vXZPfE02sWhjRXgSpbcY1w==}
+  /@wordpress/editor/12.1.0_aae888dfa296766acacf1a733aa50b3a:
+    resolution: {integrity: sha512-HLu/WZjuKeyZhTyquOzQY3CFRU1E42UKLGqLem+ZBa4o8rLmOpHglaAk8sARY2yc3jLbHbEcW9EZ3gM0s+4Cag==}
     engines: {node: '>=12'}
+    peerDependencies:
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/autop': 3.2.3
-      '@wordpress/blob': 3.2.2
-      '@wordpress/block-editor': 8.0.12_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/components': 19.1.6_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/core-data': 4.0.9_react@17.0.2+redux@4.0.5
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/data-controls': 2.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/date': 4.2.3
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keyboard-shortcuts': 3.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/media-utils': 3.0.5
-      '@wordpress/notices': 3.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/reusable-blocks': 3.0.19_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/rich-text': 5.0.7_react@17.0.2+redux@4.0.5
-      '@wordpress/server-side-render': 3.0.16_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/url': 3.3.1
-      '@wordpress/wordcount': 3.2.3
+      '@babel/runtime': 7.16.7
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/autop': 3.3.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/block-editor': 8.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/core-data': 4.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/data-controls': 2.3.0_react@17.0.2
+      '@wordpress/date': 4.3.0
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/hooks': 3.3.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keyboard-shortcuts': 3.1.0_react@17.0.2
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/media-utils': 3.1.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/reusable-blocks': 3.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/server-side-render': 3.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/url': 3.4.0
+      '@wordpress/wordcount': 3.3.0
       classnames: 2.3.1
       lodash: 4.17.21
       memize: 1.1.0
+      react: 17.0.2
       react-autosize-textarea: 7.1.0_react-dom@17.0.2+react@17.0.2
+      react-dom: 17.0.2_react@17.0.2
       rememo: 3.0.0
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
   /@wordpress/element/2.20.3:
     resolution: {integrity: sha512-f4ZPTDf9CxiiOXiMxc4v1K7jcBMT4dsiehVOpkKzCDKboNXp4qVf8oe5PE23VGZNEjcOj5Mkg9hB57R0nqvMTw==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@types/react': 16.14.21
       '@types/react-dom': 16.9.14
       '@wordpress/escape-html': 1.12.2
@@ -8326,14 +8839,14 @@ packages:
       react-dom: 16.14.0_react@16.14.0
     dev: false
 
-  /@wordpress/element/4.0.4:
-    resolution: {integrity: sha512-GbYVSZrHitOmupQCjb7cSlewVigXHorpZUBpvWnkU3rhyh1tF/N9qve3fgg7Q3s2szjtTP+eEutB+4mmkwHQOA==}
+  /@wordpress/element/4.1.0:
+    resolution: {integrity: sha512-Q63OGOExHthL1TGJOaQKYXr2vEvkIk3jBlcMuPuY/6JhKx3h0G6GDE3J0mc9HQyydkv6XWDyATWjfP5naMjM/Q==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@types/react': 16.14.21
-      '@types/react-dom': 16.9.14
-      '@wordpress/escape-html': 2.2.3
+      '@types/react': 17.0.38
+      '@types/react-dom': 17.0.11
+      '@wordpress/escape-html': 2.3.0
       lodash: 4.17.21
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
@@ -8341,89 +8854,90 @@ packages:
   /@wordpress/escape-html/1.12.2:
     resolution: {integrity: sha512-FabgSwznhdaUwe6hr1CsGpgxQbzqEoGevv73WIL1B9GvlZ6csRWodgHfWh4P6fYqpzxFL4WYB8wPJ1PdO32XFA==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
     dev: false
 
-  /@wordpress/escape-html/2.2.3:
-    resolution: {integrity: sha512-nYIwT8WzHfAzjjwHLiwDQWrzn4/gUNr5zud465XQszM2cAItN2wnC26/ovSpPomDGkvjcG0YltgnSqc1T62olA==}
+  /@wordpress/escape-html/2.3.0:
+    resolution: {integrity: sha512-QD5uid5Le3sZkKGKiXcudQKILxrSEeGltYVyQoNwbeBIhUE19DW7J0S1zqKkaaHks0jEERPIfzNThiyUh1IrVg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
 
-  /@wordpress/eslint-plugin/9.3.0_@babel+core@7.16.0+eslint@7.32.0:
-    resolution: {integrity: sha512-9F7B60gHAjiTIi9vBw5ZoH0MZW3UnmbuKols4kWpJVdgsvG4X1Wj6XXTLmQKrzh/Em7mD1CCIbCSyWknEzIOLw==}
+  /@wordpress/eslint-plugin/10.0.0_@babel+core@7.16.0+eslint@8.8.0:
+    resolution: {integrity: sha512-OMPyXLwjvnDio/f1l2+FkwwtNO2hpHkTdJe8D1ie5QpUFQgVz7n59w9USMxdJ/XR2eDDLjVv1alwXEow1go+mg==}
     engines: {node: '>=12', npm: '>=6.9'}
     peerDependencies:
-      eslint: ^6 || ^7
-      typescript: ^4
+      '@babel/core': '>=7'
+      eslint: '>=8'
+      typescript: '>=4'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@babel/eslint-parser': 7.16.3_@babel+core@7.16.0+eslint@7.32.0
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
+      '@babel/core': 7.16.0
+      '@babel/eslint-parser': 7.16.3_@babel+core@7.16.0+eslint@8.8.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@wordpress/babel-preset-default': 6.5.0
       '@wordpress/prettier-config': 1.1.1
       cosmiconfig: 7.0.1
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
-      eslint-plugin-import: 2.25.4_eslint@7.32.0
-      eslint-plugin-jest: 24.7.0_d3b4c2d4ac51f4275548d5d796aee5d5
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
-      eslint-plugin-prettier: 3.4.1_34b707f3a53b0942f3919c1ff656ce36
-      eslint-plugin-react: 7.28.0_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.3.0_eslint@7.32.0
-      globals: 12.4.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
+      eslint-plugin-import: 2.25.4_eslint@8.8.0
+      eslint-plugin-jest: 25.7.0_2710175b8e1738b8f39f06cfa9aa7159
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.8.0
+      eslint-plugin-prettier: 3.4.1_5208900944bd53d50aafd0e7d193e6c3
+      eslint-plugin-react: 7.28.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      globals: 13.12.0
       prettier: /wp-prettier/2.2.1-beta-1
       requireindex: 1.2.0
     transitivePeerDependencies:
-      - '@babel/core'
+      - jest
       - supports-color
     dev: true
 
-  /@wordpress/format-library/3.0.18_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-HWuCsG4/tDLRunEC5U4I6SqUGRe1jWPAO/62QFewRI/zxDi5tCi6pYl9N1Sn6rOCKWfcKKkEZcno6IN4H4g9Dw==}
+  /@wordpress/format-library/3.1.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-RQIzh5IzpbApavgmJt1PrdlE3el92NLkktyd1c2tDIEDPGLZ5RlULliKMi8nr558opxxTfMf5wHjU4OC8ysViA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/block-editor': 8.0.12_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/components': 19.1.6_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/html-entities': 3.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/keycodes': 3.2.4
-      '@wordpress/rich-text': 5.0.7_react@17.0.2
-      '@wordpress/url': 3.3.1
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/block-editor': 8.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/html-entities': 3.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/keycodes': 3.3.0
+      '@wordpress/rich-text': 5.1.0_react@17.0.2
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react
       - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
   /@wordpress/hooks/2.12.3:
     resolution: {integrity: sha512-LmKiwKldZt6UYqOxV/a6+eUFXdvALFnB/pQx3RmrMvO64sgFhfR6dhrlv+uVbuuezSuv8dce1jx8lUWAT0krMA==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
     dev: false
 
-  /@wordpress/hooks/3.2.2:
-    resolution: {integrity: sha512-MlFWyu2ttJhmzDFBVWPRwZwIMqQdHFZTjFWFWm50NlzUzIJ3gEtNA95mHNtav1Fone24N+I2YkaYMNb6PEPTyA==}
+  /@wordpress/hooks/3.3.0:
+    resolution: {integrity: sha512-RSOZS5cr9h830VHE7XQ/NbgIfQQXtuSWrb2mX+4uN4qK6ua2hUfZS/twW4af2H2beistK/rUDPpUVO9x7XSQ5w==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
 
-  /@wordpress/html-entities/3.2.3:
-    resolution: {integrity: sha512-406VUz8CuKgKGrW/wjRB877soSqGhGDwK4sSuNoIC1FvpfniZ0ijpqfsdhJOOynWdz+RYN1wAsfogBpzuREJOg==}
+  /@wordpress/html-entities/3.3.0:
+    resolution: {integrity: sha512-KyzQTP+tPyIHUQKaRV8FXUTtIf4pyOSFSnhYA9UZtTa+797B+zSzkj+NCObnxcwbfCqajxlAwxvqKa2OISr74A==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
@@ -8432,7 +8946,7 @@ packages:
     resolution: {integrity: sha512-SIoOJFB4UrrYAScS4H91CYCLW9dX3Ghv8pBKc/yHGculb1AdGr6gRMlmJxZV62Cn3CZ4Ga86c+FfR+GiBu0JPg==}
     hasBin: true
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/hooks': 2.12.3
       gettext-parser: 1.4.0
       lodash: 4.17.21
@@ -8441,13 +8955,13 @@ packages:
       tannin: 1.2.0
     dev: false
 
-  /@wordpress/i18n/4.2.4:
-    resolution: {integrity: sha512-36PnV7wTaLKCb+JZoapR3AtfrLTluhO5bIR6cUTG+QBBJ+g3gjRAdNFihnV8kz66FANu8PqDMI0T1jow/mrbYw==}
+  /@wordpress/i18n/4.3.0:
+    resolution: {integrity: sha512-VN0fPhhphX1EkVcCMxirLkwVhvdLNDTg5uYfLeK/e3OSUrKhlFFiI+JyfOXZOrD7LLRz6c6wzCPrCw3ehjmkrg==}
     engines: {node: '>=12'}
     hasBin: true
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/hooks': 3.2.2
+      '@wordpress/hooks': 3.3.0
       gettext-parser: 1.4.0
       lodash: 4.17.21
       memize: 1.1.0
@@ -8457,221 +8971,121 @@ packages:
   /@wordpress/icons/2.10.3:
     resolution: {integrity: sha512-hVXArGOHLE5pL1G3rHNzsUEuTR4/G6lB+enKYwhYSSIqWuSbyXbZq3nvibxpepPrLy9B3d5t6aR6QUmjMVzIcQ==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/element': 2.20.3
       '@wordpress/primitives': 1.12.3
     dev: false
 
-  /@wordpress/icons/6.1.1:
-    resolution: {integrity: sha512-UaFAOF8hqlEhjTm5kba0JwSDDeEgPSJToDJNADoz8jkxt22kEG5ACi9IaS0BRIy1X7kR6QaCE394v9+GkToE+g==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/primitives': 3.0.4
-
-  /@wordpress/interface/4.1.15_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-11vTvDG08A0QMicNc4hJBNMFDATRxWPEEEiB0g2pZRyZ09kMXcJ4Je9SdZz5jl2Bz/x8oEeTYeLqyvioq928cw==}
+  /@wordpress/icons/6.2.0:
+    resolution: {integrity: sha512-4TDeF6kRtxRzGx9P+55noNtd3uOkbtXwmXzn5kiOOxeMaOkr8H81ZMYDkIJ/B+ppnLL2GQVMEqJIilPK172x4w==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/components': 19.2.0_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/plugins': 4.0.7_react@17.0.2
-      '@wordpress/viewport': 4.0.7_react@17.0.2
-      classnames: 2.3.1
-      lodash: 4.17.21
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@types/react'
-      - react
-      - react-dom
-      - reakit-utils
-      - redux
-    dev: true
+      '@wordpress/element': 4.1.0
+      '@wordpress/primitives': 3.1.0
 
   /@wordpress/is-shallow-equal/3.1.3:
     resolution: {integrity: sha512-eDLhfC4aaSgklzqwc6F/F4zmJVpTVTAvhqX+q0SP/8LPcP2HuKErPHVrEc75PMWqIutja2wJg98YSNPdewrj1w==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
     dev: false
 
-  /@wordpress/is-shallow-equal/4.2.1:
-    resolution: {integrity: sha512-XczqD3S6euQcSlLY+RFmmQIOwI/X/R/Q1uXS7vPVOnhz6MH63nrmGOtq4vTTzWv+qyRMPSkq0nmuX31U7DNdRA==}
+  /@wordpress/is-shallow-equal/4.3.0:
+    resolution: {integrity: sha512-wPO2iBPZ39kvX28Oj4AYg3eIaNBgvg0tqLBofZWZeZQK03XUxBJqNeX1NHlHFctALCn1c2U7xw+Uikdkibp+gw==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
 
-  /@wordpress/jest-console/4.1.1_jest@27.3.1:
-    resolution: {integrity: sha512-f/DwduxU6k53tULurpCox4TKzp877+IWTHRUxE91+FOXS+2OsnhUPKfMiMEex4nu81a54EArwekPVKxaq4swbA==}
+  /@wordpress/jest-console/5.0.0_jest@27.3.1:
+    resolution: {integrity: sha512-jW9TskAlHYbOdA2H/LTDUZ8Db5kigs9haNJtOgRYcgqjp2wioEGOziss69b3/HszRq9s0yAHxdiLEVhuLrFY6Q==}
     engines: {node: '>=12'}
     peerDependencies:
-      jest: '>=26'
+      jest: '>=27'
     dependencies:
       '@babel/runtime': 7.16.7
       jest: 27.3.1
-      jest-matcher-utils: 26.6.2
+      jest-matcher-utils: 27.4.6
       lodash: 4.17.21
     dev: false
 
-  /@wordpress/jest-preset-default/7.1.3_@babel+core@7.16.0+jest@27.3.1:
-    resolution: {integrity: sha512-rz9V/YRr3TjLdZJQu7DAZHo848PpZ4N5ThtP4Lujy1O/UtcvtKF0r34SZTNDlFQO/G1USZQX/WL6HRhgl57iHA==}
+  /@wordpress/jest-preset-default/8.0.0_@babel+core@7.16.0+jest@27.3.1:
+    resolution: {integrity: sha512-7vKskqlEdYL8b+itZGDRf6yceTva9xUV4NK8KZ+HFcLP4ZJuhuosIBCkkSdh1Mlu8LBEQLmgtkUzvxqhJE7NLQ==}
     engines: {node: '>=12'}
     peerDependencies:
-      jest: '>=26'
+      '@babel/core': '>=7'
+      jest: '>=27'
+      react: ^17.0.0
+      react-dom: ^17.0.0
     dependencies:
+      '@babel/core': 7.16.0
       '@wojtekmaj/enzyme-adapter-react-17': 0.6.3_enzyme@3.11.0
-      '@wordpress/jest-console': 4.1.1_jest@27.3.1
-      babel-jest: 26.6.3_@babel+core@7.16.0
+      '@wordpress/jest-console': 5.0.0_jest@27.3.1
+      babel-jest: 27.4.6_@babel+core@7.16.0
       enzyme: 3.11.0
       enzyme-to-json: 3.6.2_enzyme@3.11.0
       jest: 27.3.1
     transitivePeerDependencies:
-      - '@babel/core'
-      - react
-      - react-dom
       - supports-color
     dev: false
 
-  /@wordpress/keyboard-shortcuts/3.0.7_react@17.0.2:
-    resolution: {integrity: sha512-qBlM4Wa1ntzX7MQM7oifOKnHgH+sWGdynmut4rCuCUqfGqqB6hwBE3nkg3sMMWYKTxA8AtE8wcxPr9bQffnx1w==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/keycodes': 3.2.4
-      lodash: 4.17.21
-      rememo: 3.0.0
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: true
-
-  /@wordpress/keyboard-shortcuts/3.0.7_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-qBlM4Wa1ntzX7MQM7oifOKnHgH+sWGdynmut4rCuCUqfGqqB6hwBE3nkg3sMMWYKTxA8AtE8wcxPr9bQffnx1w==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/element': 4.0.4
-      '@wordpress/keycodes': 3.2.4
-      lodash: 4.17.21
-      rememo: 3.0.0
-    transitivePeerDependencies:
-      - react
-      - redux
-
-  /@wordpress/keyboard-shortcuts/3.0.7_react@17.0.2+redux@4.1.1:
-    resolution: {integrity: sha512-qBlM4Wa1ntzX7MQM7oifOKnHgH+sWGdynmut4rCuCUqfGqqB6hwBE3nkg3sMMWYKTxA8AtE8wcxPr9bQffnx1w==}
+  /@wordpress/keyboard-shortcuts/3.1.0_react@17.0.2:
+    resolution: {integrity: sha512-4k4nsy0pGxAlMZApC8ImNt8tdW4sOGDbEP7YB0IeQmitYWXSC2HoS/qvvaEYVopEjh5Z/ifw7SkEOFV77HhPQA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/element': 4.0.4
-      '@wordpress/keycodes': 3.2.4
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/keycodes': 3.3.0
       lodash: 4.17.21
       rememo: 3.0.0
     transitivePeerDependencies:
       - react
-      - redux
-    dev: false
 
   /@wordpress/keycodes/2.19.3:
     resolution: {integrity: sha512-8rNdmP5M1ifTgLIL0dt/N1uTGsq/Rx1ydCXy+gg24WdxBRhyu5sudNVCtascVXo26aIfOH9OJRdqRZZTEORhog==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/i18n': 3.20.0
       lodash: 4.17.21
     dev: false
 
-  /@wordpress/keycodes/3.2.4:
-    resolution: {integrity: sha512-o6/WFO8Amoyk3r3JtCJ1ctt0bLfvCqyfV7SdA39QDtAe8ufIkDNRwyQOjzaVMbHznNCuBL1FhClPzGy+RH0o9w==}
+  /@wordpress/keycodes/3.3.0:
+    resolution: {integrity: sha512-VSAD09mMwAy7wKtWqUMPrzVN2c7oF0h/DXbb/WOCPLpQMaX4M1wYiohEao9CS4WjdvxZgMaXmx9eBWQ3XGEbHA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/i18n': 4.2.4
-      lodash: 4.17.21
-
-  /@wordpress/media-utils/3.0.5:
-    resolution: {integrity: sha512-BshnzzBECsH8JuxU/qgJkRCBoPNPQ/z9PeWzTFMY3hPYtbd23hMtZpPqc9EGkjU+Ovs1AF8qEjNr9wPOCDq3nA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blob': 3.2.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
+      '@wordpress/i18n': 4.3.0
       lodash: 4.17.21
-    dev: true
 
-  /@wordpress/notices/3.2.8_react@17.0.2:
-    resolution: {integrity: sha512-SC7O+L81Xf50ntHSfUGpvnb1FutSV4RZxZQyEDdiRe4Ril1dnm4ddU49AXunPHsQ68VYNUBxs8P30EplXtZp5g==}
+  /@wordpress/media-utils/3.1.0:
+    resolution: {integrity: sha512-FMgSrHf5fOstPqRLIRI3lrzL8eIPsK9+F301G5jhar6MlQvyjcj/2CFLUD4MCUjC5aGul1ll1U1Lw7C6+cCBqQ==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/data': 6.1.5_react@17.0.2
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blob': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
       lodash: 4.17.21
-    transitivePeerDependencies:
-      - react
-      - redux
     dev: true
 
-  /@wordpress/notices/3.2.8_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-SC7O+L81Xf50ntHSfUGpvnb1FutSV4RZxZQyEDdiRe4Ril1dnm4ddU49AXunPHsQ68VYNUBxs8P30EplXtZp5g==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      lodash: 4.17.21
-    transitivePeerDependencies:
-      - react
-      - redux
-
-  /@wordpress/notices/3.2.8_react@17.0.2+redux@4.1.1:
-    resolution: {integrity: sha512-SC7O+L81Xf50ntHSfUGpvnb1FutSV4RZxZQyEDdiRe4Ril1dnm4ddU49AXunPHsQ68VYNUBxs8P30EplXtZp5g==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      lodash: 4.17.21
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: false
-
-  /@wordpress/plugins/4.0.7_react@17.0.2:
-    resolution: {integrity: sha512-dSvSOTkGuoJ7kfst/eLJpHNHf12If+UYsB5WuGXy5sk3z5H9EIOe6XC5272ZVrS/5DUGloCxZP7k7m2vG5iXuQ==}
+  /@wordpress/notices/3.3.0_react@17.0.2:
+    resolution: {integrity: sha512-sRQKaXbcW/QI9Q6uGVmEkGzlbT+WTFPxG6S9TksrKi1UvplWJmQ7BOq4mWYlMZ5Bnq1kETltf/ToLZdw6hSOyg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/hooks': 3.2.2
-      '@wordpress/icons': 6.1.1
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/data': 6.2.0_react@17.0.2
       lodash: 4.17.21
-      memize: 1.1.0
     transitivePeerDependencies:
       - react
-    dev: true
 
-  /@wordpress/postcss-plugins-preset/3.2.5:
-    resolution: {integrity: sha512-R+UKnjSJivvVEZ8rhGrXxsj/BlVeNO2FRXq3IxEOPv5ZRfAS0g8k8EO3xsCIV1RfnozvAApkKEYRClDYXIt+vA==}
+  /@wordpress/postcss-plugins-preset/3.3.0:
+    resolution: {integrity: sha512-Yj6t+eATEObTyGUoMaxZfkHtKh9i59lAUKTz1NY47QDmNED+Gq5WBBuQJ7ddFIXeQ7LSJcpN1wWujvNexeVISA==}
     engines: {node: '>=12'}
     dependencies:
-      '@wordpress/base-styles': 4.0.4
+      '@wordpress/base-styles': 4.1.0
       autoprefixer: 10.4.2
     transitivePeerDependencies:
       - postcss
@@ -8685,17 +9099,17 @@ packages:
   /@wordpress/primitives/1.12.3:
     resolution: {integrity: sha512-LIF44bVlJS7CJEVmk6TLuV6HZMdj5iwkyM8do4ukGY6qnZIzrXpBablgJeDBcyjzWrWRLn+w+tiZ/8l+2egoVA==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       '@wordpress/element': 2.20.3
       classnames: 2.3.1
     dev: false
 
-  /@wordpress/primitives/3.0.4:
-    resolution: {integrity: sha512-yu3BEpr09vpPM0QOYGm5Kmwo/tfo7u7Ez4hN5+AL2dT53VNr3QOmDo0Ym7sewI7+GgU18H4VkAi1QOydrc4vDw==}
+  /@wordpress/primitives/3.1.0:
+    resolution: {integrity: sha512-VD6sDAV8njme6XhPudRBmH0Y6k/9p7tHIEitd1d1Ze6wIsIPfgldq4Ls3z/rs08VUBw05q8T1ku5hJb+WoSsMw==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/element': 4.0.4
+      '@wordpress/element': 4.1.0
       classnames: 2.3.1
 
   /@wordpress/priority-queue/1.11.2:
@@ -8704,8 +9118,8 @@ packages:
       '@babel/runtime': 7.16.7
     dev: false
 
-  /@wordpress/priority-queue/2.2.3:
-    resolution: {integrity: sha512-VI1VhkpgNs5b2LkpmlOIfJz7mVHOxMvh+MtG+NsuKc+0t6iOftfq8xxZ+8PbVLspZ8gd7p0rS+oXmSSqr9nc9g==}
+  /@wordpress/priority-queue/2.3.0:
+    resolution: {integrity: sha512-IQGE6brycJR5a/7GiJE1B7aTXN5MUE5Rabbc6KFiklkHGMVJUryHf1KETLnMUKJvQewAuGP34ec7N/bkimOJXA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
@@ -8713,15 +9127,17 @@ packages:
   /@wordpress/redux-routine/3.14.2:
     resolution: {integrity: sha512-aqi4UtvMP/+NhULxyCR8ktG0v4BJVTRcMpByAqDg7Oabq2sz2LPuShxd5UY8vxQYQY9t1uUJbslhom4ytcohWg==}
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       is-promise: 4.0.0
       lodash: 4.17.21
       rungen: 0.3.2
     dev: false
 
-  /@wordpress/redux-routine/4.2.2:
-    resolution: {integrity: sha512-zfL8qsSvwI2lAvgPSVfOFCWDg0f0zusba0+uEIVZjPVstmjJtxO902mRZfWsg5+ooFSYq0T7rieet4nasYJX7g==}
+  /@wordpress/redux-routine/4.3.0_redux@4.1.2:
+    resolution: {integrity: sha512-+sO2DDn4V+umx2v4i+8AIhCYJ8XHPeAFntFuxSVeFP6q41PDLNq4uZ5pm53QFuQoQTIE1YwHgXKxQ1lCS0hBxw==}
     engines: {node: '>=12'}
+    peerDependencies:
+      redux: '>=4'
     dependencies:
       '@babel/runtime': 7.16.7
       is-promise: 4.0.0
@@ -8729,277 +9145,207 @@ packages:
       redux: 4.1.2
       rungen: 0.3.2
 
-  /@wordpress/reusable-blocks/3.0.19_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-EU4Vo3ETTTN5DAQCrgh3AOuVRsZCrIJ1LcRgGJfFBSEJe6Sto3pxxj3ZtI+Goc4U553q3M/qpghHZNo1JZcfew==}
+  /@wordpress/reusable-blocks/3.1.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-B10rV/r1nPqUUszakFOGJTXjAGhiGxXArtZ0F6DdXzXEhiEOhKe+D0ak9zAP+CE4/MNCDVVjzFZUbiNsdWS9MQ==}
     engines: {node: '>=12'}
     dependencies:
-      '@wordpress/block-editor': 8.0.13_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/components': 19.2.0_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/core-data': 4.0.9_react@17.0.2+redux@4.0.5
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/notices': 3.2.8_react@17.0.2+redux@4.0.5
-      '@wordpress/url': 3.3.1
+      '@wordpress/block-editor': 8.1.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/core-data': 4.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react
       - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
-  /@wordpress/reusable-blocks/3.0.19_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-EU4Vo3ETTTN5DAQCrgh3AOuVRsZCrIJ1LcRgGJfFBSEJe6Sto3pxxj3ZtI+Goc4U553q3M/qpghHZNo1JZcfew==}
+  /@wordpress/reusable-blocks/3.1.0_aae888dfa296766acacf1a733aa50b3a:
+    resolution: {integrity: sha512-B10rV/r1nPqUUszakFOGJTXjAGhiGxXArtZ0F6DdXzXEhiEOhKe+D0ak9zAP+CE4/MNCDVVjzFZUbiNsdWS9MQ==}
     engines: {node: '>=12'}
     dependencies:
-      '@wordpress/block-editor': 8.0.13_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/components': 19.2.0_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/core-data': 4.0.9_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/icons': 6.1.1
-      '@wordpress/notices': 3.2.8_react@17.0.2
-      '@wordpress/url': 3.3.1
+      '@wordpress/block-editor': 8.1.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/core-data': 4.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/icons': 6.2.0
+      '@wordpress/notices': 3.3.0_react@17.0.2
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react
-      - react-dom
-      - reakit-utils
-      - redux
-    dev: true
-
-  /@wordpress/rich-text/3.25.3_react@17.0.2:
-    resolution: {integrity: sha512-FdqL1/rHTsRxZ1gW1UEWuy0URmUEqMzj5hcAbOhHFPO5m0ENrkzC9bBa195KqZBSNSmBmXnDZdHu4UJUolzcZg==}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/compose': 3.25.3_react@17.0.2
-      '@wordpress/data': 4.27.3_react@17.0.2
-      '@wordpress/dom': 2.18.0
-      '@wordpress/element': 2.20.3
-      '@wordpress/escape-html': 1.12.2
-      '@wordpress/is-shallow-equal': 3.1.3
-      '@wordpress/keycodes': 2.19.3
-      classnames: 2.3.1
-      lodash: 4.17.21
-      memize: 1.1.0
-      rememo: 3.0.0
-    transitivePeerDependencies:
-      - react
-    dev: false
-
-  /@wordpress/rich-text/5.0.7:
-    resolution: {integrity: sha512-oroNrJFJw9DNVielMdel/EeJNwD/bGzKPEAL0cp1AbilcS4jNxBW7oR+hOOv/ZQGH+1iDmOhwhOdERP4n78s3A==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7
-      '@wordpress/data': 6.1.5
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/escape-html': 2.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
-      classnames: 2.3.1
-      lodash: 4.17.21
-      memize: 1.1.0
-      rememo: 3.0.0
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: false
+      - react-dom
+    dev: true
 
-  /@wordpress/rich-text/5.0.7_react@17.0.2:
-    resolution: {integrity: sha512-oroNrJFJw9DNVielMdel/EeJNwD/bGzKPEAL0cp1AbilcS4jNxBW7oR+hOOv/ZQGH+1iDmOhwhOdERP4n78s3A==}
-    engines: {node: '>=12'}
+  /@wordpress/rich-text/3.25.3_react@17.0.2:
+    resolution: {integrity: sha512-FdqL1/rHTsRxZ1gW1UEWuy0URmUEqMzj5hcAbOhHFPO5m0ENrkzC9bBa195KqZBSNSmBmXnDZdHu4UJUolzcZg==}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/escape-html': 2.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
+      '@wordpress/compose': 3.25.3_react@17.0.2
+      '@wordpress/data': 4.27.3_react@17.0.2
+      '@wordpress/dom': 2.18.0
+      '@wordpress/element': 2.20.3
+      '@wordpress/escape-html': 1.12.2
+      '@wordpress/is-shallow-equal': 3.1.3
+      '@wordpress/keycodes': 2.19.3
       classnames: 2.3.1
       lodash: 4.17.21
       memize: 1.1.0
       rememo: 3.0.0
     transitivePeerDependencies:
       - react
-      - redux
+    dev: false
 
-  /@wordpress/rich-text/5.0.7_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-oroNrJFJw9DNVielMdel/EeJNwD/bGzKPEAL0cp1AbilcS4jNxBW7oR+hOOv/ZQGH+1iDmOhwhOdERP4n78s3A==}
+  /@wordpress/rich-text/5.1.0:
+    resolution: {integrity: sha512-WtOmUqecF4JW9zk+aoT5gO65CbEbknSYNCXm1ZdUIokLqhzC43pgo5qrFscHnSeTRXfZZvUu+4kj3bnHarUuIg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/escape-html': 2.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/compose': 5.1.0
+      '@wordpress/data': 6.2.0
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/escape-html': 2.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
       classnames: 2.3.1
       lodash: 4.17.21
       memize: 1.1.0
       rememo: 3.0.0
     transitivePeerDependencies:
       - react
-      - redux
+    dev: false
 
-  /@wordpress/rich-text/5.0.7_react@17.0.2+redux@4.1.1:
-    resolution: {integrity: sha512-oroNrJFJw9DNVielMdel/EeJNwD/bGzKPEAL0cp1AbilcS4jNxBW7oR+hOOv/ZQGH+1iDmOhwhOdERP4n78s3A==}
+  /@wordpress/rich-text/5.1.0_react@17.0.2:
+    resolution: {integrity: sha512-WtOmUqecF4JW9zk+aoT5gO65CbEbknSYNCXm1ZdUIokLqhzC43pgo5qrFscHnSeTRXfZZvUu+4kj3bnHarUuIg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/a11y': 3.2.4
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.1.1
-      '@wordpress/dom': 3.2.7
-      '@wordpress/element': 4.0.4
-      '@wordpress/escape-html': 2.2.3
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/is-shallow-equal': 4.2.1
-      '@wordpress/keycodes': 3.2.4
+      '@wordpress/a11y': 3.3.0
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/dom': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/escape-html': 2.3.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/is-shallow-equal': 4.3.0
+      '@wordpress/keycodes': 3.3.0
       classnames: 2.3.1
       lodash: 4.17.21
       memize: 1.1.0
       rememo: 3.0.0
     transitivePeerDependencies:
       - react
-      - redux
-    dev: false
 
-  /@wordpress/server-side-render/3.0.16_595f56c80e7e5fab2a648c0f724c83ea:
-    resolution: {integrity: sha512-cHuzL9fowuVz8G4Yz+DbbS850h+iUjM8+5jYzRZ9DH04fv/Y/dEGbdxZQ2K/p9wFQrQfnJ4EWUxJV1lUN/HTUw==}
+  /@wordpress/server-side-render/3.1.0_@babel+core@7.16.0+react@17.0.2:
+    resolution: {integrity: sha512-oEeonLobAmyLGF1U4MVXFvZpBSbBSCdI0rTPRbA1TFPDyjwypz8D26MZ/E2YhePV+IWerCSBE/VbjxAE1n6SpA==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blocks': 11.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/components': 19.1.6_595f56c80e7e5fab2a648c0f724c83ea
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/url': 3.3.1
+      '@babel/runtime': 7.16.7
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_@babel+core@7.16.0+react@17.0.2
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react
       - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
-  /@wordpress/server-side-render/3.0.17_@babel+core@7.16.0+react@17.0.2:
-    resolution: {integrity: sha512-UIyywGUSlbOVFi1SNwI/uUmHmUJFX+N9XeBCAnS15PmfYflBkiuz9FPmZWoqLoOE4uWTI7K9lAP1tkY80lotIA==}
+  /@wordpress/server-side-render/3.1.0_aae888dfa296766acacf1a733aa50b3a:
+    resolution: {integrity: sha512-oEeonLobAmyLGF1U4MVXFvZpBSbBSCdI0rTPRbA1TFPDyjwypz8D26MZ/E2YhePV+IWerCSBE/VbjxAE1n6SpA==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
-      '@wordpress/api-fetch': 5.2.6
-      '@wordpress/blocks': 11.1.5_react@17.0.2
-      '@wordpress/components': 19.2.0_@babel+core@7.16.0+react@17.0.2
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      '@wordpress/deprecated': 3.2.3
-      '@wordpress/element': 4.0.4
-      '@wordpress/i18n': 4.2.4
-      '@wordpress/url': 3.3.1
+      '@wordpress/api-fetch': 6.0.0
+      '@wordpress/blocks': 11.2.0_react@17.0.2
+      '@wordpress/components': 19.3.0_aae888dfa296766acacf1a733aa50b3a
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
+      '@wordpress/deprecated': 3.3.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/i18n': 4.3.0
+      '@wordpress/url': 3.4.0
       lodash: 4.17.21
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/react'
       - react
       - react-dom
-      - reakit-utils
-      - redux
     dev: true
 
-  /@wordpress/shortcode/3.2.3:
-    resolution: {integrity: sha512-zXIg2AbwJhJNCp55roC+wuyZQnMC/GLdgh95pAa5a7Hd+ThXf0hbBg+DP9lo1x+cxAZAEGZ/Bns/+SCUr1boTA==}
+  /@wordpress/shortcode/3.3.0:
+    resolution: {integrity: sha512-E0YuuCcdfR2aAFQPoBW/wk47pd1uPgUfTp/4ticDKUfucqHjGvVPrZGtb2p4WFScrxuMYcee+tM4CWT3YqGraQ==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       lodash: 4.17.21
       memize: 1.1.0
 
-  /@wordpress/token-list/2.2.2:
-    resolution: {integrity: sha512-JElgvK1NsQVfSnR51qWDV7cEB/2U7saV+MKDxdmP7mhcwg538AVyKTkOdmzYrx/9fqOEf0bkWOt3WX9xLD35kQ==}
+  /@wordpress/token-list/2.3.0:
+    resolution: {integrity: sha512-CyXR6c2pp92ofSXl4BJ77G5AxNlzZS0j6emWP/aae19jDnFYKZE4oNGIw3Tg0LEOCysqk/u7z5AxWc1p6T3icg==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       lodash: 4.17.21
 
-  /@wordpress/url/3.3.1:
-    resolution: {integrity: sha512-lEuvkNjPoVuzYy0zn6n9gfMdNlHJW36EsPI2yDzMICjIAV5lRv1/uOg2Ls3lbDaRR2vm1FAiMpB2RAMzfR8Nfg==}
+  /@wordpress/url/3.4.0:
+    resolution: {integrity: sha512-E4jnotQrNwvrl6Zdo3S3bDBOzVKnTH7xnOr03VuNtjvWtu2ANRS9R/cD9yVXbvDdiBC2jAJHmCrEMVCxGJmuIw==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       lodash: 4.17.21
 
-  /@wordpress/viewport/4.0.7_react@17.0.2:
-    resolution: {integrity: sha512-huxUrFW6JNhj/hUfvftZeht3B6HF0jk10oyHW3dPcFW57ceecJTDB9BdS7a99B1LBP8AWjdN8x/3SqrMwE4yfg==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2
-      lodash: 4.17.21
-    transitivePeerDependencies:
-      - react
-      - redux
-    dev: true
-
-  /@wordpress/viewport/4.0.7_react@17.0.2+redux@4.0.5:
-    resolution: {integrity: sha512-huxUrFW6JNhj/hUfvftZeht3B6HF0jk10oyHW3dPcFW57ceecJTDB9BdS7a99B1LBP8AWjdN8x/3SqrMwE4yfg==}
+  /@wordpress/viewport/4.1.0_react@17.0.2:
+    resolution: {integrity: sha512-WWli8c0Y+w1+CWyZ5GXS0xWJ6fO/mG9y+TfPG8FkPM7/d+QqT73N04dYLe7DVgvjQK6f7v8VegoLKc7Yy0T7VQ==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/runtime': 7.16.3
-      '@wordpress/compose': 5.0.7_react@17.0.2
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
+      '@babel/runtime': 7.16.7
+      '@wordpress/compose': 5.1.0_react@17.0.2
+      '@wordpress/data': 6.2.0_react@17.0.2
       lodash: 4.17.21
     transitivePeerDependencies:
       - react
-      - redux
-    dev: false
 
   /@wordpress/warning/1.4.2:
     resolution: {integrity: sha512-MjrkSp6Jyfx+92AE32A83P503noUtGb6//BYUH4GiWzzzSNhDHgbQ0UcOJwJaEYK166DxSNpMk/JXc4YENi1Cw==}
     dev: false
 
-  /@wordpress/warning/2.2.2:
-    resolution: {integrity: sha512-iG1Hq56RK3N6AJqAD1sRLWRIJatfYn+NrPyrfqRNZNYXHM8Vj/s7ABNMbIU0Y99vXkBE83rvCdbMkugNoI2jXA==}
+  /@wordpress/warning/2.3.0:
+    resolution: {integrity: sha512-Is6uEp2wvUPTK1+RtQQdzTdb93BDMAJEYE5UCHvoSFCWpxvEhBP6SY+Nzv/MkFKHZwY66QxEAduThxfINma87Q==}
     engines: {node: '>=12'}
 
-  /@wordpress/wordcount/3.2.3:
-    resolution: {integrity: sha512-iguvGA4zU1tB0avpzIzVdVrIeH0CbeiOlhbYgtkQ5J2UqdRs6lo7pZFlp/3HAvmtBo8r2iGlbc+QZgKzR6gdJw==}
+  /@wordpress/wordcount/3.3.0:
+    resolution: {integrity: sha512-969gA/7yQlhovnLY+XN4NSA3u4T9MAJv6Z5EbxmCFfbXOiHDc7IU2VrKMBnqlcJzriVepujYyPcIQ8krT2nz7Q==}
     engines: {node: '>=12'}
     dependencies:
       '@babel/runtime': 7.16.7
       lodash: 4.17.21
 
-  /@wp-g2/components/0.0.140_39aa9b824a3099e0a8f080749de9ea5d:
+  /@wp-g2/components/0.0.140_cbbf6db973bdf4a4a0954a832637d63f:
     resolution: {integrity: sha512-bychuhZ3wPSB457CHYcogoPQPlP/eUA9GoTo0Fv0rj7f44Gr9XlPoqVT+GQa3CmPnvSCAl1sjoe75Vkaoo/O1w==}
     peerDependencies:
       '@wordpress/i18n': '>=3.17.0'
@@ -9010,8 +9356,8 @@ packages:
       '@popperjs/core': 2.11.2
       '@wordpress/i18n': 3.20.0
       '@wordpress/icons': 2.10.3
-      '@wp-g2/context': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
-      '@wp-g2/styles': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
+      '@wp-g2/context': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
+      '@wp-g2/styles': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
       '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
       csstype: 3.0.10
       downshift: 6.1.7_react@17.0.2
@@ -9032,13 +9378,13 @@ packages:
       - '@wordpress/is-shallow-equal'
     dev: false
 
-  /@wp-g2/context/0.0.140_a53271638ee60ee853e0b95b95bb3a79:
+  /@wp-g2/context/0.0.140_9be7e7b1381639c021accc00fc2a2b0f:
     resolution: {integrity: sha512-z32fxZ2tCVmYQC+wyyziyrhEvWBPFBQfUhUHF85JmTUPzQQeEPiLC3rgDAT0fUTFlJHinPJQq6871RDqFSwCUA==}
     peerDependencies:
       react: ^16.13.1
       react-dom: ^16.13.1
     dependencies:
-      '@wp-g2/styles': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
+      '@wp-g2/styles': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
       '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
       lodash: 4.17.21
       react: 17.0.2
@@ -9049,7 +9395,7 @@ packages:
       - '@wordpress/is-shallow-equal'
     dev: false
 
-  /@wp-g2/create-styles/0.0.140_a53271638ee60ee853e0b95b95bb3a79:
+  /@wp-g2/create-styles/0.0.140_9be7e7b1381639c021accc00fc2a2b0f:
     resolution: {integrity: sha512-/60DxWjCAhsoYOqY7aiHVbkTAF+L6qZIyHyH50oNs9FTVkcRLHQFSC0kHgAam+Z9K3eImQ7hM52wfBDqae0q2Q==}
     peerDependencies:
       '@wordpress/data': '>=4.26'
@@ -9059,7 +9405,7 @@ packages:
     dependencies:
       '@emotion/core': 10.3.1_react@17.0.2
       '@emotion/is-prop-valid': 0.8.8
-      '@wordpress/data': 6.1.5_react@17.0.2+redux@4.0.5
+      '@wordpress/data': 6.2.0_react@17.0.2
       '@wordpress/is-shallow-equal': 3.1.3
       '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
       create-emotion: 10.0.27
@@ -9075,13 +9421,13 @@ packages:
       - '@types/react'
     dev: false
 
-  /@wp-g2/styles/0.0.140_a53271638ee60ee853e0b95b95bb3a79:
+  /@wp-g2/styles/0.0.140_9be7e7b1381639c021accc00fc2a2b0f:
     resolution: {integrity: sha512-wAvtqQOqX2zYpfEdVK4l4abH/hUUgw/+8+E5PvPgrsvqFg8IehNSksnjNF5/IloLRGAH70d8ytjMuMnUK8PVYA==}
     peerDependencies:
       react: ^16.13.1
       react-dom: ^16.13.1
     dependencies:
-      '@wp-g2/create-styles': 0.0.140_a53271638ee60ee853e0b95b95bb3a79
+      '@wp-g2/create-styles': 0.0.140_9be7e7b1381639c021accc00fc2a2b0f
       '@wp-g2/utils': 0.0.140_react-dom@17.0.2+react@17.0.2
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
@@ -9155,6 +9501,14 @@ packages:
       acorn: 7.4.1
     dev: true
 
+  /acorn-jsx/5.3.2_acorn@8.7.0:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      acorn: 8.7.0
+    dev: true
+
   /acorn-walk/7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
     engines: {node: '>=0.4.0'}
@@ -9650,11 +10004,6 @@ packages:
       tslib: 2.3.1
     dev: true
 
-  /astral-regex/2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /async-done/1.3.2:
     resolution: {integrity: sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==}
     engines: {node: '>= 0.10'}
@@ -9742,18 +10091,18 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-jest/26.6.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==}
-    engines: {node: '>= 10.14.2'}
+  /babel-jest/27.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     peerDependencies:
-      '@babel/core': ^7.0.0
+      '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.16.0
-      '@jest/transform': 26.6.2
-      '@jest/types': 26.6.2
+      '@jest/transform': 27.4.6
+      '@jest/types': 27.4.2
       '@types/babel__core': 7.1.18
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 26.6.2_@babel+core@7.16.0
+      babel-preset-jest: 27.4.0_@babel+core@7.16.0
       chalk: 4.1.2
       graceful-fs: 4.2.9
       slash: 3.0.0
@@ -9761,8 +10110,8 @@ packages:
       - supports-color
     dev: false
 
-  /babel-jest/27.3.1_@babel+core@7.16.0:
-    resolution: {integrity: sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==}
+  /babel-jest/27.4.6_@babel+core@7.16.0:
+    resolution: {integrity: sha512-qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
@@ -9812,6 +10161,21 @@ packages:
       schema-utils: 2.7.1
       webpack: 5.65.0_webpack-cli@4.9.1
 
+  /babel-loader/8.2.3_c391fd7145c194be609b87ed083bbc6a:
+    resolution: {integrity: sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==}
+    engines: {node: '>= 8.9'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+      webpack: '>=2'
+    dependencies:
+      '@babel/core': 7.16.7
+      find-cache-dir: 3.3.2
+      loader-utils: 1.4.0
+      make-dir: 3.1.0
+      schema-utils: 2.7.1
+      webpack: 5.65.0
+    dev: true
+
   /babel-plugin-add-react-displayname/0.0.5:
     resolution: {integrity: sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=}
     dev: true
@@ -9869,16 +10233,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /babel-plugin-jest-hoist/26.6.2:
-    resolution: {integrity: sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@babel/template': 7.16.7
-      '@babel/types': 7.16.7
-      '@types/babel__core': 7.1.18
-      '@types/babel__traverse': 7.14.2
-    dev: false
-
   /babel-plugin-jest-hoist/27.4.0:
     resolution: {integrity: sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -9924,6 +10278,19 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /babel-plugin-polyfill-corejs2/0.3.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.4
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.0_@babel+core@7.16.7
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-polyfill-corejs3/0.1.7_@babel+core@7.16.0:
     resolution: {integrity: sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==}
     peerDependencies:
@@ -9936,6 +10303,18 @@ packages:
       - supports-color
     dev: true
 
+  /babel-plugin-polyfill-corejs3/0.1.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.1.5_@babel+core@7.16.7
+      core-js-compat: 3.20.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-polyfill-corejs3/0.4.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==}
     peerDependencies:
@@ -9947,6 +10326,18 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /babel-plugin-polyfill-corejs3/0.4.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.0_@babel+core@7.16.7
+      core-js-compat: 3.20.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-polyfill-regenerator/0.3.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==}
     peerDependencies:
@@ -9957,6 +10348,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /babel-plugin-polyfill-regenerator/0.3.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.0_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-react-docgen/4.2.1:
     resolution: {integrity: sha512-UQ0NmGHj/HAqi5Bew8WvNfCk8wSsmdgNd8ZdMjBCICtyCJCq9LiqgqvjCYe570/Wg7AQArSq1VQ60Dd/CHN7mQ==}
     dependencies:
@@ -10022,17 +10424,6 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.7
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.7
 
-  /babel-preset-jest/26.6.2_@babel+core@7.16.0:
-    resolution: {integrity: sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==}
-    engines: {node: '>= 10.14.2'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.16.0
-      babel-plugin-jest-hoist: 26.6.2
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.0
-    dev: false
-
   /babel-preset-jest/27.4.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -10475,6 +10866,7 @@ packages:
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
       rsvp: 4.8.5
+    dev: true
 
   /case-sensitive-paths-webpack-plugin/2.4.0:
     resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}
@@ -10677,6 +11069,7 @@ packages:
 
   /ci-info/2.0.0:
     resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
+    dev: true
 
   /ci-info/3.3.0:
     resolution: {integrity: sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==}
@@ -10953,8 +11346,8 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /comment-parser/1.2.4:
-    resolution: {integrity: sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==}
+  /comment-parser/1.3.0:
+    resolution: {integrity: sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==}
     engines: {node: '>= 12.0.0'}
     dev: true
 
@@ -11281,6 +11674,7 @@ packages:
       semver: 5.7.1
       shebang-command: 1.2.0
       which: 1.3.1
+    dev: true
 
   /cross-spawn/7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
@@ -11810,11 +12204,6 @@ packages:
     resolution: {integrity: sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ==}
     dev: true
 
-  /diff-sequences/26.6.2:
-    resolution: {integrity: sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==}
-    engines: {node: '>= 10.14.2'}
-    dev: false
-
   /diff-sequences/27.4.0:
     resolution: {integrity: sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -12150,13 +12539,6 @@ packages:
       graceful-fs: 4.2.9
       tapable: 2.2.1
 
-  /enquirer/2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
-    engines: {node: '>=8.6'}
-    dependencies:
-      ansi-colors: 4.1.1
-    dev: true
-
   /entities/1.1.2:
     resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
     dev: false
@@ -12400,25 +12782,16 @@ packages:
     optionalDependencies:
       source-map: 0.6.1
 
-  /eslint-config-prettier/7.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
-    dependencies:
-      eslint: 7.32.0
-    dev: true
-
-  /eslint-config-prettier/8.3.0_eslint@7.32.0:
+  /eslint-config-prettier/8.3.0_eslint@8.8.0:
     resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-config-wpcalypso/6.1.0_3eb42fe7d0610a71481faeb55adacf83:
+  /eslint-config-wpcalypso/6.1.0_11dfa443dfb9bfd86a5486c959f4047a:
     resolution: {integrity: sha512-FMdXC+jjS4vPI2zJ6b+C0cevn75SBC35DDgOgrRd6a4KriIQAiKhXQz14d7ivFyT48nOX6rEfJQqb4keKD5z/w==}
     peerDependencies:
       eslint: ^7.0.0
@@ -12426,11 +12799,11 @@ packages:
       eslint-plugin-jsdoc: ^18.0.0
       eslint-plugin-wpcalypso: ^3.4.1 || ^4.0.0
     dependencies:
-      eslint: 7.32.0
-      eslint-plugin-inclusive-language: 1.2.1
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.3.0_eslint@7.32.0
-      eslint-plugin-wpcalypso: 5.0.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-plugin-inclusive-language: 2.2.0
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      eslint-plugin-wpcalypso: 5.0.0_eslint@8.8.0
     dev: true
 
   /eslint-import-resolver-node/0.3.6:
@@ -12448,23 +12821,23 @@ packages:
       find-up: 2.1.0
     dev: true
 
-  /eslint-plugin-es/4.1.0_eslint@7.32.0:
+  /eslint-plugin-es/4.1.0_eslint@8.8.0:
     resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==}
     engines: {node: '>=8.10.0'}
     peerDependencies:
       eslint: '>=4.19.1'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-utils: 2.1.0
       regexpp: 3.2.0
     dev: true
 
-  /eslint-plugin-es5/1.5.0_eslint@7.32.0:
+  /eslint-plugin-es5/1.5.0_eslint@8.8.0:
     resolution: {integrity: sha512-Qxmfo7v2B7SGAEURJo0dpBweFf+JU15kSyALfiB2rXWcBuJ96r6X9kFHXFnhdopPHCaHjoQs1xQPUJVbGMb1AA==}
     peerDependencies:
       eslint: '>= 3.0.0'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
   /eslint-plugin-import/2.25.4:
@@ -12488,7 +12861,7 @@ packages:
       tsconfig-paths: 3.12.0
     dev: true
 
-  /eslint-plugin-import/2.25.4_eslint@7.32.0:
+  /eslint-plugin-import/2.25.4_eslint@8.8.0:
     resolution: {integrity: sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -12498,7 +12871,7 @@ packages:
       array.prototype.flat: 1.2.5
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.2
       has: 1.0.3
@@ -12510,58 +12883,65 @@ packages:
       tsconfig-paths: 3.12.0
     dev: true
 
-  /eslint-plugin-inclusive-language/1.2.1:
-    resolution: {integrity: sha512-WFXME2g/rEm/ex9HCfptZXJVm6/IrBks4+0rZft24zve4RH196PPuCFvd36aidc2IaHrvVAZHeyahODc7ueoNw==}
+  /eslint-plugin-inclusive-language/2.2.0:
+    resolution: {integrity: sha512-RzPeSjuw1NYiTSQyFzYl2uTDgiPQWDUmFCiGAMCITmXN627DsWZ9rR4KNzrb8vnk/gLL5qdYr8oxh44xsrcO5Q==}
+    dependencies:
+      humps: 2.0.1
     dev: true
 
-  /eslint-plugin-jest/24.7.0_d3b4c2d4ac51f4275548d5d796aee5d5:
-    resolution: {integrity: sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==}
-    engines: {node: '>=10'}
+  /eslint-plugin-jest/25.7.0_2710175b8e1738b8f39f06cfa9aa7159:
+    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 4'
-      eslint: '>=5'
+      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
+      jest:
+        optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      eslint: 7.32.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/experimental-utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jest/24.7.0_eslint@7.32.0:
-    resolution: {integrity: sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==}
-    engines: {node: '>=10'}
+  /eslint-plugin-jest/26.0.0_eslint@8.8.0:
+    resolution: {integrity: sha512-Fvs0YgJ/nw9FTrnqTuMGVrkozkd07jkQzWm0ajqyHlfcsdkxGfAuv30fgfWHOnHiCr9+1YQ365CcDX7vrNhqQg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 4'
-      eslint: '>=5'
+      '@typescript-eslint/eslint-plugin': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
+      jest:
+        optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      eslint: 7.32.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jsdoc/36.1.1_eslint@7.32.0:
-    resolution: {integrity: sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /eslint-plugin-jsdoc/37.7.0_eslint@8.8.0:
+    resolution: {integrity: sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@es-joy/jsdoccomment': 0.10.8
-      comment-parser: 1.2.4
+      '@es-joy/jsdoccomment': 0.18.0
+      comment-parser: 1.3.0
       debug: 4.3.3
-      eslint: 7.32.0
+      escape-string-regexp: 4.0.0
+      eslint: 8.8.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.2.0
-      lodash: 4.17.21
       regextras: 0.8.0
       semver: 7.3.5
       spdx-expression-parse: 3.0.1
@@ -12569,7 +12949,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.5.1_eslint@7.32.0:
+  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.8.0:
     resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -12583,24 +12963,24 @@ packages:
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       has: 1.0.3
       jsx-ast-utils: 3.2.1
       language-tags: 1.0.5
       minimatch: 3.0.4
     dev: true
 
-  /eslint-plugin-lodash/7.3.0_eslint@7.32.0:
+  /eslint-plugin-lodash/7.3.0_eslint@8.8.0:
     resolution: {integrity: sha512-FQM8HklruJzulPawX3uZqWbeyN3bQT4hjVCpFYMrWo0Hdz1qDCwp1v3JS4zjhdssAXdwCxdnyrNMCZJK70GeUQ==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: '>=2'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       lodash: 4.17.21
     dev: true
 
-  /eslint-plugin-prettier/3.4.1_34b707f3a53b0942f3919c1ff656ce36:
+  /eslint-plugin-prettier/3.4.1_5208900944bd53d50aafd0e7d193e6c3:
     resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -12611,39 +12991,39 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
       prettier: /wp-prettier/2.2.1-beta-1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-prettier/3.4.1_b003eb7dfbbe32a2afc96a18053e1e13:
-    resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==}
+  /eslint-plugin-prettier/4.0.0_5208900944bd53d50aafd0e7d193e6c3:
+    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
-      eslint: '>=5.0.0'
+      eslint: '>=7.28.0'
       eslint-config-prettier: '*'
-      prettier: '>=1.13.0'
+      prettier: '>=2.0.0'
     peerDependenciesMeta:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 7.32.0
-      eslint-config-prettier: 8.3.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
       prettier: /wp-prettier/2.2.1-beta-1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.3.0_eslint@7.32.0:
+  /eslint-plugin-react-hooks/4.3.0_eslint@8.8.0:
     resolution: {integrity: sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-react/7.28.0_eslint@7.32.0:
+  /eslint-plugin-react/7.28.0_eslint@8.8.0:
     resolution: {integrity: sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -12652,7 +13032,7 @@ packages:
       array-includes: 3.1.4
       array.prototype.flatmap: 1.2.5
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.2.1
       minimatch: 3.0.4
@@ -12676,13 +13056,13 @@ packages:
       svelte: 3.42.4
     dev: true
 
-  /eslint-plugin-wpcalypso/5.0.0_eslint@7.32.0:
+  /eslint-plugin-wpcalypso/5.0.0_eslint@8.8.0:
     resolution: {integrity: sha512-pcghYspmOv+KzBr+jlDMaazKc8ZKs4vm/dbZWpqCm26wbgCfCpe4276gZJRfUv7Zs+puy3+7h1i/Bd5zfiKBnA==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
   /eslint-scope/5.1.1:
@@ -12692,6 +13072,14 @@ packages:
       esrecurse: 4.3.0
       estraverse: 4.3.0
 
+  /eslint-scope/7.1.0:
+    resolution: {integrity: sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+    dev: true
+
   /eslint-utils/2.1.0:
     resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
     engines: {node: '>=6'}
@@ -12708,13 +13096,13 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@7.32.0:
+  /eslint-utils/3.0.0_eslint@8.8.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -12728,62 +13116,62 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint/7.32.0:
-    resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /eslint-visitor-keys/3.2.0:
+    resolution: {integrity: sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint/8.8.0:
+    resolution: {integrity: sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@babel/code-frame': 7.12.11
-      '@eslint/eslintrc': 0.4.3
-      '@humanwhocodes/config-array': 0.5.0
+      '@eslint/eslintrc': 1.0.5
+      '@humanwhocodes/config-array': 0.9.3
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
       debug: 4.3.3
       doctrine: 3.0.0
-      enquirer: 2.3.6
       escape-string-regexp: 4.0.0
-      eslint-scope: 5.1.1
-      eslint-utils: 2.1.0
-      eslint-visitor-keys: 2.1.0
-      espree: 7.3.1
+      eslint-scope: 7.1.0
+      eslint-utils: 3.0.0_eslint@8.8.0
+      eslint-visitor-keys: 3.2.0
+      espree: 9.3.0
       esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       functional-red-black-tree: 1.0.1
-      glob-parent: 5.1.2
+      glob-parent: 6.0.2
       globals: 13.12.0
-      ignore: 4.0.6
+      ignore: 5.2.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.0.4
       natural-compare: 1.4.0
       optionator: 0.9.1
-      progress: 2.0.3
       regexpp: 3.2.0
-      semver: 7.3.5
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
-      table: 6.8.0
       text-table: 0.2.0
       v8-compile-cache: 2.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /espree/7.3.1:
-    resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /espree/9.3.0:
+    resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 7.4.1
-      acorn-jsx: 5.3.2_acorn@7.4.1
-      eslint-visitor-keys: 1.3.0
+      acorn: 8.7.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
+      eslint-visitor-keys: 3.2.0
     dev: true
 
   /esprima/4.0.1:
@@ -12892,6 +13280,7 @@ packages:
 
   /exec-sh/0.3.6:
     resolution: {integrity: sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==}
+    dev: true
 
   /execa/1.0.0:
     resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
@@ -12904,6 +13293,7 @@ packages:
       p-finally: 1.0.0
       signal-exit: 3.0.6
       strip-eof: 1.0.0
+    dev: true
 
   /execa/5.0.0:
     resolution: {integrity: sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==}
@@ -13738,6 +14128,7 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       pump: 3.0.0
+    dev: true
 
   /get-stream/5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
@@ -13940,13 +14331,6 @@ packages:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  /globals/12.4.0:
-    resolution: {integrity: sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.8.1
-    dev: true
-
   /globals/13.12.0:
     resolution: {integrity: sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==}
     engines: {node: '>=8'}
@@ -14455,7 +14839,6 @@ packages:
     resolution: {integrity: sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==}
     dependencies:
       '@babel/runtime': 7.16.7
-    dev: true
 
   /hmac-drbg/1.0.1:
     resolution: {integrity: sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=}
@@ -14645,6 +15028,10 @@ packages:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
 
+  /humps/2.0.1:
+    resolution: {integrity: sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=}
+    dev: true
+
   /husky/7.0.4:
     resolution: {integrity: sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==}
     engines: {node: '>=12'}
@@ -14711,7 +15098,6 @@ packages:
   /ignore/5.1.8:
     resolution: {integrity: sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==}
     engines: {node: '>= 4'}
-    dev: true
 
   /ignore/5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
@@ -14918,6 +15304,7 @@ packages:
     hasBin: true
     dependencies:
       ci-info: 2.0.0
+    dev: true
 
   /is-core-module/2.8.1:
     resolution: {integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==}
@@ -15468,16 +15855,6 @@ packages:
       - supports-color
       - utf-8-validate
 
-  /jest-diff/26.6.2:
-    resolution: {integrity: sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 26.6.2
-      jest-get-type: 26.3.0
-      pretty-format: 26.6.2
-    dev: false
-
   /jest-diff/27.4.6:
     resolution: {integrity: sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -15586,11 +15963,6 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-get-type/26.3.0:
-    resolution: {integrity: sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==}
-    engines: {node: '>= 10.14.2'}
-    dev: false
-
   /jest-get-type/27.4.0:
     resolution: {integrity: sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -15614,6 +15986,7 @@ packages:
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
+    dev: true
 
   /jest-haste-map/27.4.6:
     resolution: {integrity: sha512-0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ==}
@@ -15665,16 +16038,6 @@ packages:
       jest-get-type: 27.4.0
       pretty-format: 27.4.6
 
-  /jest-matcher-utils/26.6.2:
-    resolution: {integrity: sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 26.6.2
-      jest-get-type: 26.3.0
-      pretty-format: 26.6.2
-    dev: false
-
   /jest-matcher-utils/27.4.6:
     resolution: {integrity: sha512-XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -15719,6 +16082,7 @@ packages:
   /jest-regex-util/26.0.0:
     resolution: {integrity: sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==}
     engines: {node: '>= 10.14.2'}
+    dev: true
 
   /jest-regex-util/27.4.0:
     resolution: {integrity: sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==}
@@ -15816,6 +16180,7 @@ packages:
     dependencies:
       '@types/node': 17.0.8
       graceful-fs: 4.2.9
+    dev: true
 
   /jest-serializer/27.4.0:
     resolution: {integrity: sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==}
@@ -15863,6 +16228,7 @@ packages:
       graceful-fs: 4.2.9
       is-ci: 2.0.0
       micromatch: 4.0.4
+    dev: true
 
   /jest-util/27.4.2:
     resolution: {integrity: sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==}
@@ -15905,6 +16271,7 @@ packages:
       '@types/node': 17.0.8
       merge-stream: 2.0.0
       supports-color: 7.2.0
+    dev: true
 
   /jest-worker/27.4.6:
     resolution: {integrity: sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==}
@@ -15964,19 +16331,13 @@ packages:
     hasBin: true
     dependencies:
       argparse: 2.0.1
-    dev: false
 
   /jsbn/0.1.1:
     resolution: {integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM=}
     dev: false
 
-  /jsdoc-type-pratt-parser/1.1.1:
-    resolution: {integrity: sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==}
-    engines: {node: '>=12.0.0'}
-    dev: true
-
-  /jsdoc-type-pratt-parser/1.2.0:
-    resolution: {integrity: sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==}
+  /jsdoc-type-pratt-parser/2.2.2:
+    resolution: {integrity: sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==}
     engines: {node: '>=12.0.0'}
     dev: true
 
@@ -16561,10 +16922,6 @@ packages:
     resolution: {integrity: sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=}
     dev: true
 
-  /lodash.truncate/4.4.2:
-    resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=}
-    dev: true
-
   /lodash.uniq/4.5.0:
     resolution: {integrity: sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=}
 
@@ -16752,7 +17109,7 @@ packages:
 
   /md5-es/1.8.2:
     resolution: {integrity: sha512-LKq5jmKMhJYhsBFUh2w+J3C4bMiC5uQie/UYJ429UATmMnFr6iANO2uQq5HXAZSIupGp0WO2mH3sNfxR4XO40Q==}
-    dev: false
+    dev: true
 
   /md5.js/1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
@@ -17165,6 +17522,7 @@ packages:
 
   /nice-try/1.0.5:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+    dev: true
 
   /nise/4.1.0:
     resolution: {integrity: sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==}
@@ -17352,6 +17710,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       path-key: 2.0.1
+    dev: true
 
   /npm-run-path/4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
@@ -17663,6 +18022,7 @@ packages:
   /p-finally/1.0.0:
     resolution: {integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=}
     engines: {node: '>=4'}
+    dev: true
 
   /p-limit/1.3.0:
     resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
@@ -17683,6 +18043,13 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
+  /p-limit/4.0.0:
+    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      yocto-queue: 1.0.0
+    dev: false
+
   /p-locate/2.0.0:
     resolution: {integrity: sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=}
     engines: {node: '>=4'}
@@ -17885,6 +18252,7 @@ packages:
   /path-key/2.0.1:
     resolution: {integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=}
     engines: {node: '>=4'}
+    dev: true
 
   /path-key/3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
@@ -18750,6 +19118,7 @@ packages:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
+    dev: true
 
   /pumpify/1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
@@ -19101,7 +19470,7 @@ packages:
     engines: {node: '>=8.10.0'}
     hasBin: true
     dependencies:
-      '@babel/core': 7.16.0
+      '@babel/core': 7.16.7
       '@babel/generator': 7.16.7
       '@babel/runtime': 7.16.7
       ast-types: 0.14.2
@@ -19448,7 +19817,6 @@ packages:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       react-router: 6.2.1_react@17.0.2
-    dev: true
 
   /react-router-dom/6.2.1_react@17.0.2:
     resolution: {integrity: sha512-I6Zax+/TH/cZMDpj3/4Fl2eaNdcvoxxHoH1tYOREsQ22OKDYofGebrNm6CTPUcvLvZm63NL/vzCYdjf9CUhqmA==}
@@ -19486,7 +19854,6 @@ packages:
     dependencies:
       history: 5.2.0
       react: 17.0.2
-    dev: true
 
   /react-shallow-renderer/16.14.1:
     resolution: {integrity: sha512-rkIMcQi01/+kxiTE9D3fdS959U1g7gs+/rborw++42m1O9FAQiNI/UNRZExVUoAOprn4umcXf+pFRou8i4zuBg==}
@@ -19522,7 +19889,7 @@ packages:
       react: '>= 16.8.0'
       react-dom: '>= 16.8.0'
     dependencies:
-      '@babel/runtime': 7.16.3
+      '@babel/runtime': 7.16.7
       prop-types: 15.7.2
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
@@ -20561,6 +20928,7 @@ packages:
   /rsvp/4.8.5:
     resolution: {integrity: sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==}
     engines: {node: 6.* || >= 7.*}
+    dev: true
 
   /rtlcss/2.6.2:
     resolution: {integrity: sha512-06LFAr+GAPo+BvaynsXRfoYTJvSaWRyOhURCQ7aeI1MKph9meM222F+Zkt3bDamyHHJuGi3VPtiRkpyswmQbGA==}
@@ -20647,6 +21015,7 @@ packages:
       micromatch: 3.1.10
       minimist: 1.2.5
       walker: 1.0.8
+    dev: true
 
   /sass-loader/12.4.0_sass@1.38.1+webpack@5.65.0:
     resolution: {integrity: sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==}
@@ -20943,6 +21312,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       shebang-regex: 1.0.0
+    dev: true
 
   /shebang-command/2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
@@ -20953,6 +21323,7 @@ packages:
   /shebang-regex/1.0.0:
     resolution: {integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /shebang-regex/3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
@@ -21063,15 +21434,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /slice-ansi/4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
   /snapdragon-node/2.1.1:
     resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
     engines: {node: '>=0.10.0'}
@@ -21138,9 +21500,6 @@ packages:
     resolution: {integrity: sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=}
     dev: false
 
-  /source-list-map/2.0.1:
-    resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
-
   /source-map-js/0.6.2:
     resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==}
     engines: {node: '>=0.10.0'}
@@ -21536,6 +21895,7 @@ packages:
   /strip-eof/1.0.0:
     resolution: {integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /strip-final-newline/2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
@@ -21771,17 +22131,6 @@ packages:
     resolution: {integrity: sha512-40pEZ2mhjaZzK0BnI+QGNjJO8UYx9pP5v7BGe17SORTO0OEuuaAwQTkAp8whcZvqon44wKFOikD+Al11K3JICQ==}
     dev: false
 
-  /table/6.8.0:
-    resolution: {integrity: sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==}
-    engines: {node: '>=10.0.0'}
-    dependencies:
-      ajv: 8.8.2
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /tannin/1.2.0:
     resolution: {integrity: sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA==}
     dependencies:
@@ -22956,13 +23305,6 @@ packages:
       source-map: 0.5.7
     dev: false
 
-  /webpack-sources/2.3.1:
-    resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      source-list-map: 2.0.1
-      source-map: 0.6.1
-
   /webpack-sources/3.2.2:
     resolution: {integrity: sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==}
     engines: {node: '>=10.13.0'}
@@ -23399,6 +23741,11 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
+  /yocto-queue/1.0.0:
+    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
+    engines: {node: '>=12.20'}
+    dev: false
+
   /zwitch/1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
     dev: true
@@ -23417,7 +23764,7 @@ packages:
       - encoding
     dev: false
 
-  github.com/sveltejs/eslint-config/8a67624e4080bd7997606eb34981aa3346bc8de2_0ca1a0e6c61895213d3918b4d67bc4f3:
+  github.com/sveltejs/eslint-config/8a67624e4080bd7997606eb34981aa3346bc8de2_948a3e55fb7525b40c6fc4d3c0529949:
     resolution: {tarball: https://codeload.github.com/sveltejs/eslint-config/tar.gz/8a67624e4080bd7997606eb34981aa3346bc8de2}
     id: github.com/sveltejs/eslint-config/8a67624e4080bd7997606eb34981aa3346bc8de2
     name: '@sveltejs/eslint-config'
@@ -23431,8 +23778,8 @@ packages:
       eslint-plugin-svelte3: '>= 2'
       typescript: '>= 3'
     dependencies:
-      '@typescript-eslint/eslint-plugin': 4.33.0_8c654464cf7de6904a251c0e456613ed
-      '@typescript-eslint/parser': 4.33.0_typescript@4.3.5
+      '@typescript-eslint/eslint-plugin': 5.10.2_9b53d4b455d21bf3af38fdac900301d2
+      '@typescript-eslint/parser': 5.10.2_typescript@4.3.5
       eslint-plugin-import: 2.25.4
       eslint-plugin-svelte3: 3.2.1_svelte@3.42.4
       typescript: 4.3.5
diff --git a/projects/github-actions/repo-gardening/CHANGELOG.md b/projects/github-actions/repo-gardening/CHANGELOG.md
index bc9917a47b6fe..1b1a29425dfbf 100644
--- a/projects/github-actions/repo-gardening/CHANGELOG.md
+++ b/projects/github-actions/repo-gardening/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2022-02-01
+### Changed
+- General: update required node version to v16.13.2
+- Updated package dependencies
+
 ## [2.0.0] - 2021-11-02
 ### Added
 - Automatically add the RNA label to PRs.
@@ -74,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
+[2.0.1]: https://github.com/Automattic/action-repo-gardening/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/Automattic/action-repo-gardening/compare/v1.4.0...v2.0.0
 [1.4.0]: https://github.com/Automattic/action-repo-gardening/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/Automattic/action-repo-gardening/compare/v1.2.2...v1.3.0
diff --git a/projects/github-actions/repo-gardening/changelog/update-min-pnpm-version b/projects/github-actions/repo-gardening/changelog/update-min-pnpm-version
deleted file mode 100644
index d824134990470..0000000000000
--- a/projects/github-actions/repo-gardening/changelog/update-min-pnpm-version
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update minimum pnpm version.
-
-
diff --git a/projects/github-actions/repo-gardening/changelog/update-node-version-16132 b/projects/github-actions/repo-gardening/changelog/update-node-version-16132
deleted file mode 100644
index feb2fb77ea11d..0000000000000
--- a/projects/github-actions/repo-gardening/changelog/update-node-version-16132
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: update required node version to v16.13.2
diff --git a/projects/github-actions/repo-gardening/changelog/update-project-scripts-no-install b/projects/github-actions/repo-gardening/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/github-actions/repo-gardening/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/github-actions/repo-gardening/package.json b/projects/github-actions/repo-gardening/package.json
index 28e266883a6f6..54455116d02e1 100644
--- a/projects/github-actions/repo-gardening/package.json
+++ b/projects/github-actions/repo-gardening/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "repo-gardening",
-	"version": "2.0.1-alpha",
+	"version": "2.0.1",
 	"description": "Manage PR and issues in your Open Source project (automate labelling, milestones, feedback to PR authors, ...)",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/analytics/CHANGELOG.md b/projects/js-packages/analytics/CHANGELOG.md
index 9267e052e08d6..0aef61d7172e6 100644
--- a/projects/js-packages/analytics/CHANGELOG.md
+++ b/projects/js-packages/analytics/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Analytics package releases.
 
+## 0.1.7 - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## 0.1.6 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/analytics/changelog/update-project-scripts-no-install b/projects/js-packages/analytics/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/analytics/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/analytics/package.json b/projects/js-packages/analytics/package.json
index ba8ce48d09e64..0879adc0c1110 100644
--- a/projects/js-packages/analytics/package.json
+++ b/projects/js-packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-analytics",
-	"version": "0.1.7-alpha",
+	"version": "0.1.7",
 	"description": "Jetpack Analytics Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/projects/js-packages/api/CHANGELOG.md b/projects/js-packages/api/CHANGELOG.md
index 1a4cf3db5e170..e0f5930d95e07 100644
--- a/projects/js-packages/api/CHANGELOG.md
+++ b/projects/js-packages/api/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## 0.8.3 - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## 0.8.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/github-actions/repo-gardening/changelog/renovate-node-fetch-2.x b/projects/js-packages/api/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/github-actions/repo-gardening/changelog/renovate-node-fetch-2.x
rename to projects/js-packages/api/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/api/changelog/update-project-scripts-no-install b/projects/js-packages/api/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/api/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
index e2f87b6a37c1e..0ee6411826867 100644
--- a/projects/js-packages/api/package.json
+++ b/projects/js-packages/api/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "@automattic/jetpack-api",
-	"version": "0.8.3-alpha",
+	"version": "0.8.4-alpha",
 	"description": "Jetpack Api Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@wordpress/url": "3.3.1",
-		"@automattic/jetpack-config": "workspace:^0.1.3-alpha",
+		"@wordpress/url": "3.4.0",
+		"@automattic/jetpack-config": "workspace:^0.1.3",
 		"lodash": "4.17.21"
 	},
 	"devDependencies": {
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md b/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md
index 067ddb0158fe1..b70250ef6aece 100644
--- a/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md
+++ b/projects/js-packages/babel-plugin-replace-textdomain/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.0.1] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -18,5 +22,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release.
 - Replace missing domains too.
 
+[1.0.2]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/Automattic/babel-plugin-replace-textdomain/compare/v0.1.0...v1.0.0
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/add-fancy-eslint-ignore b/projects/js-packages/babel-plugin-replace-textdomain/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/babel-plugin-replace-textdomain/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/changelog/update-project-scripts-no-install b/projects/js-packages/babel-plugin-replace-textdomain/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/babel-plugin-replace-textdomain/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/babel-plugin-replace-textdomain/package.json b/projects/js-packages/babel-plugin-replace-textdomain/package.json
index 6faa6a620b6e2..5b39d507a58a1 100644
--- a/projects/js-packages/babel-plugin-replace-textdomain/package.json
+++ b/projects/js-packages/babel-plugin-replace-textdomain/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/babel-plugin-replace-textdomain",
-	"version": "1.0.2-alpha",
+	"version": "1.0.2",
 	"description": "A Babel plugin to replace the textdomain in gettext-style function calls.",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/projects/js-packages/base-styles/CHANGELOG.md b/projects/js-packages/base-styles/CHANGELOG.md
index da2788a7e9337..37fc66fe6190d 100644
--- a/projects/js-packages/base-styles/CHANGELOG.md
+++ b/projects/js-packages/base-styles/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.7] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [0.1.6] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -44,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Use Node 16.7.0 in tooling. This shouldn't change the behavior of the code itself.
 
+[0.1.7]: https://github.com/Automattic/jetpack-base-styles/compare/0.1.6...0.1.7
 [0.1.6]: https://github.com/Automattic/jetpack-base-styles/compare/0.1.5...0.1.6
 [0.1.5]: https://github.com/Automattic/jetpack-base-styles/compare/0.1.4...0.1.5
 [0.1.4]: https://github.com/Automattic/jetpack-base-styles/compare/0.1.3...0.1.4
diff --git a/projects/js-packages/eslint-config-target-es/changelog/renovate-mdn-browser-compat-data-4.x b/projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/eslint-config-target-es/changelog/renovate-mdn-browser-compat-data-4.x
rename to projects/js-packages/base-styles/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/base-styles/changelog/update-project-scripts-no-install b/projects/js-packages/base-styles/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/base-styles/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/base-styles/package.json b/projects/js-packages/base-styles/package.json
index 15b9f35e924df..96dbfa7ad8b9d 100644
--- a/projects/js-packages/base-styles/package.json
+++ b/projects/js-packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-base-styles",
-	"version": "0.1.7-alpha",
+	"version": "0.1.8-alpha",
 	"description": "Jetpack components base styles",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -19,7 +19,7 @@
 		"build-production-js": "echo 'Not implemented."
 	},
 	"devDependencies": {
-		"@wordpress/base-styles": "4.0.4"
+		"@wordpress/base-styles": "4.1.0"
 	},
 	"engines": {
 		"node": "^14.18.3 || ^16.13.2",
diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
index 2c9a1a89dbfb2..3cfb02d81f27f 100644
--- a/projects/js-packages/components/CHANGELOG.md
+++ b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## 0.10.4 - 2022-02-02
+### Added
+- Re-organize stories of js-packages components by project and package name
+
+### Changed
+- RNA: Improve layout structure with Container and Col
+
+## 0.10.3 - 2022-01-25
+### Changed
+- Do not style header elements from AdminSection component
+
 ## 0.10.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/components/changelog/add-fancy-eslint-ignore b/projects/js-packages/components/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/components/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/eslint-config-target-es/changelog/renovate-mdn-browser-compat-data-4.x#2 b/projects/js-packages/components/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/eslint-config-target-es/changelog/renovate-mdn-browser-compat-data-4.x#2
rename to projects/js-packages/components/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/partner-coupon/changelog/update-connection-enforce-initial-state b/projects/js-packages/components/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/partner-coupon/changelog/update-connection-enforce-initial-state
rename to projects/js-packages/components/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/components/changelog/update-connection-section-my-jetpack-styles b/projects/js-packages/components/changelog/update-connection-section-my-jetpack-styles
deleted file mode 100644
index 476dc7f8dd0e9..0000000000000
--- a/projects/js-packages/components/changelog/update-connection-section-my-jetpack-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Do not style header elements from AdminSection component
diff --git a/projects/js-packages/components/changelog/update-project-scripts-no-install b/projects/js-packages/components/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/components/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/components/components/action-button/stories/index.jsx b/projects/js-packages/components/components/action-button/stories/index.jsx
index ccfb95d1ef4f4..6df24feab04af 100644
--- a/projects/js-packages/components/components/action-button/stories/index.jsx
+++ b/projects/js-packages/components/components/action-button/stories/index.jsx
@@ -6,7 +6,7 @@ import ActionButton from '../index.jsx';
 import { action } from '@storybook/addon-actions';
 
 export default {
-	title: 'Playground/Action Button',
+	title: 'JS Packages/Components/Action Button',
 	component: ActionButton,
 	// TODO: Storybook Actions are not working. See https://github.com/storybookjs/storybook/issues/7215
 	argTypes: {
diff --git a/projects/js-packages/components/components/admin-page/footer.jsx b/projects/js-packages/components/components/admin-page/footer.jsx
deleted file mode 100644
index cb130d487295f..0000000000000
--- a/projects/js-packages/components/components/admin-page/footer.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * External dependencies
- */
-import React from 'react';
-import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
-
-/**
- * Internal dependencies
- */
-import styles from './style.module.scss';
-import JetpackFooter from '../jetpack-footer';
-import Row from '../layout/row';
-import Container from '../layout/container';
-import Col from '../layout/col';
-
-/**
- * Footer for the AdminPage component
- *
- * @param {object} props - Component properties.
- * @returns {React.Component} AdminPage component.
- */
-const AdminPageFooter = props => {
-	const { moduleName, a8cLogoHref } = props;
-
-	return (
-		<div className={ styles[ 'jp-admin-page-section' ] }>
-			<Container>
-				<Row>
-					<Col lg={ 12 } md={ 8 } sm={ 4 }>
-						<JetpackFooter moduleName={ moduleName } a8cLogoHref={ a8cLogoHref } />
-					</Col>
-				</Row>
-			</Container>
-		</div>
-	);
-};
-
-AdminPageFooter.defaultProps = {
-	a8cLogoHref: 'https://jetpack.com',
-	moduleName: __( 'Jetpack', 'jetpack' ),
-};
-
-AdminPageFooter.propTypes = {
-	/** Link for 'An Automattic Airline' in the footer. */
-	a8cLogoHref: PropTypes.string,
-	/** Name of the module, e.g. 'Jetpack Search' that will be displayed in the footer. */
-	moduleName: PropTypes.string,
-};
-
-export default AdminPageFooter;
diff --git a/projects/js-packages/components/components/admin-page/header.jsx b/projects/js-packages/components/components/admin-page/header.jsx
deleted file mode 100644
index 5d23d46f13f9c..0000000000000
--- a/projects/js-packages/components/components/admin-page/header.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * External dependencies
- */
-import React from 'react';
-
-/**
- * Internal dependencies
- */
-import styles from './style.module.scss';
-import JetpackLogo from '../jetpack-logo';
-import Row from '../layout/row';
-import Container from '../layout/container';
-import Col from '../layout/col';
-
-/**
- * Header for the AdminPage component
- *
- * @returns {React.Component} AdminPage component.
- */
-const AdminPageHeader = () => (
-	<div className={ styles[ 'jp-admin-page-section' ] }>
-		<Container>
-			<Row>
-				<Col lg={ 12 } md={ 8 } sm={ 4 }>
-					<JetpackLogo />
-				</Col>
-			</Row>
-		</Container>
-	</div>
-);
-
-export default AdminPageHeader;
diff --git a/projects/js-packages/components/components/admin-page/index.jsx b/projects/js-packages/components/components/admin-page/index.jsx
index 865a0353ed93f..10e770a7561cb 100644
--- a/projects/js-packages/components/components/admin-page/index.jsx
+++ b/projects/js-packages/components/components/admin-page/index.jsx
@@ -9,8 +9,10 @@ import PropTypes from 'prop-types';
  * Internal dependencies
  */
 import styles from './style.module.scss';
-import AdminPageHeader from './header';
-import AdminPageFooter from './footer';
+import JetpackFooter from '../jetpack-footer';
+import JetpackLogo from '../jetpack-logo';
+import Container from '../layout/container';
+import Col from '../layout/col';
 
 /**
  * This is the base structure for any admin page. It comes with Header and Footer.
@@ -24,10 +26,24 @@ const AdminPage = props => {
 	const { children, moduleName, a8cLogoHref, showHeader, showFooter } = props;
 
 	return (
-		<div className={ styles[ 'jp-admin-page' ] }>
-			{ showHeader && <AdminPageHeader /> }
-			{ children }
-			{ showFooter && <AdminPageFooter moduleName={ moduleName } a8cLogoHref={ a8cLogoHref } /> }
+		<div className={ styles[ 'admin-page' ] }>
+			{ showHeader && (
+				<Container horizontalSpacing={ 5 }>
+					<Col>
+						<JetpackLogo />
+					</Col>
+				</Container>
+			) }
+			<Container fluid horizontalSpacing={ 0 }>
+				<Col>{ children }</Col>
+			</Container>
+			{ showFooter && (
+				<Container horizontalSpacing={ 5 }>
+					<Col>
+						<JetpackFooter moduleName={ moduleName } a8cLogoHref={ a8cLogoHref } />
+					</Col>
+				</Container>
+			) }
 		</div>
 	);
 };
diff --git a/projects/js-packages/components/components/admin-page/stories/index.jsx b/projects/js-packages/components/components/admin-page/stories/index.jsx
index 3e9ee09d538b7..c57f8b46b15fb 100644
--- a/projects/js-packages/components/components/admin-page/stories/index.jsx
+++ b/projects/js-packages/components/components/admin-page/stories/index.jsx
@@ -5,7 +5,7 @@ import React from 'react';
 import AdminPage from '../index.jsx';
 
 export default {
-	title: 'Playground/Admin Page',
+	title: 'JS Packages/Components/Admin Page',
 	component: AdminPage,
 };
 
diff --git a/projects/js-packages/components/components/admin-page/style.module.scss b/projects/js-packages/components/components/admin-page/style.module.scss
index 141e917c78f0d..72aa0ab6a900e 100644
--- a/projects/js-packages/components/components/admin-page/style.module.scss
+++ b/projects/js-packages/components/components/admin-page/style.module.scss
@@ -1,10 +1,8 @@
-@import '@automattic/jetpack-base-styles/style';
-
-.jp-admin-page {
+.admin-page {
 	margin-left: -20px; // to neutralize the padding of #wpcontent.
-}
+	background-color: var(--jp-white);
 
-.jp-admin-page-section {
-	padding: 40px 0px;
-	background-color: white;
+	@media (max-width: 782px) {
+		margin-left: -10px; // to neutralize the padding of #wpcontent.
+	}
 }
diff --git a/projects/js-packages/components/components/admin-section/basic/index.jsx b/projects/js-packages/components/components/admin-section/basic/index.jsx
index f107f45dbd9a3..03efbc2ef6dd1 100644
--- a/projects/js-packages/components/components/admin-section/basic/index.jsx
+++ b/projects/js-packages/components/components/admin-section/basic/index.jsx
@@ -7,7 +7,6 @@ import React from 'react';
  * Internal dependencies
  */
 import styles from './style.module.scss';
-import Container from '../../layout/container';
 
 /**
  * This is the wrapper component to build sections within your admin page.
@@ -17,11 +16,7 @@ import Container from '../../layout/container';
  */
 const AdminSection = props => {
 	const { children } = props;
-	return (
-		<div className={ styles[ 'jp-admin-section' ] }>
-			<Container>{ children }</Container>
-		</div>
-	);
+	return <div className={ styles.section }>{ children }</div>;
 };
 
 export default AdminSection;
diff --git a/projects/js-packages/components/components/admin-section/basic/style.module.scss b/projects/js-packages/components/components/admin-section/basic/style.module.scss
index cbe5d2d6f1866..b31bf1adb230b 100644
--- a/projects/js-packages/components/components/admin-section/basic/style.module.scss
+++ b/projects/js-packages/components/components/admin-section/basic/style.module.scss
@@ -1,6 +1,3 @@
-
-.jp-admin-section {
-	padding: 64px 0px;
-	background-color: white;
-
+.section {
+	background-color: var(--jp-white);
 }
diff --git a/projects/js-packages/components/components/admin-section/hero/index.jsx b/projects/js-packages/components/components/admin-section/hero/index.jsx
index e7c46fb5e5749..adc642f0e7123 100644
--- a/projects/js-packages/components/components/admin-section/hero/index.jsx
+++ b/projects/js-packages/components/components/admin-section/hero/index.jsx
@@ -7,7 +7,6 @@ import React from 'react';
  * Internal dependencies
  */
 import styles from './style.module.scss';
-import Container from '../../layout/container';
 
 /**
  * The wrapper component for a Hero Section to be used in admin pages.
@@ -17,11 +16,7 @@ import Container from '../../layout/container';
  */
 const AdminSectionHero = props => {
 	const { children } = props;
-	return (
-		<div className={ styles[ 'jp-admin-section-hero' ] }>
-			<Container>{ children }</Container>
-		</div>
-	);
+	return <div className={ styles[ 'section-hero' ] }>{ children }</div>;
 };
 
 export default AdminSectionHero;
diff --git a/projects/js-packages/components/components/admin-section/hero/style.module.scss b/projects/js-packages/components/components/admin-section/hero/style.module.scss
index 6eb3fc404c2ee..65c3200b871a5 100644
--- a/projects/js-packages/components/components/admin-section/hero/style.module.scss
+++ b/projects/js-packages/components/components/admin-section/hero/style.module.scss
@@ -1,11 +1,3 @@
-@import '@automattic/jetpack-base-styles/style';
-
-.jp-admin-section-hero {
-	padding: 48px 0px 64px 0px;
+.section-hero {
 	background: var( --jp-white-off );
-
-	h1, h2, h3, h4, h5, h6 {
-		margin-top: 0px;
-		line-height: 1.2;
-	}
 }
diff --git a/projects/js-packages/components/components/admin-section/stories/index.jsx b/projects/js-packages/components/components/admin-section/stories/index.jsx
index a5cd28c1f377f..db10c3bd11ad1 100644
--- a/projects/js-packages/components/components/admin-section/stories/index.jsx
+++ b/projects/js-packages/components/components/admin-section/stories/index.jsx
@@ -6,30 +6,30 @@ import AdminSection from '../basic';
 import AdminSectionHero from '../hero';
 import AdminPage from '../../admin-page';
 import Col from '../../layout/col';
-import Row from '../../layout/row';
+import Container from '../../layout/container';
 
 export default {
-	title: 'Playground/Admin Sections',
+	title: 'JS Packages/Components/Admin Sections',
 };
 
 // Export additional stories using pre-defined values
 const Template = () => (
 	<AdminPage>
 		<AdminSectionHero>
-			<Row>
+			<Container>
 				<Col lg={ 12 } md={ 8 } sm={ 4 }>
 					<h1>Sample Hero section</h1>
 					<p>This is a sample Hero section</p>
 				</Col>
-			</Row>
+			</Container>
 		</AdminSectionHero>
 		<AdminSection>
-			<Row>
+			<Container>
 				<Col lg={ 12 } md={ 8 } sm={ 4 }>
 					<h2>Sample Section</h2>
 					<p>This is a sample section</p>
 				</Col>
-			</Row>
+			</Container>
 		</AdminSection>
 	</AdminPage>
 );
@@ -39,22 +39,22 @@ export const _default = Template.bind( {} );
 
 export const onlyBasic = () => (
 	<AdminSection>
-		<Row>
+		<Container>
 			<Col lg={ 12 } md={ 8 } sm={ 4 }>
 				<h2>Sample Section</h2>
 				<p>This is a sample section</p>
 			</Col>
-		</Row>
+		</Container>
 	</AdminSection>
 );
 
 export const onlyHero = () => (
 	<AdminSectionHero>
-		<Row>
+		<Container>
 			<Col lg={ 12 } md={ 8 } sm={ 4 }>
 				<h2>Sample Hero Section</h2>
 				<p>This is a sample Hero section</p>
 			</Col>
-		</Row>
+		</Container>
 	</AdminSectionHero>
 );
diff --git a/projects/js-packages/components/components/automattic-byline-logo/stories/index.jsx b/projects/js-packages/components/components/automattic-byline-logo/stories/index.jsx
index 8e7af04464380..6fbb1b107bda3 100644
--- a/projects/js-packages/components/components/automattic-byline-logo/stories/index.jsx
+++ b/projects/js-packages/components/components/automattic-byline-logo/stories/index.jsx
@@ -11,7 +11,7 @@ import React from 'react';
 import AutomatticBylineLogo from '../index.jsx';
 
 export default {
-	title: 'Playground/Automattic Byline Logo',
+	title: 'JS Packages/Components/Automattic Byline Logo',
 	component: AutomatticBylineLogo,
 };
 
diff --git a/projects/js-packages/components/components/decorative-card/stories/index.jsx b/projects/js-packages/components/components/decorative-card/stories/index.jsx
index 6cd2d1a31310f..68f2cf9dfe4d2 100644
--- a/projects/js-packages/components/components/decorative-card/stories/index.jsx
+++ b/projects/js-packages/components/components/decorative-card/stories/index.jsx
@@ -5,7 +5,7 @@ import React from 'react';
 import DecorativeCard from '../index.jsx';
 
 export default {
-	title: 'Playground/Decorative Card',
+	title: 'JS Packages/Components/Decorative Card',
 	component: DecorativeCard,
 };
 
diff --git a/projects/js-packages/components/components/jetpack-footer/stories/index.jsx b/projects/js-packages/components/components/jetpack-footer/stories/index.jsx
index b94fbe4946461..7d4ec6664e2bc 100644
--- a/projects/js-packages/components/components/jetpack-footer/stories/index.jsx
+++ b/projects/js-packages/components/components/jetpack-footer/stories/index.jsx
@@ -10,7 +10,7 @@ import React from 'react';
 import JetpackFooter from '../index.jsx';
 
 export default {
-	title: 'Playground/Jetpack Footer',
+	title: 'JS Packages/Components/Jetpack Footer',
 	component: JetpackFooter,
 };
 
diff --git a/projects/js-packages/components/components/jetpack-logo/stories/index.jsx b/projects/js-packages/components/components/jetpack-logo/stories/index.jsx
index eb180b04e09d6..142fff399ae1b 100644
--- a/projects/js-packages/components/components/jetpack-logo/stories/index.jsx
+++ b/projects/js-packages/components/components/jetpack-logo/stories/index.jsx
@@ -10,7 +10,7 @@ import React from 'react';
 import JetpackLogo from '../index.jsx';
 
 export default {
-	title: 'Playground/Jetpack Logo',
+	title: 'JS Packages/Components/Jetpack Logo',
 	component: JetpackLogo,
 	argTypes: {
 		logoColor: { control: 'color' },
diff --git a/projects/js-packages/components/components/layout/col/index.jsx b/projects/js-packages/components/components/layout/col/index.jsx
index 07d9fccf85abb..93580d4b685c7 100644
--- a/projects/js-packages/components/components/layout/col/index.jsx
+++ b/projects/js-packages/components/components/layout/col/index.jsx
@@ -17,28 +17,29 @@ import styles from './style.module.scss';
  * @returns {React.Component} Col component.
  */
 const Col = props => {
-	const { children, sm, md, lg } = props;
-	const small = Number.isInteger( sm ) ? sm : 0;
-	const medium = Number.isInteger( md ) ? md : 0;
-	const large = Number.isInteger( lg ) ? lg : 0;
-	const minimum = [ small, medium, large ].reduce( ( prev, curr ) =>
-		curr > 0 && curr < prev ? curr : prev
-	);
+	const { children, className } = props;
 
-	const className = classnames(
-		small > 0 ? styles[ 'sm-col-span-' + small ] : styles[ 'sm-col-span-' + minimum ],
-		medium > 0 ? styles[ 'md-col-span-' + medium ] : styles[ 'md-col-span-' + minimum ],
-		large > 0 ? styles[ 'lg-col-span-' + large ] : styles[ 'lg-col-span-' + minimum ]
-	);
-	return <div className={ className }>{ children }</div>;
+	const sm = Math.min( 4, props.sm ?? 4 ); // max of 4, if undefined = 4
+	const md = Math.min( 8, props.md ?? 8 ); // max of 8, if undefined = 8
+	const lg = Math.min( 12, props.lg ?? 12 ); // max of 12, if undefined = 12
+
+	const colClassName = classnames( className, {
+		[ styles[ `col-sm-${ sm }` ] ]: Number.isInteger( sm ),
+		[ styles[ `col-md-${ md }` ] ]: Number.isInteger( md ),
+		[ styles[ `col-lg-${ lg }` ] ]: Number.isInteger( lg ),
+	} );
+
+	return <div className={ colClassName }>{ children }</div>;
 };
 
 Col.proptypes = {
-	/** Colspan for small viewport. Needs to be an integer. Defaults to the smallest colspan informed. */
-	sm: PropTypes.number,
-	/** Colspan for medium viewport. Needs to be an integer. Defaults to the smallest colspan informed. */
+	/** Custom className to be inserted. */
+	className: PropTypes.string,
+	/** Colspan for small viewport. Needs to be an integer. */
+	sm: PropTypes.number.isRequired,
+	/** Colspan for medium viewport. Needs to be an integer. */
 	md: PropTypes.number,
-	/** Colspan for large viewport. Needs to be an integer. Defaults to the smallest colspan informed. */
+	/** Colspan for large viewport. Needs to be an integer. */
 	lg: PropTypes.number,
 };
 
diff --git a/projects/js-packages/components/components/layout/col/style.module.scss b/projects/js-packages/components/components/layout/col/style.module.scss
index 706ad07fc8959..558c50c0e1651 100644
--- a/projects/js-packages/components/components/layout/col/style.module.scss
+++ b/projects/js-packages/components/components/layout/col/style.module.scss
@@ -1,35 +1,20 @@
-@import '@automattic/jetpack-base-styles/style';
-
-@for $i from 1 through 4 {
-	.sm-col-span-#{$i} {
-		grid-column-end: span #{$i};
-	}
-}
-
-@include for-phone-up {
-	@for $i from 1 through 8 {
-		.md-col-span-#{$i} {
+@mixin cols($size, $columns) {
+	@for $i from 1 through $columns {
+		.col-#{$size}-#{$i} {
 			grid-column-end: span #{$i};
 		}
 	}
 }
 
-@include for-tablet-up {
-	@for $i from 1 through 12 {
-		.lg-col-span-#{$i} {
-			grid-column-end: span #{$i};
-		}
-	}
+@media ( min-width: 0px ) {
+	@include cols(sm, 4)
 }
 
-@include for-tablet-down {
-	.md-col-span-0 {
-		display: none;
-	}
+@media ( min-width: 600px ) {
+	@include cols(md, 8)
 }
 
-@include for-phone-down {
-	.sm-col-span-0 {
-		display: none;
-	}
+@media ( min-width: 960px ) {
+	@include cols(lg, 12)
 }
+
diff --git a/projects/js-packages/components/components/layout/container/index.jsx b/projects/js-packages/components/components/layout/container/index.jsx
index 221d769accb34..1c156f008e65e 100644
--- a/projects/js-packages/components/components/layout/container/index.jsx
+++ b/projects/js-packages/components/components/layout/container/index.jsx
@@ -2,6 +2,8 @@
  * External dependencies
  */
 import React from 'react';
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
 
 /**
  * Internal dependencies
@@ -15,8 +17,43 @@ import styles from './style.module.scss';
  * @returns {React.Component} Container component.
  */
 const Container = props => {
-	const { children } = props;
-	return <div className={ styles[ 'jp-container' ] }>{ children }</div>;
+	const { children, fluid, className } = props;
+
+	const horizontalSpacing = `calc( var(--horizontal-spacing) * ${ props.horizontalSpacing } )`;
+	const horizontalGap = `calc( var(--horizontal-spacing) * ${ props.horizontalGap } )`;
+
+	const containerStyle = {
+		paddingTop: horizontalSpacing,
+		paddingBottom: horizontalSpacing,
+		rowGap: horizontalGap,
+	};
+
+	const containerClassName = classNames( className, styles.container, {
+		[ styles.fluid ]: fluid,
+	} );
+
+	return (
+		<div className={ containerClassName } style={ containerStyle }>
+			{ children }
+		</div>
+	);
+};
+
+Container.propTypes = {
+	/** Make container not having a max width. */
+	fluid: PropTypes.bool,
+	/** Custom className to be inserted. */
+	className: PropTypes.string,
+	/** Number of spacing (top / bottom), it gets mutiplied by 8px. Needs to be an integer */
+	horizontalSpacing: PropTypes.number,
+	/** Number of gap betwen rows, it gets multipled by 8px. Needs to be an integer */
+	horizontalGap: PropTypes.number,
+};
+
+Container.defaultProps = {
+	fluid: false,
+	horizontalGap: 1,
+	horizontalSpacing: 1,
 };
 
 export default Container;
diff --git a/projects/js-packages/components/components/layout/container/style.module.scss b/projects/js-packages/components/components/layout/container/style.module.scss
index d914ad02b4df0..9c983ee6939e2 100644
--- a/projects/js-packages/components/components/layout/container/style.module.scss
+++ b/projects/js-packages/components/components/layout/container/style.module.scss
@@ -1,7 +1,34 @@
-.jp-container {
-	display: flex;
-	align-items: center;
-	flex-wrap: wrap;
-	max-width: 1128px;
+@mixin container($columns, $width, $padding) {
+	@media ( min-width: #{$width} ) {
+		padding: 0 #{$padding};
+		grid-template-columns: repeat( #{$columns}, minmax(0, 1fr) );
+	}
+}
+
+.container {
+	--max-container-width: 1128px;
+
+	// vertical spacing
+	--vertical-gutter: 24px;
+	--vertical-spacing-sm: 16px;
+	--vertical-spacing-md: 18px;
+	--vertical-spacing-lg: 24px;
+
+	// horizontal spacing
+	--horizontal-spacing: 8px;
+
+	display: grid;
+	column-gap: var(--vertical-gutter);
+	max-width: var(--max-container-width);
 	margin: 0 auto;
+	width: 100%;
+
+	@include container( 4, 0px, var(--vertical-spacing-sm) );
+	@include container( 8, 600px, var(--vertical-spacing-md) );
+	@include container( 12, 960px, var(--vertical-spacing-lg) );
+
+	&.fluid {
+		max-width: none;
+		padding: unset;
+	}
 }
diff --git a/projects/js-packages/components/components/layout/row/index.jsx b/projects/js-packages/components/components/layout/row/index.jsx
deleted file mode 100644
index 9d8e1dec37c78..0000000000000
--- a/projects/js-packages/components/components/layout/row/index.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * External dependencies
- */
-import React from 'react';
-
-/**
- * Internal dependencies
- */
-import styles from './style.module.scss';
-
-/**
- * JP Row
- *
- * @param {object} props - Component properties.
- * @returns {React.Component} Row component.
- */
-const Row = props => {
-	const { children } = props;
-	return <div className={ styles[ 'jp-row' ] }>{ children }</div>;
-};
-
-export default Row;
diff --git a/projects/js-packages/components/components/layout/row/style.module.scss b/projects/js-packages/components/components/layout/row/style.module.scss
deleted file mode 100644
index 731a5e746b80b..0000000000000
--- a/projects/js-packages/components/components/layout/row/style.module.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import '@automattic/jetpack-base-styles/style';
-
-.jp-row {
-	display: grid;
-	grid-gap: 24px;
-	grid-template-columns: repeat( 4, 1fr );
-	width: 100%;
-	margin: 0 16px;
-
-	@include for-phone-up {
-		grid-template-columns: repeat( 8, 1fr );
-		margin: 0 18px;
-	}
-
-	@include for-tablet-up {
-		grid-template-columns: repeat( 12, 1fr );
-		max-width: 1128px;
-		margin: 0 24px;
-	}
-}
diff --git a/projects/js-packages/components/components/layout/stories/index.jsx b/projects/js-packages/components/components/layout/stories/index.jsx
new file mode 100644
index 0000000000000..f01aa78f264ad
--- /dev/null
+++ b/projects/js-packages/components/components/layout/stories/index.jsx
@@ -0,0 +1,81 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+
+/**
+ * Internal dependencies
+ */
+import Container from '../container';
+import Col from '../col';
+import styles from './styles.module.scss';
+
+const Layout = ( { items, fluid, horizontalGap, horizontalSpacing } ) => {
+	return (
+		<Container
+			className={ styles.container }
+			horizontalSpacing={ horizontalSpacing }
+			fluid={ fluid }
+			horizontalGap={ horizontalGap }
+		>
+			{ items.map( ( { sm, lg, md } ) => (
+				<Col sm={ sm } md={ md } lg={ lg } className={ styles.col }>
+					{ Number.isInteger( sm ) ? `sm=${ sm } ` : '' }
+					{ Number.isInteger( md ) ? `md=${ md } ` : '' }
+					{ Number.isInteger( lg ) ? `lg=${ lg } ` : '' }
+				</Col>
+			) ) }
+			<Col>
+				<Container fluid horizontalSpacing={ 0 } horizontalGap={ 1 }>
+					<Col className={ styles.col }>Composition Example</Col>
+					<Col className={ styles.col }>Composition Example</Col>
+				</Container>
+			</Col>
+		</Container>
+	);
+};
+
+export default {
+	title: 'JS Packages/Components/Layout',
+	component: Layout,
+};
+
+const Template = args => <Layout { ...args } />;
+export const Default = Template.bind( {} );
+Default.args = {
+	fluid: false,
+	horizontalSpacing: 10,
+	horizontalGap: 5,
+	items: [
+		{
+			sm: 2,
+			md: 5,
+			lg: 4,
+		},
+		{
+			sm: 2,
+			md: 3,
+			lg: 8,
+		},
+		{
+			sm: 2,
+			md: 3,
+			lg: 8,
+		},
+		{
+			sm: 2,
+			md: 5,
+			lg: 4,
+		},
+		{
+			sm: 2,
+			md: 5,
+			lg: 4,
+		},
+		{
+			sm: 2,
+			md: 3,
+			lg: 8,
+		},
+	],
+};
diff --git a/projects/js-packages/components/components/layout/stories/styles.module.scss b/projects/js-packages/components/components/layout/stories/styles.module.scss
new file mode 100644
index 0000000000000..5d02b35942615
--- /dev/null
+++ b/projects/js-packages/components/components/layout/stories/styles.module.scss
@@ -0,0 +1,10 @@
+.container {
+	background: var(--jp-gray-50);
+}
+
+.col {
+	padding: 20px;
+	background: var(--jp-gray-80);
+	font-size: 1rem;
+	color: var(--jp-white-off);
+}
diff --git a/projects/js-packages/components/components/pricing-card/stories/index.jsx b/projects/js-packages/components/components/pricing-card/stories/index.jsx
index 60a045429b2ed..da72e12e22e21 100644
--- a/projects/js-packages/components/components/pricing-card/stories/index.jsx
+++ b/projects/js-packages/components/components/pricing-card/stories/index.jsx
@@ -11,7 +11,7 @@ import { action } from '@storybook/addon-actions';
 import PricingCard from '../index.jsx';
 
 export default {
-	title: 'Playground/Pricing Card',
+	title: 'JS Packages/Components/Pricing Card',
 	component: PricingCard,
 	// TODO: Storybook Actions are not working. See https://github.com/storybookjs/storybook/issues/7215
 	argTypes: {
diff --git a/projects/js-packages/components/components/spinner/stories/index.jsx b/projects/js-packages/components/components/spinner/stories/index.jsx
index c8c0460e178a4..b344d5ff69859 100644
--- a/projects/js-packages/components/components/spinner/stories/index.jsx
+++ b/projects/js-packages/components/components/spinner/stories/index.jsx
@@ -10,7 +10,7 @@ import React from 'react';
 import Spinner from '../index.jsx';
 
 export default {
-	title: 'Playground/Spinner',
+	title: 'JS Packages/Components/Spinner',
 	component: Spinner,
 	argTypes: {
 		color: { control: 'color' },
diff --git a/projects/js-packages/components/index.jsx b/projects/js-packages/components/index.jsx
index dabd234c58852..493f150083452 100644
--- a/projects/js-packages/components/index.jsx
+++ b/projects/js-packages/components/index.jsx
@@ -27,6 +27,5 @@ export { default as AdminPage } from './components/admin-page';
 export { default as DecorativeCard } from './components/decorative-card';
 export { default as Col } from './components/layout/col';
 export { default as Container } from './components/layout/container';
-export { default as Row } from './components/layout/row';
 export { default as numberFormat } from './components/number-format';
 export { getUserLocale, cleanLocale } from './lib/locale';
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
index 62b79e88405cb..6ab65265c017c 100644
--- a/projects/js-packages/components/package.json
+++ b/projects/js-packages/components/package.json
@@ -1,21 +1,21 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.10.3-alpha",
+	"version": "0.10.5-alpha",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
 		"@automattic/format-currency": "1.0.0-alpha.0",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/date": "4.2.3",
-		"@wordpress/i18n": "4.2.4",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/date": "4.3.0",
+		"@wordpress/i18n": "4.3.0",
 		"classnames": "2.3.1",
 		"lodash": "4.17.21",
 		"prop-types": "^15.7.2"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-react": "7.16.0",
 		"jetpack-js-test-runner": "workspace:*",
diff --git a/projects/js-packages/config/CHANGELOG.md b/projects/js-packages/config/CHANGELOG.md
index 8b79d254eeb01..f333ab0a17f2a 100644
--- a/projects/js-packages/config/CHANGELOG.md
+++ b/projects/js-packages/config/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.3 - 2022-01-25
+### Added
+- Add missing dev dependency on `nyc` for code coverage.
+
 ## 0.1.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/config/changelog/update-project-scripts-no-install b/projects/js-packages/config/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/config/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/config/package.json b/projects/js-packages/config/package.json
index 113de6c088884..64d70ba21edc7 100644
--- a/projects/js-packages/config/package.json
+++ b/projects/js-packages/config/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-config",
-	"version": "0.1.3-alpha",
+	"version": "0.1.3",
 	"description": "Handles Jetpack global configuration shared across all packages",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -17,7 +17,8 @@
 		"test": "NODE_ENV=test NODE_PATH=tests:. js-test-runner --jsdom 'glob:./!(node_modules)/**/test/*.@(jsx|js)'"
 	},
 	"devDependencies": {
-		"jetpack-js-test-runner": "workspace:*"
+		"jetpack-js-test-runner": "workspace:*",
+		"nyc": "15.1.0"
 	},
 	"engines": {
 		"node": "^14.18.3 || ^16.13.2",
diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md
index 04b75bdc7e8fa..37fc27b086495 100644
--- a/projects/js-packages/connection/CHANGELOG.md
+++ b/projects/js-packages/connection/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 ### This is a list detailing changes for the Jetpack RNA Connection Component releases.
 
+## 0.15.0 - 2022-02-02
+### Added
+- Added user click tracking to disconnect dialog modal.
+
+### Changed
+- Updated package dependencies.
+
+### Fixed
+- Fix access to display_name property in connection status card.
+
+## 0.14.0 - 2022-01-25
+### Changed
+- Enforces the usage of initial state
+- Update h3 style for connection status card
+
+### Fixed
+- Fix Wrong spelling of propTypes in ConnectedPlugins
+- Make redirectUri property not be required in ConnectionStatusCard
+
 ## 0.13.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/connection/changelog/add-fancy-eslint-ignore b/projects/js-packages/connection/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/connection/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/connection/changelog/fix-redirectUri-connection-status-card b/projects/js-packages/connection/changelog/fix-redirectUri-connection-status-card
deleted file mode 100644
index 5939a4ff0c800..0000000000000
--- a/projects/js-packages/connection/changelog/fix-redirectUri-connection-status-card
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Make redirectUri property not be required in ConnectionStatusCard
diff --git a/projects/js-packages/storybook/changelog/renovate-babel-monorepo b/projects/js-packages/connection/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-babel-monorepo
rename to projects/js-packages/connection/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-09-28-16-11-44-715508 b/projects/js-packages/connection/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-09-28-16-11-44-715508
rename to projects/js-packages/connection/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/connection/changelog/update-connection-enforce-initial-state b/projects/js-packages/connection/changelog/update-connection-enforce-initial-state
deleted file mode 100644
index f169b8f8f7b87..0000000000000
--- a/projects/js-packages/connection/changelog/update-connection-enforce-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Enforces the usage of initial state
diff --git a/projects/js-packages/connection/changelog/update-connection-section-my-jetpack-styles b/projects/js-packages/connection/changelog/update-connection-section-my-jetpack-styles
deleted file mode 100644
index f73d2d7a6494e..0000000000000
--- a/projects/js-packages/connection/changelog/update-connection-section-my-jetpack-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Update h3 style for connection status card
diff --git a/projects/js-packages/connection/changelog/update-enforce-connection-initial-state b/projects/js-packages/connection/changelog/update-enforce-connection-initial-state
deleted file mode 100644
index f169b8f8f7b87..0000000000000
--- a/projects/js-packages/connection/changelog/update-enforce-connection-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Enforces the usage of initial state
diff --git a/projects/js-packages/connection/changelog/update-project-scripts-no-install b/projects/js-packages/connection/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/connection/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/connection/components/connected-plugins/index.jsx b/projects/js-packages/connection/components/connected-plugins/index.jsx
index d0408266fdaad..71a9ba54af894 100644
--- a/projects/js-packages/connection/components/connected-plugins/index.jsx
+++ b/projects/js-packages/connection/components/connected-plugins/index.jsx
@@ -64,7 +64,7 @@ const ConnectedPlugins = props => {
 	return null;
 };
 
-ConnectedPlugins.PropTypes = {
+ConnectedPlugins.propTypes = {
 	/** Plugins that are using the Jetpack connection. */
 	connectedPlugins: PropTypes.object,
 	/** Slug of the plugin that has initiated the disconnect. */
diff --git a/projects/js-packages/connection/components/connection-status-card/index.jsx b/projects/js-packages/connection/components/connection-status-card/index.jsx
index ebef16433caa8..36173d60060af 100644
--- a/projects/js-packages/connection/components/connection-status-card/index.jsx
+++ b/projects/js-packages/connection/components/connection-status-card/index.jsx
@@ -147,7 +147,8 @@ const ConnectionStatusCard = props => {
 
 				{ isUserConnected && (
 					<li className="jp-connection-status-card--list-item-success">
-						{ __( 'Logged in as', 'jetpack' ) } { userConnectionData?.display_name }
+						{ __( 'Logged in as', 'jetpack' ) }{ ' ' }
+						{ userConnectionData.currentUser?.wpcomUser?.display_name }
 					</li>
 				) }
 
diff --git a/projects/js-packages/connection/components/disconnect-dialog/index.jsx b/projects/js-packages/connection/components/disconnect-dialog/index.jsx
index 5ca75d6b5fbad..378f1e8520b28 100644
--- a/projects/js-packages/connection/components/disconnect-dialog/index.jsx
+++ b/projects/js-packages/connection/components/disconnect-dialog/index.jsx
@@ -220,6 +220,11 @@ const DisconnectDialog = props => {
 		[ setDisconnectError, setIsDisconnecting, pluginScreenDisconnectCallback, context, _disconnect ]
 	);
 
+	const trackModalClick = useCallback(
+		target => jetpackAnalytics.tracks.recordEvent( target, defaultTracksArgs ),
+		[ defaultTracksArgs ]
+	);
+
 	/**
 	 * Do we have the necessary data to be able to submit a survey?
 	 * Need to have the ID of the connected user and the ID of the connected site.
@@ -321,6 +326,7 @@ const DisconnectDialog = props => {
 					disconnectError={ disconnectError }
 					context={ context } // Where is the modal showing? ( most important for when it loads on the plugins page )
 					disconnectingPlugin={ disconnectingPlugin } // Which plugin is initiating the disconnect.
+					trackModalClick={ trackModalClick }
 				/>
 			);
 		} else if ( isDisconnected && ! isProvidingFeedback && ! isFeedbackProvided ) {
diff --git a/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx b/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
index b3f887a2f2048..f4a2ba72a353a 100644
--- a/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
+++ b/projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx
@@ -1,7 +1,7 @@
 /**
  * External Dependencies
  */
-import React from 'react';
+import React, { useCallback } from 'react';
 
 /**
  * Internal Dependencies
@@ -30,8 +30,29 @@ const StepDisconnect = props => {
 		disconnectingPlugin,
 		closeModal,
 		context,
+		trackModalClick,
 	} = props;
 
+	const trackLearnClick = useCallback(
+		() => trackModalClick( 'jetpack_disconnect_dialog_click_learn_about' ),
+		[ trackModalClick ]
+	);
+	const trackSupportClick = useCallback(
+		() => trackModalClick( 'jetpack_disconnect_dialog_click_support' ),
+		[ trackModalClick ]
+	);
+	const handleStayConnectedClick = useCallback( () => {
+		trackModalClick( 'jetpack_disconnect_dialog_click_stay_connected' );
+		closeModal();
+	}, [ trackModalClick, closeModal ] );
+	const handleDisconnectClick = useCallback(
+		e => {
+			trackModalClick( 'jetpack_disconnect_dialog_click_disconnect' );
+			onDisconnect( e );
+		},
+		[ trackModalClick, onDisconnect ]
+	);
+
 	/**
 	 * Render the disconnect button, allows for some variance based on context.
 	 *
@@ -50,7 +71,7 @@ const StepDisconnect = props => {
 			<Button
 				isPrimary
 				disabled={ isDisconnecting }
-				onClick={ onDisconnect }
+				onClick={ handleDisconnectClick }
 				className="jp-connection__disconnect-dialog__btn-disconnect"
 			>
 				{ buttonText }
@@ -109,6 +130,7 @@ const StepDisconnect = props => {
 											rel="noopener noreferrer"
 											target="_blank"
 											className="jp-connection__disconnect-dialog__link"
+											onClick={ trackLearnClick }
 										/>
 									),
 									jpSupportLink: (
@@ -117,6 +139,7 @@ const StepDisconnect = props => {
 											rel="noopener noreferrer"
 											target="_blank"
 											className="jp-connection__disconnect-dialog__link"
+											onClick={ trackSupportClick }
 										/>
 									),
 								}
@@ -127,7 +150,7 @@ const StepDisconnect = props => {
 						<Button
 							isPrimary
 							disabled={ isDisconnecting }
-							onClick={ closeModal }
+							onClick={ handleStayConnectedClick }
 							className="jp-connection__disconnect-dialog__btn-dismiss"
 						>
 							{ __( 'Stay connected', 'jetpack' ) }
@@ -162,6 +185,8 @@ StepDisconnect.propTypes = {
 	closeModal: PropTypes.func,
 	/** Where this modal is being rendered. */
 	context: PropTypes.string,
+	/** Callback tracks link/btn clicks */
+	trackModalClick: PropTypes.func,
 };
 
 export default StepDisconnect;
diff --git a/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx b/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
index f2d3591a3df9e..427671a692523 100644
--- a/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
+++ b/projects/js-packages/connection/components/disconnect-dialog/test/step-disconnect.jsx
@@ -16,8 +16,13 @@ describe( 'StepDisconnect', () => {
 		title: 'Test Title',
 		onDisconnect: spy(),
 		closeModal: spy(),
+		trackModalClick: spy(),
 	};
 
+	afterEach( () => {
+		testProps.trackModalClick.resetHistory();
+	} );
+
 	describe( 'Initially', () => {
 		const wrapper = shallow( <StepDisconnect { ...testProps } /> );
 
@@ -35,25 +40,66 @@ describe( 'StepDisconnect', () => {
 
 	describe( 'When the disconnect button is clicked', () => {
 		const wrapper = shallow( <StepDisconnect { ...testProps } /> );
-
-		wrapper
-			.find( '.jp-connection__disconnect-dialog__btn-disconnect' )
-			.simulate( 'click', { preventDefault: () => undefined } );
+		const disconnectButton = wrapper.find( '.jp-connection__disconnect-dialog__btn-disconnect' );
 
 		it( 'calls the disconnect callback', () => {
+			disconnectButton.simulate( 'click', { preventDefault: () => undefined } );
+
 			expect( testProps.onDisconnect.called ).to.be.true;
 		} );
+
+		it( 'calls the trackModalClick callback with jetpack_disconnect_dialog_click_disconnect', () => {
+			disconnectButton.simulate( 'click', { preventDefault: () => undefined } );
+
+			expect(
+				testProps.trackModalClick.calledOnceWith( 'jetpack_disconnect_dialog_click_disconnect' )
+			).to.be.true;
+		} );
 	} );
 
 	describe( 'When the dismiss button is clicked', () => {
 		const wrapper = shallow( <StepDisconnect { ...testProps } /> );
-
-		wrapper
-			.find( '.jp-connection__disconnect-dialog__btn-dismiss' )
-			.simulate( 'click', { preventDefault: () => undefined } );
+		const dismissBtn = wrapper.find( '.jp-connection__disconnect-dialog__btn-dismiss' );
 
 		it( 'calls the closeModal callback', () => {
+			dismissBtn.simulate( 'click', { preventDefault: () => undefined } );
+
 			expect( testProps.closeModal.called ).to.be.true;
 		} );
+
+		it( 'calls the trackModalClick callback with jetpack_disconnect_dialog_click_stay_connected', () => {
+			dismissBtn.simulate( 'click', { preventDefault: () => undefined } );
+
+			expect(
+				testProps.trackModalClick.calledOnceWith( 'jetpack_disconnect_dialog_click_stay_connected' )
+			).to.be.true;
+		} );
+	} );
+
+	describe( 'When help links are clicked', () => {
+		const trackEvents = [
+			'jetpack_disconnect_dialog_click_learn_about',
+			'jetpack_disconnect_dialog_click_support',
+		];
+		const wrapper = shallow( <StepDisconnect { ...testProps } /> );
+		const links = wrapper.find( '.jp-connection__disconnect-dialog__link' );
+		let trackedTotal = 0;
+
+		links.forEach( ( link, i ) => {
+			link.simulate( 'click', { preventDefault: () => undefined } );
+
+			const clickTrackValue = testProps.trackModalClick.getCall( i ).args[ 0 ];
+
+			it( `should track ${ clickTrackValue }`, async () => {
+				const valueIdx = trackEvents.indexOf( clickTrackValue );
+
+				expect( clickTrackValue ).to.equal( trackEvents[ valueIdx ] );
+				trackedTotal++;
+			} );
+		} );
+
+		it( `should track all ${ trackEvents.length } expected events`, () => {
+			expect( trackedTotal ).to.equal( trackEvents.length );
+		} );
 	} );
 } );
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
index de6b6324aa2a5..b28df673abba6 100644
--- a/projects/js-packages/connection/package.json
+++ b/projects/js-packages/connection/package.json
@@ -1,25 +1,25 @@
 {
 	"name": "@automattic/jetpack-connection",
-	"version": "0.14.0-alpha",
+	"version": "0.15.1-alpha",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@automattic/jetpack-analytics": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-config": "workspace:^0.1.3-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@wordpress/base-styles": "4.0.4",
+		"@automattic/jetpack-analytics": "workspace:^0.1.7",
+		"@automattic/jetpack-config": "workspace:^0.1.3",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@wordpress/base-styles": "4.1.0",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/element": "4.0.4",
-		"@wordpress/i18n": "4.2.4",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/element": "4.1.0",
+		"@wordpress/i18n": "4.3.0",
 		"lodash": "4.17.21",
 		"prop-types": "^15.7.2"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-react": "7.16.0",
 		"jetpack-js-test-runner": "workspace:*",
diff --git a/projects/js-packages/connection/state/selectors.jsx b/projects/js-packages/connection/state/selectors.jsx
index b52694205b123..8284700bfbfee 100644
--- a/projects/js-packages/connection/state/selectors.jsx
+++ b/projects/js-packages/connection/state/selectors.jsx
@@ -3,7 +3,7 @@ const connectionSelectors = {
 	/**
 	 * Checks whether the store is fetching the connection status from the server
 	 *
-	 * @deprecated since $$next-version$$
+	 * @deprecated since 0.14.0
 	 * @returns {boolean} Is the store is fetching the connection status from the server?
 	 */
 	getConnectionStatusIsFetching: () => false,
diff --git a/projects/js-packages/storybook/changelog/renovate-babel-monorepo#2 b/projects/js-packages/eslint-changed/changelog/renovate-major-eslint-packages
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-babel-monorepo#2
rename to projects/js-packages/eslint-changed/changelog/renovate-major-eslint-packages
diff --git a/projects/js-packages/eslint-changed/changelog/renovate-major-eslint-packages#2 b/projects/js-packages/eslint-changed/changelog/renovate-major-eslint-packages#2
new file mode 100644
index 0000000000000..3a3e8e69399b5
--- /dev/null
+++ b/projects/js-packages/eslint-changed/changelog/renovate-major-eslint-packages#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Update tests for eslint 8.8.0.
diff --git a/projects/js-packages/eslint-changed/package.json b/projects/js-packages/eslint-changed/package.json
index 4351bd949c6f5..a1359c05d7acf 100644
--- a/projects/js-packages/eslint-changed/package.json
+++ b/projects/js-packages/eslint-changed/package.json
@@ -26,7 +26,7 @@
 		"parse-diff": "0.8.1"
 	},
 	"devDependencies": {
-		"eslint": "7.32.0",
+		"eslint": "8.8.0",
 		"jetpack-js-test-runner": "workspace:*",
 		"nyc": "15.1.0"
 	},
diff --git a/projects/js-packages/eslint-changed/tests/bin/eslint-changed.js b/projects/js-packages/eslint-changed/tests/bin/eslint-changed.js
index 47efdadb0262b..eabb971c99713 100644
--- a/projects/js-packages/eslint-changed/tests/bin/eslint-changed.js
+++ b/projects/js-packages/eslint-changed/tests/bin/eslint-changed.js
@@ -441,6 +441,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 1,
 					fixableWarningCount: 0,
 					source: 'console.log( "Hello, world?" );\n',
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -484,6 +485,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 1,
 					fixableWarningCount: 0,
 					source: 'console.log( "Hello, world?" );\n',
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -527,6 +529,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 1,
 					fixableWarningCount: 0,
 					source: "console.log( '¡Hola, mundo!' )\n",
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -566,6 +569,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 0,
 					fixableWarningCount: 0,
 					source: "var x;\nconsole.log( 'Hello, world!' );\n",
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -619,6 +623,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 0,
 					fixableWarningCount: 0,
 					source: 'var x = 1;\n',
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 				{
@@ -646,6 +651,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 1,
 					fixableWarningCount: 0,
 					source: 'var x = \'Hello\';\nx += ", world!";\nconsole.log( x );\n',
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -688,6 +694,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 0,
 					fixableWarningCount: 0,
 					source: "var x = 'Hello, world!';\n\n\n\n\n\n\n\n\n\n\n\nconsole.log( x )\n",
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 				{
@@ -722,6 +729,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 0,
 					fixableWarningCount: 0,
 					source: "var y = 'Hello, world!';\n\n\n\n\n\n\n\n\n\n\n\nconsole.log( x )\n",
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
@@ -779,6 +787,7 @@ describe( 'bin/eslint-changed.js', () => {
 					fixableErrorCount: 0,
 					fixableWarningCount: 0,
 					source: "var y = 'Hello, world!';\n\n\n\n\n\n\n\n\n\n\n\nconsole.log( x )\n",
+					suppressedMessages: [],
 					usedDeprecatedRules: [],
 				},
 			];
diff --git a/projects/js-packages/eslint-config-target-es/CHANGELOG.md b/projects/js-packages/eslint-config-target-es/CHANGELOG.md
index 11285e895a097..5a6dfd04d25f5 100644
--- a/projects/js-packages/eslint-config-target-es/CHANGELOG.md
+++ b/projects/js-packages/eslint-config-target-es/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.1] - 2022-02-01
+### Changed
+- General: update required node version to v16.13.2
+- Updated package dependencies
+
 ## 1.0.0 - 2021-11-16
 ### Added
 - Initial release.
+
+[1.0.1]: https://github.com/Automattic/eslint-config-target-es/compare/1.0.0...1.0.1
diff --git a/projects/js-packages/storybook/changelog/renovate-babel-monorepo#3 b/projects/js-packages/eslint-config-target-es/changelog/renovate-major-eslint-packages
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-babel-monorepo#3
rename to projects/js-packages/eslint-config-target-es/changelog/renovate-major-eslint-packages
diff --git a/projects/js-packages/eslint-config-target-es/changelog/update-min-pnpm-version b/projects/js-packages/eslint-config-target-es/changelog/update-min-pnpm-version
deleted file mode 100644
index d824134990470..0000000000000
--- a/projects/js-packages/eslint-config-target-es/changelog/update-min-pnpm-version
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update minimum pnpm version.
-
-
diff --git a/projects/js-packages/eslint-config-target-es/changelog/update-node-version-16132 b/projects/js-packages/eslint-config-target-es/changelog/update-node-version-16132
deleted file mode 100644
index feb2fb77ea11d..0000000000000
--- a/projects/js-packages/eslint-config-target-es/changelog/update-node-version-16132
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: update required node version to v16.13.2
diff --git a/projects/js-packages/eslint-config-target-es/changelog/update-project-scripts-no-install b/projects/js-packages/eslint-config-target-es/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/eslint-config-target-es/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/eslint-config-target-es/package.json b/projects/js-packages/eslint-config-target-es/package.json
index fcd6319fc5278..8c45a879c75c7 100644
--- a/projects/js-packages/eslint-config-target-es/package.json
+++ b/projects/js-packages/eslint-config-target-es/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/eslint-config-target-es",
-	"version": "1.0.1-alpha",
+	"version": "1.0.2-alpha",
 	"description": "ESLint sharable config to activate eslint-plugin-es checks based on browserslist targets.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/eslint-config-target-es/README.md#readme",
 	"bugs": {
@@ -24,7 +24,7 @@
 	},
 	"devDependencies": {
 		"@wordpress/browserslist-config": "4.1.0",
-		"eslint": "7.32.0",
+		"eslint": "8.8.0",
 		"eslint-plugin-es": "4.1.0",
 		"jest": "27.3.1"
 	},
diff --git a/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md b/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md
index 2ec597f896fa6..c4cd965a476ac 100644
--- a/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md
+++ b/projects/js-packages/i18n-check-webpack-plugin/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.4] - 2022-01-27
+### Changed
+- Updated package dependencies.
+
+## [1.0.3] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.0.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -26,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release.
 
+[1.0.4]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/Automattic/i18n-check-webpack-plugin/compare/v0.1.0...v1.0.0
diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/add-fancy-eslint-ignore b/projects/js-packages/i18n-check-webpack-plugin/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/i18n-check-webpack-plugin/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/i18n-check-webpack-plugin/changelog/update-project-scripts-no-install b/projects/js-packages/i18n-check-webpack-plugin/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/i18n-check-webpack-plugin/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/i18n-check-webpack-plugin/composer.json b/projects/js-packages/i18n-check-webpack-plugin/composer.json
index 18bda6bc8f720..68a8ae88558da 100644
--- a/projects/js-packages/i18n-check-webpack-plugin/composer.json
+++ b/projects/js-packages/i18n-check-webpack-plugin/composer.json
@@ -32,6 +32,11 @@
 		"mirror-repo": "Automattic/i18n-check-webpack-plugin",
 		"changelogger": {
 			"link-template": "https://github.com/Automattic/i18n-check-webpack-plugin/compare/v${old}...v${new}"
+		},
+		"dependencies": {
+			"test": [
+				"js-packages/webpack-config"
+			]
 		}
 	}
 }
diff --git a/projects/js-packages/i18n-check-webpack-plugin/package.json b/projects/js-packages/i18n-check-webpack-plugin/package.json
index 78bc2b3f3c92a..72db279637c8d 100644
--- a/projects/js-packages/i18n-check-webpack-plugin/package.json
+++ b/projects/js-packages/i18n-check-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/i18n-check-webpack-plugin",
-	"version": "1.0.3-alpha",
+	"version": "1.0.4",
 	"description": "A Webpack plugin to check that WordPress i18n hasn't been mangled by Webpack optimizations.",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/CHANGELOG.md b/projects/js-packages/i18n-loader-webpack-plugin/CHANGELOG.md
index 1bd3e43c1d1ba..7068bf46afef8 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/CHANGELOG.md
+++ b/projects/js-packages/i18n-loader-webpack-plugin/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2022-01-25
+### Changed
+- BREAKING: Remove the downloading logic from the runtime by requiring a "loader" module rather than a "state" module. This gives more flexibility for different implementations in the future.
+- Update documentation for moving of the handling of package→plugin path mapping into jetpack-composer-plugin and jetpack-assets.
+
 ## [1.0.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -20,5 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release.
 
+[2.0.0]: https://github.com/Automattic/i18n-loader-webpack-plugin/compare/v1.0.2...v2.0.0
 [1.0.2]: https://github.com/Automattic/i18n-loader-webpack-plugin/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Automattic/i18n-loader-webpack-plugin/compare/v1.0.0...v1.0.1
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/README.md b/projects/js-packages/i18n-loader-webpack-plugin/README.md
index 7b427d4635fa8..007922b8166c8 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/README.md
+++ b/projects/js-packages/i18n-loader-webpack-plugin/README.md
@@ -28,9 +28,10 @@ This goes in the `plugins` section of your Webpack config, e.g.
 Parameters recognized by the plugin are:
 
 - `textdomain`: The text domain used in the JavaScript code. This is required, unless nothing in your JS actually uses [@wordpress/i18n].
-- `stateModule`: The name of a module supplying the i18n state. See [State module](#state-module) below for details.
+- `loaderModule`: The name of a module supplying the i18n loader. See [Loader module](#loader-module) below for details.
+- `loaderMethod`: The name of the function from `loaderModule` to download the i18n. See [Loader module](#loader-module) below for details.
 - `target`: The target of the build: 'plugin' (the default), 'theme', or 'core'. This is used to determine where in WordPress's languages directory to look for the translation files.
-- `path`: See [Webpack context](#webpack-context) and [Use in Composer packages](#use-in-composer-packages) below for details.
+- `path`: See [Webpack context](#webpack-context) below for details.
 - `ignoreModules`: If some bundles in your build depend on [@wordpress/i18n] for purposes other than translating strings, i18n-loader-webpack-plugin will none the less count them as "using @wordpress/i18n" which may result in it trying to load translations for bundles that do not need it. This option may be used to ignore the relevant source files when examining the bundles.
 
   The value may be a function, which will be passed the file path relative to [Webpack's context] and the Webpack Module object and which should return true if the file should be ignored, or a string or RegExp to be compared with the relative file path, or an array of such strings, RegExps, and/or functions.
@@ -50,23 +51,32 @@ But if for some reason you want to do it manually, something like this in your W
 }
 ```
 
-### State module
+### Loader module
 
-In order to load the translations, the generated bundle needs to be provided with some state at runtime. This is handled by loading a module that must be externalized by your Webpack configuration.
+In order to load the translations, the generated bundle needs to call a method to do the actual downloading at runtime. This is handled by loading a module that must be externalized by your Webpack configuration.
 
-The default module name is `@wordpress/jp-i18n-state`, which will automatically be externalized by [@wordpress/dependency-extraction-webpack-plugin], which will also register it as a dependency for "wp-jp-i18n-state" in the generated `.asset.php` file. That, in turn, is provided by the [automattic/jetpack-assets] Composer package (which also provides an `Automattic\Jetpack\Assets::register_script()` function to easily consume the `.asset.php` file).
+The default module name is `@wordpress/jp-i18n-loader`, which will automatically be externalized by [@wordpress/dependency-extraction-webpack-plugin], which will also register it as a dependency for "wp-jp-i18n-loader" in the generated `.asset.php` file. That, in turn, is provided by the [automattic/jetpack-assets] Composer package (which also provides an `Automattic\Jetpack\Assets::register_script()` function to easily consume the `.asset.php` file).
 
-But if for some reason you don't want to use those packages, you can set the plugin's `stateModule` option to point to a different module name, use [Webpack's externals configuration] to externalize it, and appropriate PHP code to provide the corresponding global variable for your externals configuration to retrieve. The state is a JavaScript object with the following properties:
+But if for some reason you don't want to use those packages, you can set the plugin's `loaderModule` and `loaderMethod` options to point to a different module name, use [Webpack's externals configuration] to externalize it, and appropriate PHP code to provide the corresponding global variable for your externals configuration to retrieve.
 
-- `baseUrl`: The base URL from which to fetch the translations, probably something like `https://yoursite.example.com/wp-content/languages/`. The trailing slash is required.
-- `locale`: The locale used on the page.
-- `domainMap`: An object mapping textdomains. See [Use in Composer packages](#use-in-composer-packages) below for details.
+The loader method might be documented like this:
+```js
+/**
+ * Download and register translations for a bundle.
+ *
+ * @param {string} path - Bundle path being fetched. May have a query part.
+ * @param {string} domain - Text domain to register into.
+ * @param {string} location - Location for the translation: 'plugin', 'theme', or 'core'.
+ * @returns {Promise} Resolved when the translations are registered, or rejected with an `Error`.
+ */
+```
+Most likely the method will separate any query part from the path, hash it, build the download url, fetch it, then register it via `@wordpress/i18n`'s `setLocaleData()` method.
 
 ### Webpack context
 
 WordPress's translation infrastructure generates a file for each JS script named like "_textdomain_-_locale_-_hash_.json". The _hash_ is an MD5 hash of the path of the script file relative to the plugin's root.
 
-I18n-loader-webpack-plugin assumes that [Webpack's context] is the base of the WordPress plugin in which the bundles will be included.
+I18n-loader-webpack-plugin assumes that [Webpack's context] is the base of the WordPress package or plugin in which the bundles will be included, and that the [loader module](#loader-module) will handle mapping from package root to plugin root.
 If this is not the case, you'll need to set the plugin's `path` parameter to the relative path from the plugin's root to Webpack's `output.path`.
 
 ### Other useful Webpack configuration
@@ -88,9 +98,8 @@ WordPress's plugin infrastructure doesn't natively support Composer packages, so
 That won't work for packages needing translation, though, as WordPress's translation infrastructure ignores the `vendor/` directory when looking for strings to be translated.
 You'll need to use something like [automattic/jetpack-composer-plugin] so that the composer packages with translated strings are installed to a different path.
 
-Then, for Webpack builds in the Composer package, you'll need to set i18n-loader-webpack-plugin's `path` option to the path relative to the _plugin's_ root directory. For example, if your Composer package is named "automattic/foobar", will be used with [automattic/jetpack-composer-plugin] which will install the package to `jetpack_vendor/` rather than `vendor/`, and Webpack is building to a `build/` directory within the package, you'd need to set `path` to `jetpack_vendor/automattic/foobar/build/` as that's where the built files will end up relative to the plugin.
-
-The consuming plugin will also need to arrange for the [state module](#state-module)'s `domainMap` to include a mapping from your Composer package's textdomain to the plugin's textdomain (prefixed with "plugins/"), as that's where the translations will end up. This may be done using [automattic/jetpack-assets] along with [automattic/jetpack-composer-plugin], as described in the latter's documentation.
+Also, as the translation file will be named using the plugin's textdomain rather than the Composer package's, the consuming plugin will also need to arrange for the [loader module](#loader-module) to fetch the proper file.
+This may be done using [automattic/jetpack-assets] along with [automattic/jetpack-composer-plugin], as described in the latter's documentation.
 
 ## Security
 
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/changelog/add-fancy-eslint-ignore b/projects/js-packages/i18n-loader-webpack-plugin/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/i18n-loader-webpack-plugin/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/renovate-css-loader-6.x b/projects/js-packages/i18n-loader-webpack-plugin/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-css-loader-6.x
rename to projects/js-packages/i18n-loader-webpack-plugin/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/changelog/update-project-scripts-no-install b/projects/js-packages/i18n-loader-webpack-plugin/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/i18n-loader-webpack-plugin/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/package.json b/projects/js-packages/i18n-loader-webpack-plugin/package.json
index 01926c18198e3..ea6cca53fdf95 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/package.json
+++ b/projects/js-packages/i18n-loader-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/i18n-loader-webpack-plugin",
-	"version": "1.0.3-alpha",
+	"version": "2.0.1-alpha",
 	"description": "A Webpack plugin to load WordPress i18n when Webpack lazy-loads a bundle.",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -17,12 +17,11 @@
 		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR\" --coverageReporters=clover"
 	},
 	"dependencies": {
-		"debug": "^4.3.2",
-		"md5-es": "^1.8.2"
+		"debug": "^4.3.2"
 	},
 	"devDependencies": {
-		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
-		"@wordpress/i18n": "4.2.4",
+		"@wordpress/dependency-extraction-webpack-plugin": "3.3.0",
+		"@wordpress/i18n": "4.3.0",
 		"jest": "27.3.1",
 		"webpack": "5.65.0"
 	},
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderPlugin.js b/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderPlugin.js
index f96ae59d3e38e..0dfdc85bb16a7 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderPlugin.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderPlugin.js
@@ -31,8 +31,12 @@ const schema = {
 		},
 	},
 	properties: {
-		stateModule: {
-			description: 'Externalized module supplying the i18n state.',
+		loaderModule: {
+			description: 'Externalized module supplying the i18n loader.',
+			type: 'string',
+		},
+		loaderMethod: {
+			description: 'Method on the loader module to call to load the i18n.',
 			type: 'string',
 		},
 		textdomain: {
@@ -44,7 +48,7 @@ const schema = {
 			enum: [ 'plugin', 'theme', 'core' ],
 		},
 		path: {
-			description: 'Path (relative to the plugin) to locate the output assets.',
+			description: 'Path (relative to the package or plugin) to locate the output assets.',
 			type: 'string',
 		},
 		ignoreModules: {
@@ -79,7 +83,8 @@ class I18nLoaderPlugin {
 
 		this.options = {
 			target: 'plugin',
-			stateModule: '@wordpress/jp-i18n-state',
+			loaderModule: '@wordpress/jp-i18n-loader',
+			loaderMethod: 'downloadI18n',
 			...options,
 		};
 
@@ -114,51 +119,30 @@ class I18nLoaderPlugin {
 		} );
 
 		// At the "make" hook, inject Dependency objects into the build so we can get the modules we need.
-		const stateModuleDep = new I18nLoaderModuleDependency( this.options.stateModule );
-		stateModuleDep.optional = true;
-		const i18nModuleDep = new I18nLoaderModuleDependency( '@wordpress/i18n' );
-		i18nModuleDep.optional = true;
+		const loaderModuleDep = new I18nLoaderModuleDependency( this.options.loaderModule );
+		loaderModuleDep.optional = true;
 		compiler.hooks.make.tapPromise( PLUGIN_NAME, compilation => {
-			return Promise.all( [
-				new Promise( ( resolve, reject ) => {
-					compilation.addModuleChain( compiler.context, stateModuleDep, ( err, module ) => {
-						if ( err ) {
-							return reject( err );
-						}
-						// Webpack bug; Until 5.51.0 it didn't pass the module to the callback.
-						if ( ! module && ! compilation.moduleGraph.getModule( stateModuleDep ) ) {
-							// prettier-ignore
-							let msg = `${ PLUGIN_NAME }:\nFailed to add state module ${ this.options.stateModule } to the build.\n`;
-							if ( this.options.stateModule.startsWith( '@wordpress/' ) ) {
-								msg +=
-									"You'll need to add @wordpress/dependency-extraction-webpack-plugin or an appropriate externals directive to your Webpack config.";
-							} else {
-								msg +=
-									"You'll need to add the appropriate externals directive to your Webpack config.";
-							}
-							compilation.errors.push( new webpack.WebpackError( msg ) );
-						}
-						resolve();
-					} );
-				} ),
-				new Promise( ( resolve, reject ) => {
-					compilation.addModuleChain( compiler.context, i18nModuleDep, ( err, module ) => {
-						if ( err ) {
-							return reject( err );
-						}
-						// Webpack bug; Until 5.51.0 it didn't pass the module to the callback.
-						if ( ! module && ! compilation.moduleGraph.getModule( i18nModuleDep ) ) {
-							compilation.errors.push(
-								new webpack.WebpackError(
-									`${ PLUGIN_NAME }:\nFailed to add i18n module @wordpress/i18n to the build.\n` +
-										"You'll need to add @wordpress/dependency-extraction-webpack-plugin or an appropriate externals directive to your Webpack config, or add @wordpress/i18n to your package.json."
-								)
-							);
+			return new Promise( ( resolve, reject ) => {
+				compilation.addModuleChain( compiler.context, loaderModuleDep, ( err, module ) => {
+					if ( err ) {
+						return reject( err );
+					}
+					// Webpack bug; Until 5.51.0 it didn't pass the module to the callback.
+					if ( ! module && ! compilation.moduleGraph.getModule( loaderModuleDep ) ) {
+						// prettier-ignore
+						let msg = `${ PLUGIN_NAME }:\nFailed to add loader module ${ this.options.loaderModule } to the build.\n`;
+						if ( this.options.loaderModule.startsWith( '@wordpress/' ) ) {
+							msg +=
+								"You'll need to add @wordpress/dependency-extraction-webpack-plugin or an appropriate externals directive to your Webpack config.";
+						} else {
+							msg +=
+								"You'll need to add the appropriate externals directive to your Webpack config.";
 						}
-						resolve();
-					} );
-				} ),
-			] );
+						compilation.errors.push( new webpack.WebpackError( msg ) );
+					}
+					resolve();
+				} );
+			} );
 		} );
 
 		compiler.hooks.thisCompilation.tap( PLUGIN_NAME, compilation => {
@@ -168,10 +152,9 @@ class I18nLoaderPlugin {
 			 * @returns {object} Stuff.
 			 */
 			function getStuff() {
-				const stateModule = compilation.moduleGraph.getModule( stateModuleDep );
-				const i18nModule = compilation.moduleGraph.getModule( i18nModuleDep );
+				const loaderModule = compilation.moduleGraph.getModule( loaderModuleDep );
 
-				const i18nModules = new Set( [ i18nModule ] );
+				const i18nModules = new Set();
 				for ( const module of compilation.modules ) {
 					// rawRequest is for a NormalModule. userRequest is for an ExternalModule. Other types we don't really care about.
 					if (
@@ -183,18 +166,18 @@ class I18nLoaderPlugin {
 				}
 				const i18nModulesArr = [ ...i18nModules ];
 
-				return { stateModule, i18nModule, i18nModulesArr, chunkGraph: compilation.chunkGraph };
+				return { loaderModule, i18nModulesArr, chunkGraph: compilation.chunkGraph };
 			}
 
 			// After chunks have been optimized (e.g. chunk splitting happened), determine which chunks need
 			// our deps and inject them.
 			compilation.hooks.afterOptimizeChunks.tap( PLUGIN_NAME, chunks => {
-				const { stateModule, i18nModule, i18nModulesArr, chunkGraph } = getStuff();
-				if ( ! stateModule ) {
-					debug( "State module is missing, can't run." );
+				const { loaderModule, i18nModulesArr, chunkGraph } = getStuff();
+				if ( ! loaderModule ) {
+					debug( "Loader module is missing, can't run." );
 					return;
 				}
-				if ( ! i18nModule || i18nModulesArr.length <= 0 ) {
+				if ( i18nModulesArr.length <= 0 ) {
 					debug( "I18n module is missing, can't run." );
 					return;
 				}
@@ -239,41 +222,28 @@ class I18nLoaderPlugin {
 					}
 
 					// Inject into the chunk!
-					if ( chunkGraph.isModuleInChunk( stateModule, chunk ) ) {
-						debug( `    Already had ${ this.options.stateModule }` );
+					if ( chunkGraph.isModuleInChunk( loaderModule, chunk ) ) {
+						debug( `    Already had ${ this.options.loaderModule }` );
 					} else {
-						chunkGraph.connectChunkAndModule( chunk, stateModule );
+						chunkGraph.connectChunkAndModule( chunk, loaderModule );
 						chunkGraph.addModuleRuntimeRequirements(
-							stateModule,
+							loaderModule,
 							chunk.runtime,
 							new Set( [ RuntimeGlobals.module ] )
 						);
 					}
-					if ( ! i18nModulesArr.some( m => chunkGraph.isModuleInChunk( m, chunk ) ) ) {
-						debug( "    Didn't itself use @wordpress/i18n" );
-						chunkGraph.connectChunkAndModule( chunk, i18nModule );
-					}
 
 					// Any chunk using this as a runtime doesn't itself need the injected modules.
 					for ( const c of chunk.getAllReferencedChunks() ) {
 						if ( c === chunk ) {
 							continue;
 						}
-						if ( chunkGraph.isModuleInChunk( stateModule, c ) ) {
+						if ( chunkGraph.isModuleInChunk( loaderModule, c ) ) {
 							debug(
 								// prettier-ignore
-								`    Removing redundant ${ this.options.stateModule } from chunk ${ c.name || c.id || c.debugId }`
+								`    Removing redundant ${ this.options.loaderModule } from chunk ${ c.name || c.id || c.debugId }`
 							);
-							chunkGraph.disconnectChunkAndModule( c, stateModule );
-						}
-						for ( const m of i18nModulesArr ) {
-							if ( chunkGraph.isModuleInChunk( m, c ) ) {
-								debug(
-									// prettier-ignore
-									`    Removing redundant @wordpress/i18n from chunk ${ c.name || c.id || c.debugId }`
-								);
-								chunkGraph.disconnectChunkAndModule( c, m );
-							}
+							chunkGraph.disconnectChunkAndModule( c, loaderModule );
 						}
 					}
 				}
@@ -281,22 +251,22 @@ class I18nLoaderPlugin {
 
 			// This is just for debugging, to see if later optimizations removed our modules.
 			compilation.hooks.afterOptimizeChunkModules.tap( PLUGIN_NAME, chunks => {
-				const { stateModule, i18nModulesArr, chunkGraph } = getStuff();
-				if ( ! stateModule || i18nModulesArr.length <= 0 ) {
+				const { loaderModule, i18nModulesArr, chunkGraph } = getStuff();
+				if ( ! loaderModule || i18nModulesArr.length <= 0 ) {
 					return;
 				}
 
 				debug( 'After optimizations,' );
 				for ( const chunk of chunks ) {
-					if ( chunkGraph.isModuleInChunk( stateModule, chunk ) ) {
+					if ( chunkGraph.isModuleInChunk( loaderModule, chunk ) ) {
 						debug(
 							// prettier-ignore
-							` ✅ Chunk ${ chunk.name || chunk.id || chunk.debugId } contains ${ this.options.stateModule }`
+							` ✅ Chunk ${ chunk.name || chunk.id || chunk.debugId } contains ${ this.options.loaderModule }`
 						);
 					} else {
 						debug(
 							// prettier-ignore
-							` ❌ Chunk ${ chunk.name || chunk.id || chunk.debugId } does not contain ${ this.options.stateModule }`
+							` ❌ Chunk ${ chunk.name || chunk.id || chunk.debugId } does not contain ${ this.options.loaderModule }`
 						);
 					}
 					if ( i18nModulesArr.some( m => chunkGraph.isModuleInChunk( m, chunk ) ) ) {
@@ -317,18 +287,19 @@ class I18nLoaderPlugin {
 			compilation.hooks.runtimeRequirementInTree
 				.for( webpack.RuntimeGlobals.ensureChunkHandlers )
 				.tap( PLUGIN_NAME, ( chunk, set ) => {
-					const { stateModule, i18nModulesArr } = getStuff();
-					if ( ! stateModule || i18nModulesArr.length <= 0 ) {
+					const { loaderModule, i18nModulesArr } = getStuff();
+					if ( ! loaderModule || i18nModulesArr.length <= 0 ) {
 						return;
 					}
 
 					debug( `Queuing runtime module for ${ chunk.name || chunk.id || chunk.debugId }.` );
+					set.add( webpack.RuntimeGlobals.getChunkScriptFilename );
 					compilation.addRuntimeModule(
 						chunk,
 						new I18nLoaderRuntimeModule( set, {
 							...this.options,
-							stateModuleName: this.options.stateModule,
-							stateModule,
+							loaderModuleName: this.options.loaderModule,
+							loaderModule,
 							i18nModulesArr,
 						} )
 					);
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderRuntimeModule.js b/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderRuntimeModule.js
index 273a18f7c207d..bb57a9b381c6b 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderRuntimeModule.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/src/I18nLoaderRuntimeModule.js
@@ -1,4 +1,3 @@
-const { default: md5 } = require( 'md5-es' );
 const path = require( 'path' );
 const webpack = require( 'webpack' );
 const { Template, RuntimeGlobals } = webpack;
@@ -44,12 +43,12 @@ class I18nLoaderRuntimeModule extends webpack.RuntimeModule {
 	}
 
 	/**
-	 * Get info for chunks we need to care about.
+	 * Get set of chunks we need to care about.
 	 *
-	 * @returns {Map} Map of chunk ID to data.
+	 * @returns {Set} Chunk IDs.
 	 */
-	getChunkInfo() {
-		const ret = new Map();
+	getChunks() {
+		const ret = new Set();
 		const { chunkGraph } = this.compilation;
 
 		for ( const chunk of this.chunk.getAllAsyncChunks() ) {
@@ -61,12 +60,7 @@ class I18nLoaderRuntimeModule extends webpack.RuntimeModule {
 					module.userRequest === '@wordpress/i18n' ||
 					module.dependencies.some( d => d.request === '@wordpress/i18n' )
 				) {
-					const [ chunkPath, query ] = this.getChunkPath( chunk ).split( '?', 2 );
-					ret.set( chunk.id, {
-						chunkPath,
-						query,
-						hash: md5.hash( chunkPath ),
-					} );
+					ret.add( chunk.id );
 					continue;
 				}
 			}
@@ -76,34 +70,24 @@ class I18nLoaderRuntimeModule extends webpack.RuntimeModule {
 
 	generate() {
 		const { chunk, compilation, runtimeOptions, runtimeRequirements } = this;
-		const { stateModule, stateModuleName, i18nModulesArr, textdomain } = runtimeOptions;
+		const { loaderModule, loaderMethod, loaderModuleName, textdomain, target } = runtimeOptions;
 		const { chunkGraph, runtimeTemplate } = compilation;
-		const chunkInfo = this.getChunkInfo();
+		const basepath =
+			this.runtimeOptions.path ||
+			path.relative( compilation.compiler.context, compilation.outputOptions.path );
+		const chunks = this.getChunks();
 
-		if ( ! chunkInfo.size ) {
+		if ( ! chunks.size ) {
 			debug( `No async submodules using @wordpress/i18n in ${ this.getChunkPath( chunk ) }.` );
 			return null;
 		}
 		debug( `Adding i18n-loading runtime for ${ this.getChunkPath( chunk ) }.` );
 
-		// The hooks should have injected the state and i18n modules. Check to make sure they're still there.
-		if ( ! chunkGraph.isModuleInChunk( stateModule, chunk ) ) {
-			throw new webpack.WebpackError(
-				// prettier-ignore
-				`Chunk ${ chunk.name || chunk.id || chunk.debugId } (${ this.getChunkPath( chunk ) }) has submodules using @wordpress/i18n, but is missing the state module ${ stateModuleName }.`
-			);
-		}
-		let i18nModule;
-		for ( const m of i18nModulesArr ) {
-			if ( chunkGraph.isModuleInChunk( m, chunk ) ) {
-				i18nModule = m;
-				break;
-			}
-		}
-		if ( ! i18nModule ) {
+		// The hooks should have injected the loader module. Check to make sure it's still there.
+		if ( ! chunkGraph.isModuleInChunk( loaderModule, chunk ) ) {
 			throw new webpack.WebpackError(
 				// prettier-ignore
-				`Chunk ${ chunk.name || chunk.id || chunk.debugId } (${ this.getChunkPath( chunk ) }) has submodules using @wordpress/i18n, but is itself missing @wordpress/i18n.`
+				`Chunk ${ chunk.name || chunk.id || chunk.debugId } (${ this.getChunkPath( chunk ) }) has submodules using @wordpress/i18n, but is missing the loader module ${ loaderModuleName }.`
 			);
 		}
 
@@ -116,82 +100,46 @@ class I18nLoaderRuntimeModule extends webpack.RuntimeModule {
 		}
 
 		// Determine the WordPress module name that @wordpress/dependency-extraction-webpack-plugin will (by default) use.
-		let depName = stateModuleName;
+		let depName = loaderModuleName;
 		if ( depName.startsWith( '@wordpress/' ) ) {
 			// prettier-ignore
 			depName = 'wp.' + depName.substring( 11 ).replace( /-([a-z])/g, ( _, letter ) => letter.toUpperCase() );
 		}
 
-		const targetcode = {
-			plugin: '"plugins/" + ',
-			theme: '"themes/" + ',
-			core: '',
-		}[ this.runtimeOptions.target ];
-		const domaincode = `state.domainMap[textdomain] || ( ${ targetcode }textdomain )`;
-
 		// Build the runtime code.
 		// prettier-ignore
 		return Template.asString( [
-			`var textdomain = ${ JSON.stringify( textdomain ) };`,
-			'var chunkInfo = {',
-			Template.indent(
-				Array.from( chunkInfo.entries(), ( [ k, v ] ) => {
-					const items = [
-						Template.toNormalComment( v.chunkPath ) + ' ' + JSON.stringify( v.hash ),
-						v.query ? JSON.stringify( '?' + v.query ) : '""',
-					];
-					return `${ JSON.stringify( k ) }: [ ${ items.join( ', ' ) } ]`;
-				} ).join( ',\n' )
-			),
+			'var installedChunks = {',
+			Template.indent( Array.from( chunks.values(), id => `${ JSON.stringify( id ) }: 0` ).join( ',\n' ) ),
 			'};',
 			'',
 			'var loadI18n = ' +
-				runtimeTemplate.basicFunction( 'info', [
-					'var i18n = ' + runtimeTemplate.moduleExports( {
-						module: i18nModule,
-						chunkGraph,
-						request: '@wordpress/i18n',
-						runtimeRequirements,
-					} ) + ';',
-					'var state = ' + runtimeTemplate.moduleExports( {
-						module: stateModule,
+				runtimeTemplate.basicFunction( 'chunkId', [
+					'var loader = ' + runtimeTemplate.moduleExports( {
+						module: loaderModule,
 						chunkGraph,
-						request: stateModuleName,
+						request: loaderModuleName,
 						runtimeRequirements,
 					} ) + ';',
-					`if ( ! state ) return Promise.reject( new Error( ${ JSON.stringify( 'I18n state is not available. Check that WordPress is exporting ' + depName + '.' ) } ) );`,
-					`if ( state.locale === "en_US" ) return Promise.resolve();`,
-					'if ( typeof fetch === "undefined" ) return Promise.reject( new Error( "Fetch API is not available." ) );',
-					'return fetch(',
-					Template.indent( [
-						runtimeTemplate.supportTemplateLiteral()
-							? '`${ state.baseUrl }${ ' + domaincode + ' }-${ state.locale }-${ info[0] }.json${ info[1] }`'
-							: 'state.baseUrl + ( ' + domaincode + ' ) + "-" + state.locale + "-" + info[0] + ".json" + info[1]',
-					] ),
-					').then( ' + runtimeTemplate.basicFunction( 'res', [
-						'if ( ! res.ok ) throw new Error( "HTTP request failed: " + res.status + " " + res.statusText );',
-						'return res.json();',
-					] ) + ' ).then( ' + runtimeTemplate.basicFunction( 'data', [
-						'var data2 = data.locale_data;',
-						'var localeData = data2[ textdomain ] || data2.messages;',
-						'localeData[""].domain = textdomain;',
-						'i18n.setLocaleData( localeData, textdomain );',
-					] ) + ' );',
+					`if ( loader && loader.${ loaderMethod } )`,
+					Template.indent(
+						`return loader.${ loaderMethod }( ${ JSON.stringify( basepath + '/' ) } + ${ RuntimeGlobals.getChunkScriptFilename }( chunkId ), ${ JSON.stringify( textdomain ) }, ${ JSON.stringify( target ) } );`,
+					),
+					`return Promise.reject( new Error( ${ JSON.stringify( 'I18n loader is not available. Check that WordPress is exporting ' + depName + '.' ) } ) );`,
 				] ) + ';',
 			'',
-			'var installedChunks = {};',
 			`${ RuntimeGlobals.ensureChunkHandlers }.wpI18n = ` + runtimeTemplate.basicFunction( 'chunkId, promises', [
 				'if ( installedChunks[chunkId] ) {',
 				Template.indent( 'promises.push( installedChunks[chunkId] );' ),
-				'} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {',
+				'} else if ( installedChunks[chunkId] === 0 ) {',
 				Template.indent( [
-					'promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then( ',
+					'promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then( ',
 					Template.indent( [
-						runtimeTemplate.basicFunction( '', [ 'installedChunks[chunkId] = 0;' ] ) + ',',
+						runtimeTemplate.basicFunction( '', [ 'installedChunks[chunkId] = false;' ] ) + ',',
 						runtimeTemplate.basicFunction( 'e', [
-							'delete installedChunks[chunkId];',
+							'installedChunks[chunkId] = 0;',
 							"// Log only, we don't want i18n failure to break the entire page.",
-							'console.error( "Failed to fetch i18n data:", e );',
+							'console.error( "Failed to fetch i18n data: ", e );',
 						] ),
 					] ),
 					') );',
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/__snapshots__/build.test.js.snap b/projects/js-packages/i18n-loader-webpack-plugin/tests/__snapshots__/build.test.js.snap
index b2d4005a0cc8d..8058cc6db87a4 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/__snapshots__/build.test.js.snap
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/__snapshots__/build.test.js.snap
@@ -8,88 +8,61 @@ Object {
   "bar.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "baz.asset.php": Object {},
   "baz.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "main.asset.php": Object {},
   "main.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"basic-test\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"basic-test\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
 }
 `;
@@ -101,90 +74,6 @@ Object {
 }
 `;
 
-exports[`Webpack \`fetch-failures\` Build results: Webpack build error 1`] = `null`;
-
-exports[`Webpack \`fetch-failures\` Build results: Webpack build files 1`] = `
-Object {
-  "a.asset.php": Object {},
-  "a.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
-",
-    "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
-/******/ 	(() => {
-/******/ 		var textdomain = \\"fetch-failures\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
-/******/ 		};
-/******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
-/******/ 		};
-/******/ 		
-/******/ 		var installedChunks = {};
-/******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
-/******/ 			if ( installedChunks[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
-/******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
-/******/ 					},
-/******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
-/******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
-/******/ 					}
-/******/ 				) );
-/******/ 			}
-/******/ 		};
-/******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
-  },
-  "hasI18n.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
-  },
-}
-`;
-
-exports[`Webpack \`fetch-failures\` Build results: Webpack build stats 1`] = `
-Object {
-  "errors": Array [],
-  "warnings": Array [],
-}
-`;
-
 exports[`Webpack \`ignore-modules\` Build results: Webpack build error 1`] = `null`;
 
 exports[`Webpack \`ignore-modules\` Build results: Webpack build files 1`] = `
@@ -192,398 +81,238 @@ Object {
   "array/hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "array/hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "array/main.asset.php": Object {},
   "array/main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "array/main2.asset.php": Object {},
   "array/main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"ignore-modules\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n2\\": [ /* dist/array/hasI18n2.js */ \\"e4f47276932fd5fd64de200952c28fa0\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"ignore-modules\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
-  },
-  "array/md5.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
   },
   "array/noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "function/hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "function/hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "function/main.asset.php": Object {},
   "function/main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "function/main2.asset.php": Object {},
   "function/main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"ignore-modules\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n2\\": [ /* dist/function/hasI18n2.js */ \\"2f34b700832755e4f97db2c8639d355f\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"ignore-modules\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
-  },
-  "function/md5.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
   },
   "function/noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "regex/hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "regex/hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "regex/main.asset.php": Object {},
   "regex/main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "regex/main2.asset.php": Object {},
   "regex/main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"ignore-modules\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n2\\": [ /* dist/regex/hasI18n2.js */ \\"b9b66de4c25a21524d7efa38f93bbf38\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"ignore-modules\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
-  },
-  "regex/md5.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
   },
   "regex/noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "string/hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "string/hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "string/main.asset.php": Object {},
   "string/main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "string/main2.asset.php": Object {},
   "string/main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"ignore-modules\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n2\\": [ /* dist/string/hasI18n2.js */ \\"8ccd788351d9b86e5ae5a8a7bb8acd02\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"ignore-modules\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
-  },
-  "string/md5.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
   },
   "string/noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
 }
 `;
@@ -617,210 +346,114 @@ Object {
 }
 `;
 
-exports[`Webpack \`manual-externals\` Build results: Webpack build error 1`] = `null`;
+exports[`Webpack \`loader-failures\` Build results: Webpack build error 1`] = `null`;
 
-exports[`Webpack \`manual-externals\` Build results: Webpack build files 1`] = `
+exports[`Webpack \`loader-failures\` Build results: Webpack build files 1`] = `
 Object {
-  "hasI18n.js": Object {
-    "jpI18nState": null,
-    "loader": null,
-    "wpI18n": null,
-  },
-  "main.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!******************************!*\\\\
-  !*** external \\"jpI18nState\\" ***!
-  \\\\******************************/
+  "a.asset.php": Object {},
+  "a.js": Object {
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = global[\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"manual-externals\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"loader-failures\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!*************************!*\\\\
-  !*** external \\"wpI18n\\" ***!
-  \\\\*************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = global[\\"wpI18n\\"];
-",
   },
-  "main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!**********************************************************************************************!*\\\\
-  !*** external \\"{\\\\\\"baseUrl\\\\\\":\\\\\\"http://example.org/\\\\\\",\\\\\\"locale\\\\\\":\\\\\\"en_US\\\\\\",\\\\\\"domainMap\\\\\\":{}}\\" ***!
-  \\\\**********************************************************************************************/
-/***/ ((module) => {
+  "hasI18n.js": Object {
+    "jpI18nState": null,
+    "loader": null,
+  },
+}
+`;
 
-\\"use strict\\";
-if(typeof {\\"baseUrl\\":\\"http://example.org/\\",\\"locale\\":\\"en_US\\",\\"domainMap\\":{}} === 'undefined') { var e = new Error(\\"Cannot find module '{\\\\\\"baseUrl\\\\\\":\\\\\\"http://example.org/\\\\\\",\\\\\\"locale\\\\\\":\\\\\\"en_US\\\\\\",\\\\\\"domainMap\\\\\\":{}}'\\"); e.code = 'MODULE_NOT_FOUND'; throw e; }
+exports[`Webpack \`loader-failures\` Build results: Webpack build stats 1`] = `
+Object {
+  "errors": Array [],
+  "warnings": Array [],
+}
+`;
 
-module.exports = {\\"baseUrl\\":\\"http://example.org/\\",\\"locale\\":\\"en_US\\",\\"domainMap\\":{}};
-",
-    "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
-/******/ 	(() => {
-/******/ 		var textdomain = \\"manual-externals\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
-/******/ 		};
-/******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
-/******/ 		};
-/******/ 		
-/******/ 		var installedChunks = {};
-/******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
-/******/ 			if ( installedChunks[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
-/******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
-/******/ 					},
-/******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
-/******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
-/******/ 					}
-/******/ 				) );
-/******/ 			}
-/******/ 		};
-/******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!*************************!*\\\\
-  !*** external \\"wpI18n\\" ***!
-  \\\\*************************/
-/***/ ((module) => {
+exports[`Webpack \`manual-externals\` Build results: Webpack build error 1`] = `null`;
 
-\\"use strict\\";
-module.exports = global[\\"wpI18n\\"];
-",
+exports[`Webpack \`manual-externals\` Build results: Webpack build files 1`] = `
+Object {
+  "hasI18n.js": Object {
+    "jpI18nState": null,
+    "loader": null,
   },
-  "main3.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!**************************************************************************************************************************************!*\\\\
-  !*** external \\"{\\\\\\"baseUrl\\\\\\":\\\\\\"http://example.org/\\\\\\",\\\\\\"locale\\\\\\":\\\\\\"en_us\\\\\\",\\\\\\"domainMap\\\\\\":{\\\\\\"manual-externals\\\\\\":\\\\\\"themes/remapped\\\\\\"}}\\" ***!
-  \\\\**************************************************************************************************************************************/
+  "main.js": Object {
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!*******************************!*\\\\
+  !*** external \\"jpI18nLoader\\" ***!
+  \\\\*******************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-if(typeof {\\"baseUrl\\":\\"http://example.org/\\",\\"locale\\":\\"en_us\\",\\"domainMap\\":{\\"manual-externals\\":\\"themes/remapped\\"}} === 'undefined') { var e = new Error(\\"Cannot find module '{\\\\\\"baseUrl\\\\\\":\\\\\\"http://example.org/\\\\\\",\\\\\\"locale\\\\\\":\\\\\\"en_us\\\\\\",\\\\\\"domainMap\\\\\\":{\\\\\\"manual-externals\\\\\\":\\\\\\"themes/remapped\\\\\\"}}'\\"); e.code = 'MODULE_NOT_FOUND'; throw e; }
-
-module.exports = {\\"baseUrl\\":\\"http://example.org/\\",\\"locale\\":\\"en_us\\",\\"domainMap\\":{\\"manual-externals\\":\\"themes/remapped\\"}};
+module.exports = global[\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"manual-externals\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"manual-externals\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!*************************!*\\\\
-  !*** external \\"wpI18n\\" ***!
-  \\\\*************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = global[\\"wpI18n\\"];
-",
   },
 }
 `;
@@ -833,16 +466,6 @@ Object {
       "name": undefined,
       "warnings": Array [],
     },
-    Object {
-      "errors": Array [],
-      "name": undefined,
-      "warnings": Array [],
-    },
-    Object {
-      "errors": Array [],
-      "name": undefined,
-      "warnings": Array [],
-    },
   ],
   "errors": Array [],
   "warnings": Array [],
@@ -853,17 +476,64 @@ exports[`Webpack \`missing-externals\` Build results: Webpack build error 1`] =
 
 exports[`Webpack \`missing-externals\` Build results: Webpack build stats 1`] = `
 Object {
+  "children": Array [
+    Object {
+      "errors": Array [
+        Object {
+          "message": "@automattic/i18n-loader-webpack-plugin:
+Failed to add loader module @wordpress/jp-i18n-loader to the build.
+You'll need to add @wordpress/dependency-extraction-webpack-plugin or an appropriate externals directive to your Webpack config.",
+        },
+      ],
+      "name": undefined,
+      "warnings": Array [
+        Object {
+          "loc": "",
+          "message": "Module not found: Error: Can't resolve '@wordpress/jp-i18n-loader' in '/path/to/i18n-loader-webpack-plugin/tests/fixtures/missing-externals'",
+        },
+      ],
+    },
+    Object {
+      "errors": Array [
+        Object {
+          "message": "@automattic/i18n-loader-webpack-plugin:
+Failed to add loader module missingloader to the build.
+You'll need to add the appropriate externals directive to your Webpack config.",
+        },
+      ],
+      "name": undefined,
+      "warnings": Array [
+        Object {
+          "loc": "",
+          "message": "Module not found: Error: Can't resolve 'missingloader' in '/path/to/i18n-loader-webpack-plugin/tests/fixtures/missing-externals'",
+        },
+      ],
+    },
+  ],
   "errors": Array [
     Object {
+      "compilerPath": undefined,
       "message": "@automattic/i18n-loader-webpack-plugin:
-Failed to add state module @wordpress/jp-i18n-state to the build.
+Failed to add loader module @wordpress/jp-i18n-loader to the build.
 You'll need to add @wordpress/dependency-extraction-webpack-plugin or an appropriate externals directive to your Webpack config.",
     },
+    Object {
+      "compilerPath": undefined,
+      "message": "@automattic/i18n-loader-webpack-plugin:
+Failed to add loader module missingloader to the build.
+You'll need to add the appropriate externals directive to your Webpack config.",
+    },
   ],
   "warnings": Array [
     Object {
+      "compilerPath": undefined,
+      "loc": "",
+      "message": "Module not found: Error: Can't resolve '@wordpress/jp-i18n-loader' in '/path/to/i18n-loader-webpack-plugin/tests/fixtures/missing-externals'",
+    },
+    Object {
+      "compilerPath": undefined,
       "loc": "",
-      "message": "Module not found: Error: Can't resolve '@wordpress/jp-i18n-state' in '/path/to/i18n-loader-webpack-plugin/tests/fixtures/missing-externals'",
+      "message": "Module not found: Error: Can't resolve 'missingloader' in '/path/to/i18n-loader-webpack-plugin/tests/fixtures/missing-externals'",
     },
   ],
 }
@@ -873,179 +543,126 @@ exports[`Webpack \`multiple-runtime\` Build results: Webpack build error 1`] = `
 
 exports[`Webpack \`multiple-runtime\` Build results: Webpack build files 1`] = `
 Object {
+  "bar.asset.php": Object {},
   "bar.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "baz.asset.php": Object {},
   "baz.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "main.asset.php": Object {},
   "main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "main2.asset.php": Object {},
   "main2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
-  "runtime~bar.asset.php": Object {},
   "runtime~bar.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
-  "runtime~baz.asset.php": Object {},
   "runtime~baz.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
-  "runtime~main.asset.php": Object {},
   "runtime~main.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"multiple-runtime\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"multiple-runtime\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
-  "runtime~main2.asset.php": Object {},
   "runtime~main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"multiple-runtime\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ],
-/******/ 			\\"hasI18n2\\": [ /* dist/hasI18n2.js */ \\"71d7bd53fc0961d2785c69cde5d9fead\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0,
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"multiple-runtime\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
 }
 `;
@@ -1064,82 +681,56 @@ Object {
   "hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "indirect1.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "indirect2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "main.asset.php": Object {},
   "main.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"nested-includes\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"nested-includes\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
 }
 `;
@@ -1174,18 +765,15 @@ Object {
   "bar.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "baz.asset.php": Object {},
   "baz.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
 }
 `;
@@ -1204,69 +792,91 @@ Object {
   "hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "main.js": Object {
     "jpI18nState": null,
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"options\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* jetpack_vendor/automattic/jetpack-foobar/dist/hasI18n.js */ \\"e54fa518d005a9d82f46a567822e8600\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! state */ \\"state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting state.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! loader */ \\"loader\\");
+/******/ 			if ( loader && loader.doload )
+/******/ 				return loader.doload( \\"jetpack_vendor/automattic/jetpack-foobar/dist/\\" + __webpack_require__.u( chunkId ), \\"options\\", \\"core\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting loader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
+/******/ 						installedChunks[chunkId] = false;
+/******/ 					},
+/******/ 					(e) => {
 /******/ 						installedChunks[chunkId] = 0;
+/******/ 						// Log only, we don't want i18n failure to break the entire page.
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
+/******/ 					}
+/******/ 				) );
+/******/ 			}
+/******/ 		};
+/******/ 	})();",
+  },
+  "main2.asset.php": Object {},
+  "main2.js": Object {
+    "jpI18nState": null,
+    "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
+/******/ 	(() => {
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0
+/******/ 		};
+/******/ 		
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"options\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.i18n.\\" ) );
+/******/ 		};
+/******/ 		
+/******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
+/******/ 			if ( installedChunks[chunkId] ) {
+/******/ 				promises.push( installedChunks[chunkId] );
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
+/******/ 					() => {
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!*************************!*\\\\
-  !*** external \\"wpI18n\\" ***!
-  \\\\*************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = global[\\"wpI18n\\"];
-",
   },
 }
 `;
 
 exports[`Webpack \`options\` Build results: Webpack build stats 1`] = `
 Object {
+  "children": Array [
+    Object {
+      "errors": Array [],
+      "name": undefined,
+      "warnings": Array [],
+    },
+    Object {
+      "errors": Array [],
+      "name": undefined,
+      "warnings": Array [],
+    },
+  ],
   "errors": Array [],
   "warnings": Array [],
 }
@@ -1276,104 +886,78 @@ exports[`Webpack \`single-runtime\` Build results: Webpack build error 1`] = `nu
 
 exports[`Webpack \`single-runtime\` Build results: Webpack build files 1`] = `
 Object {
+  "bar.asset.php": Object {},
   "bar.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "baz.asset.php": Object {},
   "baz.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "hasI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "hasI18n2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "main.asset.php": Object {},
   "main.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
+  "main2.asset.php": Object {},
   "main2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "noI18n.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
-  "runtime.asset.php": Object {},
   "runtime.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"single-runtime\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"hasI18n\\": [ /* dist/hasI18n.js */ \\"c7c3968298452ee95564fb9c05e2de50\\", \\"\\" ],
-/******/ 			\\"hasI18n2\\": [ /* dist/hasI18n2.js */ \\"71d7bd53fc0961d2785c69cde5d9fead\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"hasI18n\\": 0,
+/******/ 			\\"hasI18n2\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"single-runtime\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
 }
 `;
@@ -1392,147 +976,98 @@ Object {
   "indirect1.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "indirect2.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
   "main.asset.php": Object {},
   "main.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"splitting\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"src_hasI18n_js-src_hasI18n2_js\\": [ /* dist/src_hasI18n_js-src_hasI18n2_js.js */ \\"ec0e6fc1bae1bb5c76db79838b127a36\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"src_hasI18n_js-src_hasI18n2_js\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"splitting\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "main2.asset.php": Object {},
   "main2.js": Object {
-    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-state\\":
-/*!*************************************!*\\\\
-  !*** external [\\"wp\\",\\"jpI18nState\\"] ***!
-  \\\\*************************************/
+    "jpI18nState": "/***/ \\"@wordpress/jp-i18n-loader\\":
+/*!**************************************!*\\\\
+  !*** external [\\"wp\\",\\"jpI18nLoader\\"] ***!
+  \\\\**************************************/
 /***/ ((module) => {
 
 \\"use strict\\";
-module.exports = window[\\"wp\\"][\\"jpI18nState\\"];
+module.exports = window[\\"wp\\"][\\"jpI18nLoader\\"];
 ",
     "loader": "/******/ 	/* webpack/runtime/loading @automattic/i18n-loader-webpack-plugin */
 /******/ 	(() => {
-/******/ 		var textdomain = \\"splitting\\";
-/******/ 		var chunkInfo = {
-/******/ 			\\"src_hasI18n_js-src_hasI18n2_js\\": [ /* dist/src_hasI18n_js-src_hasI18n2_js.js */ \\"ec0e6fc1bae1bb5c76db79838b127a36\\", \\"\\" ]
+/******/ 		var installedChunks = {
+/******/ 			\\"src_hasI18n_js-src_hasI18n2_js\\": 0
 /******/ 		};
 /******/ 		
-/******/ 		var loadI18n = (info) => {
-/******/ 			var i18n = __webpack_require__(/*! @wordpress/i18n */ \\"@wordpress/i18n\\");
-/******/ 			var state = __webpack_require__(/*! @wordpress/jp-i18n-state */ \\"@wordpress/jp-i18n-state\\");
-/******/ 			if ( ! state ) return Promise.reject( new Error( \\"I18n state is not available. Check that WordPress is exporting wp.jpI18nState.\\" ) );
-/******/ 			if ( state.locale === \\"en_US\\" ) return Promise.resolve();
-/******/ 			if ( typeof fetch === \\"undefined\\" ) return Promise.reject( new Error( \\"Fetch API is not available.\\" ) );
-/******/ 			return fetch(
-/******/ 				state.baseUrl + ( state.domainMap[textdomain] || ( \\"plugins/\\" + textdomain ) ) + \\"-\\" + state.locale + \\"-\\" + info[0] + \\".json\\" + info[1]
-/******/ 			).then( (res) => {
-/******/ 				if ( ! res.ok ) throw new Error( \\"HTTP request failed: \\" + res.status + \\" \\" + res.statusText );
-/******/ 				return res.json();
-/******/ 			} ).then( (data) => {
-/******/ 				var data2 = data.locale_data;
-/******/ 				var localeData = data2[ textdomain ] || data2.messages;
-/******/ 				localeData[\\"\\"].domain = textdomain;
-/******/ 				i18n.setLocaleData( localeData, textdomain );
-/******/ 			} );
+/******/ 		var loadI18n = (chunkId) => {
+/******/ 			var loader = __webpack_require__(/*! @wordpress/jp-i18n-loader */ \\"@wordpress/jp-i18n-loader\\");
+/******/ 			if ( loader && loader.downloadI18n )
+/******/ 				return loader.downloadI18n( \\"dist/\\" + __webpack_require__.u( chunkId ), \\"splitting\\", \\"plugin\\" );
+/******/ 			return Promise.reject( new Error( \\"I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.\\" ) );
 /******/ 		};
 /******/ 		
-/******/ 		var installedChunks = {};
 /******/ 		__webpack_require__.f.wpI18n = (chunkId, promises) => {
 /******/ 			if ( installedChunks[chunkId] ) {
 /******/ 				promises.push( installedChunks[chunkId] );
-/******/ 			} else if ( installedChunks[chunkId] !== 0 && chunkInfo[chunkId] ) {
-/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkInfo[chunkId] ).then(
+/******/ 			} else if ( installedChunks[chunkId] === 0 ) {
+/******/ 				promises.push( installedChunks[chunkId] = loadI18n( chunkId ).then(
 /******/ 					() => {
-/******/ 						installedChunks[chunkId] = 0;
+/******/ 						installedChunks[chunkId] = false;
 /******/ 					},
 /******/ 					(e) => {
-/******/ 						delete installedChunks[chunkId];
+/******/ 						installedChunks[chunkId] = 0;
 /******/ 						// Log only, we don't want i18n failure to break the entire page.
-/******/ 						console.error( \\"Failed to fetch i18n data:\\", e );
+/******/ 						console.error( \\"Failed to fetch i18n data: \\", e );
 /******/ 					}
 /******/ 				) );
 /******/ 			}
 /******/ 		};
 /******/ 	})();",
-    "wpI18n": "/***/ \\"@wordpress/i18n\\":
-/*!******************************!*\\\\
-  !*** external [\\"wp\\",\\"i18n\\"] ***!
-  \\\\******************************/
-/***/ ((module) => {
-
-\\"use strict\\";
-module.exports = window[\\"wp\\"][\\"i18n\\"];
-",
   },
   "src_hasI18n_js-src_hasI18n2_js.js": Object {
     "jpI18nState": null,
     "loader": null,
-    "wpI18n": null,
   },
 }
 `;
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/build.test.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/build.test.js
index ecc407988b2c0..73011112c665d 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/build.test.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/build.test.js
@@ -42,7 +42,7 @@ function lsFiles( dir ) {
 }
 
 beforeEach( () => {
-	fetch.urls = {};
+	global.jpI18nLoader.expect = {};
 } );
 
 const fixturesPath = path.join( __dirname, 'fixtures' );
@@ -104,10 +104,9 @@ describe.each( configFixtures )( 'Webpack `%s`', fixture => {
 			const data = {};
 			if ( file.endsWith( '.js' ) ) {
 				const content = fs.readFileSync( path.join( builddir, file ), { encoding: 'utf8' } );
-				data.wpI18n = extractSection( content, '/***/ "@wordpress/i18n":\n', '/***/ })' );
 				data.jpI18nState = extractSection(
 					content,
-					'/***/ "@wordpress/jp-i18n-state":\n',
+					'/***/ "@wordpress/jp-i18n-loader":\n',
 					'/***/ })'
 				);
 				data.loader = extractSection(
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/basic-test/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/basic-test/tests.js
index 1c157fced3d99..56d4ee9cdeef1 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/basic-test/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/basic-test/tests.js
@@ -1,3 +1,5 @@
+/* global jpI18nLoader */
+
 test( 'Tests', async () => {
 	const main = require( './dist/main.js' );
 	const bar = require( './dist/bar.js' );
@@ -6,10 +8,7 @@ test( 'Tests', async () => {
 
 	expect( await main.noI18n() ).toEqual( 'No i18n here' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/basic-test-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n.js', translations );
 	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/src/hasI18n.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/src/hasI18n.js
deleted file mode 100644
index 9c9a9d62e6155..0000000000000
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/src/hasI18n.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const i18n = require( '@wordpress/i18n' );
-
-module.exports = i18n.__( 'This is translated', 'fetch-failures' );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/tests.js
deleted file mode 100644
index 02e0a1028e30e..0000000000000
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/tests.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* global wpI18n */
-
-describe( 'Tests', () => {
-	let spy;
-
-	beforeEach( () => {
-		spy = jest.spyOn( global.console, 'error' ).mockImplementation( () => {} );
-		wpI18n.resetLocaleData( {}, 'fetch-failures' );
-	} );
-	afterEach( () => {
-		spy.mockRestore();
-	} );
-
-	const getBundle = () => {
-		let a;
-		jest.isolateModules( () => {
-			a = require( './dist/a.js' );
-		} );
-		return a;
-	};
-
-	test( 'Control', async () => {
-		const a = getBundle();
-		fetch.expectUrl(
-			'http://test.example.com/wp-content/languages/plugins/fetch-failures-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-			require( './en_piglatin.json' )
-		);
-		expect( await a.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
-		expect( spy ).not.toHaveBeenCalled();
-	} );
-
-	test( 'No fetch', async () => {
-		const a = getBundle();
-		const fetch = global.fetch;
-		try {
-			delete global.fetch;
-			expect( await a.hasI18n() ).toEqual( 'This is translated' );
-		} finally {
-			global.fetch = fetch;
-		}
-		expect( spy ).toHaveBeenCalledTimes( 1 );
-		expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data:', expect.any( Error ) );
-		expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual( 'Fetch API is not available.' );
-	} );
-
-	test( 'An HTTP 404 error', async () => {
-		const a = getBundle();
-		fetch.expectUrl(
-			'http://test.example.com/wp-content/languages/plugins/fetch-failures-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-			'The specified document was not found.',
-			{ status: 404, statusText: 'Not found' }
-		);
-		expect( await a.hasI18n() ).toEqual( 'This is translated' );
-		expect( spy ).toHaveBeenCalledTimes( 1 );
-		expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data:', expect.any( Error ) );
-		expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual( 'HTTP request failed: 404 Not found' );
-	} );
-
-	test( 'A fetch error', async () => {
-		const a = getBundle();
-		const err = new Error( 'Test error' );
-		fetch.expectError(
-			'http://test.example.com/wp-content/languages/plugins/fetch-failures-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-			err
-		);
-		expect( await a.hasI18n() ).toEqual( 'This is translated' );
-		expect( spy ).toHaveBeenCalledTimes( 1 );
-		expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data:', err );
-	} );
-
-	test( 'Invalid JSON data', async () => {
-		const a = getBundle();
-		fetch.expectUrl(
-			'http://test.example.com/wp-content/languages/plugins/fetch-failures-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-			'Invalid JSON'
-		);
-		expect( await a.hasI18n() ).toEqual( 'This is translated' );
-		expect( spy ).toHaveBeenCalledTimes( 1 );
-		expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data:', expect.any( Error ) );
-		expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual(
-			'Unexpected token I in JSON at position 0'
-		);
-	} );
-} );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/src/index.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/src/index.js
index 6100739627033..9e109f268fd37 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/src/index.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/src/index.js
@@ -1,5 +1,4 @@
 module.exports = {
-	md5: async () => ( await import( /* webpackChunkName: "md5" */ 'md5-es' ) ).default.hash,
 	noI18n: async () => ( await import( /* webpackChunkName: "noI18n" */ './noI18n.js' ) ).default,
 	hasI18n: async () => ( await import( /* webpackChunkName: "hasI18n" */ './hasI18n.js' ) ).default,
 };
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/tests.js
index bc05b2f2e40b9..6fe52c832295f 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/ignore-modules/tests.js
@@ -1,5 +1,4 @@
-/* global wpI18n */
-const { default: md5 } = require( 'md5-es' );
+/* global jpI18nLoader, wpI18n */
 
 describe( 'Test ignoreModules as', () => {
 	beforeEach( () => {
@@ -10,16 +9,12 @@ describe( 'Test ignoreModules as', () => {
 	test.each( whats )( 'a %s', async what => {
 		const main = require( `./dist/${ what }/main.js` );
 		const main2 = require( `./dist/${ what }/main2.js` );
-		const hash = md5.hash( `dist/${ what }/hasI18n2.js` );
 
 		expect( await main.noI18n() ).toEqual( 'No i18n here' );
 		expect( await main.hasI18n() ).toEqual( 'This is translated' );
 
 		expect( await main2.hasI18n() ).toEqual( 'This is translated' );
-		fetch.expectUrl(
-			`http://test.example.com/wp-content/languages/plugins/ignore-modules-en_piglatin-${ hash }.json`,
-			require( './en_piglatin.json' )
-		);
+		jpI18nLoader.expectI18n( `dist/${ what }/hasI18n2.js`, require( './en_piglatin.json' ) );
 		expect( await main2.hasI18n2() ).toEqual( 'is-Thay is-way anslated-tray oo-tay' );
 	} );
 } );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/en_piglatin.json b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/en_piglatin.json
similarity index 100%
rename from projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/en_piglatin.json
rename to projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/en_piglatin.json
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/src/hasI18n.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/src/hasI18n.js
new file mode 100644
index 0000000000000..184f6de9048c3
--- /dev/null
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/src/hasI18n.js
@@ -0,0 +1,3 @@
+const i18n = require( '@wordpress/i18n' );
+
+module.exports = i18n.__( 'This is translated', 'loader-failures' );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/src/index.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/src/index.js
similarity index 100%
rename from projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/src/index.js
rename to projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/src/index.js
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/tests.js
new file mode 100644
index 0000000000000..58cc09e6a823f
--- /dev/null
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/tests.js
@@ -0,0 +1,67 @@
+/* global jpI18nLoader, wpI18n */
+
+describe( 'Tests', () => {
+	let spy;
+
+	beforeEach( () => {
+		spy = jest.spyOn( global.console, 'error' ).mockImplementation( () => {} );
+		wpI18n.resetLocaleData( {}, 'loader-failures' );
+	} );
+	afterEach( () => {
+		spy.mockRestore();
+	} );
+
+	const getBundle = () => {
+		let a;
+		jest.isolateModules( () => {
+			a = require( './dist/a.js' );
+		} );
+		return a;
+	};
+
+	test( 'Control', async () => {
+		const a = getBundle();
+		jpI18nLoader.expectI18n( 'dist/hasI18n.js', require( './en_piglatin.json' ) );
+		expect( await a.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
+		expect( spy ).not.toHaveBeenCalled();
+	} );
+
+	test( 'Missing loader object', async () => {
+		delete window.wp.jpI18nLoader;
+		try {
+			const a = getBundle();
+			expect( await a.hasI18n() ).toEqual( 'This is translated' );
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data: ', expect.any( Error ) );
+			expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual( 'I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.' );
+		} finally {
+			window.wp.jpI18nLoader = global.jpI18nLoader;
+		}
+	} );
+
+	test( 'Missing loader method', async () => {
+		window.wp.jpI18nLoader = {};
+		try {
+			const a = getBundle();
+			expect( await a.hasI18n() ).toEqual( 'This is translated' );
+			expect( spy ).toHaveBeenCalledTimes( 1 );
+			expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data: ', expect.any( Error ) );
+			expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual( 'I18n loader is not available. Check that WordPress is exporting wp.jpI18nLoader.' );
+		} finally {
+			window.wp.jpI18nLoader = global.jpI18nLoader;
+		}
+	} );
+
+	test( 'Failed download', async () => {
+		const a = getBundle();
+		jpI18nLoader.expectError(
+			'dist/hasI18n.js',
+			new Error( 'The specified document was not found.' )
+		);
+		expect( await a.hasI18n() ).toEqual( 'This is translated' );
+		expect( spy ).toHaveBeenCalledTimes( 1 );
+		expect( spy ).toHaveBeenCalledWith( 'Failed to fetch i18n data: ', expect.any( Error ) );
+		expect( spy.mock.calls[ 0 ][ 1 ].message ).toEqual( 'The specified document was not found.' );
+	} );
+
+} );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/webpack.config.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/webpack.config.js
similarity index 87%
rename from projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/webpack.config.js
rename to projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/webpack.config.js
index edb7ca6504ba5..2d819393723f6 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/fetch-failures/webpack.config.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/loader-failures/webpack.config.js
@@ -15,7 +15,7 @@ module.exports = {
 		},
 	},
 	plugins: [
-		new I18nLoaderPlugin( { textdomain: 'fetch-failures' } ),
+		new I18nLoaderPlugin( { textdomain: 'loader-failures' } ),
 		new DependencyExtractionPlugin(),
 	],
 };
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/tests.js
index 32bdbe0fa3461..1dc5193287650 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/tests.js
@@ -1,4 +1,4 @@
-/* global wpI18n */
+/* global jpI18nLoader, wpI18n */
 
 describe( 'Tests', () => {
 	afterEach( () => {
@@ -7,24 +7,8 @@ describe( 'Tests', () => {
 
 	test( 'External from the global', async () => {
 		const main = require( './dist/main.js' );
-		fetch.expectUrl(
-			'http://test.example.com/wp-content/languages/plugins/manual-externals-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-			require( './en_piglatin.json' )
-		);
+		jpI18nLoader.expectI18n( 'dist/hasI18n.js', require( './en_piglatin.json' ) );
 		expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 	} );
 
-	test( 'Hard-coded "external", with locale en_US', async () => {
-		const main2 = require( './dist/main2.js' );
-		expect( await main2.hasI18n() ).toEqual( 'This is translated' );
-	} );
-
-	test( 'Hard-coded "external", with different baseUrl, locale, and domainMap', async () => {
-		const main3 = require( './dist/main3.js' );
-		fetch.expectUrl(
-			'http://example.org/themes/remapped-en_us-c7c3968298452ee95564fb9c05e2de50.json',
-			require( './en_us.json' )
-		);
-		expect( await main3.hasI18n() ).toEqual( 'Thus us trunslutud' );
-	} );
 } );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/webpack.config.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/webpack.config.js
index f03df7a7f4114..6c991a3193b5c 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/webpack.config.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/manual-externals/webpack.config.js
@@ -21,41 +21,7 @@ module.exports = [
 		},
 		externals: {
 			'@wordpress/i18n': 'global wpI18n',
-			'@wordpress/jp-i18n-state': 'global jpI18nState',
-		},
-	},
-	{
-		...shared,
-		entry: {
-			main2: './src/index.js',
-		},
-		externals: {
-			'@wordpress/i18n': 'global wpI18n',
-			'@wordpress/jp-i18n-state':
-				'var ' +
-				JSON.stringify( {
-					baseUrl: 'http://example.org/',
-					locale: 'en_US',
-					domainMap: {},
-				} ),
-		},
-	},
-	{
-		...shared,
-		entry: {
-			main3: './src/index.js',
-		},
-		externals: {
-			'@wordpress/i18n': 'global wpI18n',
-			'@wordpress/jp-i18n-state':
-				'var ' +
-				JSON.stringify( {
-					baseUrl: 'http://example.org/',
-					locale: 'en_us',
-					domainMap: {
-						'manual-externals': 'themes/remapped',
-					},
-				} ),
+			'@wordpress/jp-i18n-loader': 'global jpI18nLoader',
 		},
 	},
 ];
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/missing-externals/webpack.config.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/missing-externals/webpack.config.js
index 38ce5910c3f1f..52c897ec2134a 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/missing-externals/webpack.config.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/missing-externals/webpack.config.js
@@ -1,20 +1,40 @@
 const I18nLoaderPlugin = require( '../../../src/I18nLoaderPlugin.js' );
 
-module.exports = {
-	target: 'async-node',
-	mode: 'development',
-	devtool: false,
-	entry: {
-		main: './src/index.js',
-	},
-	output: {
-		chunkFilename: '[name].js',
-		library: {
-			type: 'commonjs2',
+module.exports = [
+	{
+		target: 'async-node',
+		mode: 'development',
+		devtool: false,
+		entry: {
+			main: './src/index.js',
+		},
+		output: {
+			chunkFilename: '[name].js',
+			library: {
+				type: 'commonjs2',
+			},
+		},
+		plugins: [ new I18nLoaderPlugin( { textdomain: 'missing-externals' } ) ],
+		externals: {
+			'@wordpress/i18n': 'global wpI18n',
 		},
 	},
-	plugins: [ new I18nLoaderPlugin( { textdomain: 'missing-externals' } ) ],
-	externals: {
-		'@wordpress/i18n': 'global wpI18n',
+	{
+		target: 'async-node',
+		mode: 'development',
+		devtool: false,
+		entry: {
+			main: './src/index.js',
+		},
+		output: {
+			chunkFilename: '[name].js',
+			library: {
+				type: 'commonjs2',
+			},
+		},
+		plugins: [ new I18nLoaderPlugin( { textdomain: 'missing-externals', loaderModule: 'missingloader' } ) ],
+		externals: {
+			'@wordpress/i18n': 'global wpI18n',
+		},
 	},
-};
+];
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/multiple-runtime/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/multiple-runtime/tests.js
index 8740d6721440d..66c3b4ae68ca8 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/multiple-runtime/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/multiple-runtime/tests.js
@@ -1,3 +1,4 @@
+/* global jpI18nLoader */
 test( 'Tests', async () => {
 	const main = require( './dist/main.js' );
 	const main2 = require( './dist/main2.js' );
@@ -7,21 +8,12 @@ test( 'Tests', async () => {
 
 	expect( await main.noI18n() ).toEqual( 'No i18n here' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/multiple-runtime-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n.js', translations );
 	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/multiple-runtime-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n.js', translations );
 	expect( await main2.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/multiple-runtime-en_piglatin-71d7bd53fc0961d2785c69cde5d9fead.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n2.js', translations );
 	expect( await main2.hasI18n2() ).toEqual( 'is-Thay is-way anslated-tray oo-tay' );
 
 	expect( bar ).toEqual( 'No submodules here' );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/nested-includes/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/nested-includes/tests.js
index 711976d1a8fdc..d8c663e36f56b 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/nested-includes/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/nested-includes/tests.js
@@ -1,9 +1,7 @@
+/* global jpI18nLoader */
 test( 'Tests', async () => {
 	const main = require( './dist/main.js' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/nested-includes-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-		require( './en_piglatin.json' )
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n.js', require( './en_piglatin.json' ) );
 	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 } );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/tests.js
index a531db460b51a..c605e5e581d13 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/tests.js
@@ -1,8 +1,28 @@
-test( 'Tests', async () => {
-	const main = require( './dist/main.js' );
-	fetch.expectUrl(
-		'http://example.org/options-en_piglatin-e54fa518d005a9d82f46a567822e8600.json',
-		require( './en_piglatin.json' )
-	);
-	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
+/* global I18nLoader, jpI18nLoader, wpI18n */
+
+test( 'Options', async () => {
+	global.optionLoader = new I18nLoader();
+	optionLoader.doload = optionLoader.downloadI18n;
+	delete optionLoader.downloadI18n;
+
+	try {
+		const main = require( './dist/main.js' );
+		optionLoader.expectI18n( 'jetpack_vendor/automattic/jetpack-foobar/dist/hasI18n.js', require( './en_piglatin.json' ) );
+		expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
+	} finally {
+		delete global.optionLoader;
+	}
+} );
+
+test( 'Loader is @wordpress/i18n', async () => {
+	delete global.window.wp.jpI18nLoader;
+	wpI18n.downloadI18n = jpI18nLoader.downloadI18n.bind( jpI18nLoader );
+	try {
+		const main2 = require( './dist/main2.js' );
+		jpI18nLoader.expectI18n( 'dist/hasI18n.js', require( './en_piglatin.json' ) );
+		expect( await main2.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
+	} finally {
+		global.window.wp.jpI18nLoader = global.jpI18nLoader;
+		delete wpI18n.downloadI18n;
+	}
 } );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/webpack.config.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/webpack.config.js
index e5db088104eb7..fc299a47d7df1 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/webpack.config.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/options/webpack.config.js
@@ -1,34 +1,53 @@
 const I18nLoaderPlugin = require( '../../../src/I18nLoaderPlugin.js' );
+const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
 
-module.exports = {
-	target: 'async-node',
-	mode: 'development',
-	devtool: false,
-	entry: {
-		main: './src/index.js',
-	},
-	output: {
-		chunkFilename: '[name].js',
-		library: {
-			type: 'commonjs2',
+module.exports = [
+	{
+		target: 'async-node',
+		mode: 'development',
+		devtool: false,
+		entry: {
+			main: './src/index.js',
+		},
+		output: {
+			chunkFilename: '[name].js',
+			library: {
+				type: 'commonjs2',
+			},
+		},
+		plugins: [
+			new I18nLoaderPlugin( {
+				textdomain: 'options',
+				loaderModule: 'loader',
+				loaderMethod: 'doload',
+				target: 'core',
+				path: 'jetpack_vendor/automattic/jetpack-foobar/dist',
+			} ),
+		],
+		externals: {
+			'@wordpress/i18n': 'global wpI18n',
+			loader: 'global optionLoader',
 		},
 	},
-	plugins: [
-		new I18nLoaderPlugin( {
-			textdomain: 'options',
-			stateModule: 'state',
-			target: 'core',
-			path: 'jetpack_vendor/automattic/jetpack-foobar/dist',
-		} ),
-	],
-	externals: {
-		'@wordpress/i18n': 'global wpI18n',
-		state:
-			'var ' +
-			JSON.stringify( {
-				baseUrl: 'http://example.org/',
-				locale: 'en_piglatin',
-				domainMap: {},
+	{
+		target: 'async-node',
+		mode: 'development',
+		devtool: false,
+		entry: {
+			main2: './src/index.js',
+		},
+		output: {
+			chunkFilename: '[name].js',
+			library: {
+				type: 'commonjs2',
+			},
+		},
+		plugins: [
+			new I18nLoaderPlugin( {
+				textdomain: 'options',
+				loaderModule: '@wordpress/i18n',
 			} ),
+			new DependencyExtractionPlugin(),
+		],
 	},
-};
+];
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/single-runtime/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/single-runtime/tests.js
index ee98107ad52a9..7bdf0eede469e 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/single-runtime/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/single-runtime/tests.js
@@ -1,3 +1,4 @@
+/* global jpI18nLoader */
 test( 'Tests', async () => {
 	const main = require( './dist/main.js' );
 	const main2 = require( './dist/main2.js' );
@@ -7,16 +8,10 @@ test( 'Tests', async () => {
 
 	expect( await main.noI18n() ).toEqual( 'No i18n here' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/single-runtime-en_piglatin-c7c3968298452ee95564fb9c05e2de50.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n.js', translations );
 	expect( await main.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/single-runtime-en_piglatin-71d7bd53fc0961d2785c69cde5d9fead.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/hasI18n2.js', translations );
 	expect( await main2.hasI18n() ).toEqual( 'is-Thay is-way anslated-tray' );
 	expect( await main2.hasI18n2() ).toEqual( 'is-Thay is-way anslated-tray oo-tay' );
 
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/splitting/tests.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/splitting/tests.js
index c90ae953c4142..e7ac596dadf8c 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/splitting/tests.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/fixtures/splitting/tests.js
@@ -1,19 +1,14 @@
+/* global jpI18nLoader */
 test( 'Tests', async () => {
 	const main = require( './dist/main.js' );
 	const main2 = require( './dist/main2.js' );
 	const translations = require( './en_piglatin.json' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/splitting-en_piglatin-ec0e6fc1bae1bb5c76db79838b127a36.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/src_hasI18n_js-src_hasI18n2_js.js', translations );
 	expect( ( await main() ).a ).toEqual( 'is-Thay is-way anslated-tray' );
 	expect( ( await main() ).b ).toEqual( 'is-Thay is-way anslated-tray oo-tay' );
 
-	fetch.expectUrl(
-		'http://test.example.com/wp-content/languages/plugins/splitting-en_piglatin-ec0e6fc1bae1bb5c76db79838b127a36.json',
-		translations
-	);
+	jpI18nLoader.expectI18n( 'dist/src_hasI18n_js-src_hasI18n2_js.js', translations );
 	expect( ( await main2() ).x ).toEqual( 'is-Thay is-way anslated-tray' );
 	expect( ( await main2() ).y ).toEqual( 'is-Thay is-way anslated-tray oo-tay' );
 } );
diff --git a/projects/js-packages/i18n-loader-webpack-plugin/tests/globals.js b/projects/js-packages/i18n-loader-webpack-plugin/tests/globals.js
index d06d9c32c0607..70e2d97c0bb58 100644
--- a/projects/js-packages/i18n-loader-webpack-plugin/tests/globals.js
+++ b/projects/js-packages/i18n-loader-webpack-plugin/tests/globals.js
@@ -1,69 +1,66 @@
-// Some globals the tests will probably want.
 global.wpI18n = require( '@wordpress/i18n' );
-global.jpI18nState = {
-	baseUrl: 'http://test.example.com/wp-content/languages/',
-	locale: 'en_piglatin',
-	domainMap: {},
-};
-global.window = {
-	...global.window,
-	wp: {
-		i18n: global.wpI18n,
-		jpI18nState: global.jpI18nState,
-	},
-};
 
-// Simple fetch mock, sufficient for our purposes.
-global.fetch = jest.fn( url => {
-	const ret = fetch.urls[ url ];
-	if ( typeof ret === 'undefined' ) {
-		throw new Error( `Unexpected URL ${ url }` );
-	}
-	if ( ret === null ) {
-		throw new Error( `URL ${ url } was requested multiple times` );
-	}
-	fetch.urls[ url ] = null;
-	return ret;
-} );
-fetch.urls = {};
+/** Loader class. */
+class I18nLoader {
+	/** Map paths to promise-factory functions. */
+	expect = {};
 
-/**
- * Mock a URL.
- *
- * @param {string} url - URL.
- * @param {*}      body - Response body. If not a string, it will be passed through `JSON.stringify()`.
- * @param {object} init - Additional response data.
- * @param {number} init.status - Response status. Default 200.
- * @param {string} init.statusText - Response status text. Default "OK".
- */
-fetch.expectUrl = ( url, body, init = {} ) => {
-	const status = parseInt( init.status || 200 );
-	const statusText = init.statusText || 'OK';
-
-	let rbody = body;
-	if ( typeof rbody !== 'string' ) {
-		rbody = JSON.stringify( rbody );
+	/**
+	 * "Download" an i18n file.
+	 *
+	 * Actually just returns a promise from `this.expect`, if any,
+	 * or throws an error.
+	 *
+	 * @param {string} path - Path being "downloaded".
+	 * @param {string} domain - Text domain.
+	 * @returns {Promise} Promise.
+	 */
+	downloadI18n( path, domain ) {
+		const ret = this.expect[ path ];
+		if ( typeof ret === 'undefined' ) {
+			throw new Error( `Unexpected call for ${ path }` );
+		}
+		if ( ret === null ) {
+			throw new Error( `Path ${ path } was requested multiple times` );
+		}
+		this.expect[ expect ] = null;
+		return ret( domain );
 	}
-	if ( status < 200 || status > 599 ) {
-		throw new Error( `Invalid status: ${ init.status }` );
+
+	/**
+	 * Mock a path.
+	 *
+	 * @param {string} path - Path.
+	 * @param {object} data - I18n data.
+	 */
+	expectI18n( path, data ) {
+		this.expect[ path ] = domain => {
+			const localeData = data.locale_data[ domain ] || data.locale_data.messages;
+			localeData[ '' ].domain = domain;
+			global.wpI18n.setLocaleData( localeData, domain );
+			return Promise.resolve();
+		};
 	}
 
-	fetch.urls[ url ] = Promise.resolve( {
-		body: rbody,
-		ok: status < 300,
-		status: status,
-		statusText: statusText,
-		url: url,
-		json: () => JSON.parse( rbody ),
-	} );
-};
+	/**
+	 * Mock an error.
+	 *
+	 * @param {string} path - Path.
+	 * @param {Error}  err - Error.
+	 */
+	expectError = ( path, err ) => {
+		this.expect[ path ] = () => {
+			return Promise.reject( err );
+		};
+	};
+}
 
-/**
- * Mock a fetch error.
- *
- * @param {string} url - URL.
- * @param {Error}  err - Error.
- */
-fetch.expectError = ( url, err ) => {
-	fetch.urls[ url ] = Promise.reject( err );
+global.I18nLoader = I18nLoader;
+global.jpI18nLoader = new I18nLoader();
+global.window = {
+	...global.window,
+	wp: {
+		i18n: global.wpI18n,
+		jpI18nLoader: global.jpI18nLoader,
+	},
 };
diff --git a/projects/js-packages/idc/CHANGELOG.md b/projects/js-packages/idc/CHANGELOG.md
index 0dfde7ddddb14..c7a23c53a76e2 100644
--- a/projects/js-packages/idc/CHANGELOG.md
+++ b/projects/js-packages/idc/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ### This is a list detailing changes for the Jetpack RNA IDC package releases.
 
+## 0.9.1 - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## 0.9.0 - 2022-01-25
+### Added
+- Additional package customization parameters.
+- Allow customized text to contain HTML tags.
+
 ## 0.8.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/idc/changelog/add-fancy-eslint-ignore b/projects/js-packages/idc/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/idc/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/idc/changelog/add-idc-customizate-labels b/projects/js-packages/idc/changelog/add-idc-customizate-labels
deleted file mode 100644
index 0fa1cc11d4121..0000000000000
--- a/projects/js-packages/idc/changelog/add-idc-customizate-labels
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Additional package customization parameters.
diff --git a/projects/js-packages/idc/changelog/add-idc-customizer-tags b/projects/js-packages/idc/changelog/add-idc-customizer-tags
deleted file mode 100644
index 84270131a2ac2..0000000000000
--- a/projects/js-packages/idc/changelog/add-idc-customizer-tags
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Allow customized text to contain HTML tags.
diff --git a/projects/js-packages/storybook/changelog/renovate-css-loader-6.x#2 b/projects/js-packages/idc/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-css-loader-6.x#2
rename to projects/js-packages/idc/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-10-13-15-55-37-502807 b/projects/js-packages/idc/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-10-13-15-55-37-502807
rename to projects/js-packages/idc/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/idc/changelog/update-project-scripts-no-install b/projects/js-packages/idc/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/idc/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json
index 24f7dff2a07cb..209c96a35b5a6 100644
--- a/projects/js-packages/idc/package.json
+++ b/projects/js-packages/idc/package.json
@@ -1,21 +1,21 @@
 {
 	"name": "@automattic/jetpack-idc",
-	"version": "0.9.0-alpha",
+	"version": "0.9.2-alpha",
 	"description": "Jetpack Connection Component",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@automattic/jetpack-analytics": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@wordpress/base-styles": "4.0.4",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/compose": "5.0.7",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/element": "4.0.4",
-		"@wordpress/i18n": "4.2.4",
-		"@wordpress/url": "3.3.1",
+		"@automattic/jetpack-analytics": "workspace:^0.1.7",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@wordpress/base-styles": "4.1.0",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/compose": "5.1.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/element": "4.1.0",
+		"@wordpress/i18n": "4.3.0",
+		"@wordpress/url": "3.4.0",
 		"prop-types": "^15.7.2"
 	},
 	"devDependencies": {
diff --git a/projects/js-packages/licensing/CHANGELOG.md b/projects/js-packages/licensing/CHANGELOG.md
index 2294f16227519..fd703e8778e39 100644
--- a/projects/js-packages/licensing/CHANGELOG.md
+++ b/projects/js-packages/licensing/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.4.5 - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## 0.4.4 - 2022-01-25
+### Added
+- Add missing dev dependency on `nyc` for code coverage.
+
 ## 0.4.3 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/licensing/changelog/add-fancy-eslint-ignore b/projects/js-packages/licensing/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/licensing/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/renovate-emotion-monorepo b/projects/js-packages/licensing/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-emotion-monorepo
rename to projects/js-packages/licensing/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-10-26-11-37-27-239390 b/projects/js-packages/licensing/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-10-26-11-37-27-239390
rename to projects/js-packages/licensing/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/licensing/changelog/update-license-activation-dialog-text b/projects/js-packages/licensing/changelog/update-license-activation-dialog-text
new file mode 100644
index 0000000000000..c5a4bafa414e7
--- /dev/null
+++ b/projects/js-packages/licensing/changelog/update-license-activation-dialog-text
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Update wording of Activation Dialog window
diff --git a/projects/js-packages/licensing/changelog/update-project-scripts-no-install b/projects/js-packages/licensing/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/licensing/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/licensing/components/activation-screen-success-info/product-details/index.js b/projects/js-packages/licensing/components/activation-screen-success-info/product-details/index.js
index 7a1816bea52aa..aef0c7dae2ba0 100644
--- a/projects/js-packages/licensing/components/activation-screen-success-info/product-details/index.js
+++ b/projects/js-packages/licensing/components/activation-screen-success-info/product-details/index.js
@@ -33,14 +33,14 @@ const JetpackProductDetails = props => {
 
 	const productInfoMap = {
 		jetpack_anti_spam: {
-			title: __( 'Your Jetpack Anti-spam is active!', 'jetpack' ),
+			title: __( 'Jetpack Anti-spam is active!', 'jetpack' ),
 			text: __(
 				"We'll take care of everything from here. Now you can enjoy a spam-free site!",
 				'jetpack'
 			),
 		},
 		jetpack_backup: {
-			title: __( 'Your Jetpack Backup is active!', 'jetpack' ),
+			title: __( 'Jetpack Backup is active!', 'jetpack' ),
 			text: createInterpolateElement(
 				__(
 					'You can see your backups and restore your site on <a>cloud.jetpack.com</a>. If you ever lose access to your site, you can restore it there.',
@@ -52,7 +52,7 @@ const JetpackProductDetails = props => {
 			),
 		},
 		jetpack_complete: {
-			title: __( 'Your Jetpack Complete is active!', 'jetpack' ),
+			title: __( 'Jetpack Complete is active!', 'jetpack' ),
 			text: createInterpolateElement(
 				__(
 					'You can see your backups, security scans, and restore your site on <a>cloud.jetpack.com</a>. If you ever lose access to your site, you can restore it there.',
@@ -64,7 +64,7 @@ const JetpackProductDetails = props => {
 			),
 		},
 		jetpack_scan: {
-			title: __( 'Your Jetpack Scan is active!', 'jetpack' ),
+			title: __( 'Jetpack Scan is active!', 'jetpack' ),
 			text: createInterpolateElement(
 				__( 'You can see your security scans on <a>cloud.jetpack.com</a>.', 'jetpack' ),
 				{
@@ -73,14 +73,14 @@ const JetpackProductDetails = props => {
 			),
 		},
 		jetpack_search: {
-			title: __( 'Your Jetpack Search is active!', 'jetpack' ),
+			title: __( 'Jetpack Search is active!', 'jetpack' ),
 			text: __(
-				"Next, we'll help you customize your Search experience for your visitors.",
+				"Next, we'll help you customize the Search experience for your visitors.",
 				'jetpack'
 			),
 		},
 		jetpack_security: {
-			title: __( 'Your Jetpack Security is active!', 'jetpack' ),
+			title: __( 'Jetpack Security is active!', 'jetpack' ),
 			text: createInterpolateElement(
 				__(
 					'You can see your backups, security scans, and restore your site on <a>cloud.jetpack.com</a>. If you ever lose access to your site, you can restore it there.',
@@ -92,7 +92,7 @@ const JetpackProductDetails = props => {
 			),
 		},
 		jetpack_videopress: {
-			title: __( 'Your Jetpack Videopress is active!', 'jetpack' ),
+			title: __( 'Jetpack VideoPress is active!', 'jetpack' ),
 			text: __(
 				'Experience high-quality, ad-free video built specifically for WordPress.',
 				'jetpack'
diff --git a/projects/js-packages/licensing/components/activation-screen-success-info/test/component.jsx b/projects/js-packages/licensing/components/activation-screen-success-info/test/component.jsx
index 5f33c444cd9b7..e2c92feb6a37f 100644
--- a/projects/js-packages/licensing/components/activation-screen-success-info/test/component.jsx
+++ b/projects/js-packages/licensing/components/activation-screen-success-info/test/component.jsx
@@ -27,9 +27,7 @@ describe( 'ActivationSuccessInfo', () => {
 		} );
 
 		it( 'shows the correct product name', () => {
-			expect( jetpackProductDetailsComponent.text() ).to.contain(
-				'Your Jetpack Backup is active!'
-			);
+			expect( jetpackProductDetailsComponent.text() ).to.contain( 'Jetpack Backup is active!' );
 		} );
 	} );
 } );
diff --git a/projects/js-packages/licensing/package.json b/projects/js-packages/licensing/package.json
index b58052ac35b23..20cb698af6836 100644
--- a/projects/js-packages/licensing/package.json
+++ b/projects/js-packages/licensing/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-licensing",
-	"version": "0.4.4-alpha",
+	"version": "0.4.6-alpha",
 	"description": "Jetpack licensing flow",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -20,9 +20,10 @@
 		"@babel/core": "7.16.0",
 		"@babel/preset-react": "7.16.0",
 		"jetpack-js-test-runner": "workspace:*",
+		"nyc": "15.1.0",
 		"react": "17.0.2",
 		"react-test-renderer": "17.0.2",
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha"
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha"
 	},
 	"engines": {
 		"node": "^14.18.3 || ^16.13.2",
@@ -35,12 +36,12 @@
 		"./action-types": "./src/state/action-types"
 	},
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@wordpress/i18n": "4.2.4",
-		"@wordpress/element": "4.0.4",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@wordpress/i18n": "4.3.0",
+		"@wordpress/element": "4.1.0",
 		"prop-types": "15.7.2",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/icons": "6.1.1"
+		"@wordpress/components": "19.3.0",
+		"@wordpress/icons": "6.2.0"
 	}
 }
diff --git a/projects/js-packages/partner-coupon/CHANGELOG.md b/projects/js-packages/partner-coupon/CHANGELOG.md
index e6c9055c4aee0..33b1eba84856b 100644
--- a/projects/js-packages/partner-coupon/CHANGELOG.md
+++ b/projects/js-packages/partner-coupon/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.7 - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## 0.1.6 - 2022-01-25
+### Added
+- Add missing dev dependency on `nyc` for code coverage.
+
+### Changed
+- Updated package dependencies.
+
 ## 0.1.5 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/partner-coupon/changelog/add-fancy-eslint-ignore b/projects/js-packages/partner-coupon/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/partner-coupon/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/renovate-pin-dependencies b/projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-pin-dependencies
rename to projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-11-02-12-22-14-382297 b/projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-11-02-12-22-14-382297
rename to projects/js-packages/partner-coupon/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/partner-coupon/changelog/update-project-scripts-no-install b/projects/js-packages/partner-coupon/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/partner-coupon/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/partner-coupon/package.json b/projects/js-packages/partner-coupon/package.json
index 2d19bc1733d03..de8c17b8ec756 100644
--- a/projects/js-packages/partner-coupon/package.json
+++ b/projects/js-packages/partner-coupon/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-partner-coupon",
-	"version": "0.1.6-alpha",
+	"version": "0.1.8-alpha",
 	"description": "This package aims to add components to make it easier to redeem partner coupons",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -20,15 +20,16 @@
 		"@babel/core": "7.16.0",
 		"@babel/preset-react": "7.16.0",
 		"jetpack-js-test-runner": "workspace:*",
+		"nyc": "15.1.0",
 		"react": "17.0.2"
 	},
 	"peerDependencies": {
 		"react": "^17.0.2"
 	},
 	"dependencies": {
-		"@automattic/jetpack-connection": "workspace:^0.14.0-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@wordpress/i18n": "4.2.4",
+		"@automattic/jetpack-connection": "workspace:^0.15.1-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@wordpress/i18n": "4.3.0",
 		"classnames": "2.3.1",
 		"prop-types": "15.7.2"
 	},
diff --git a/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md b/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md
index 53ce0bd42d302..5f77db3cc9eeb 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md
+++ b/projects/js-packages/remove-asset-webpack-plugin/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.0.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -25,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release.
 
+[1.0.3]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/Automattic/remove-asset-webpack-plugin/compare/v0.1.1...v1.0.0
diff --git a/projects/js-packages/remove-asset-webpack-plugin/changelog/update-project-scripts-no-install b/projects/js-packages/remove-asset-webpack-plugin/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/remove-asset-webpack-plugin/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/remove-asset-webpack-plugin/package.json b/projects/js-packages/remove-asset-webpack-plugin/package.json
index c72feafae1f4c..a6718a5563ca6 100644
--- a/projects/js-packages/remove-asset-webpack-plugin/package.json
+++ b/projects/js-packages/remove-asset-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/remove-asset-webpack-plugin",
-	"version": "1.0.3-alpha",
+	"version": "1.0.3",
 	"description": "A Webpack plugin to remove assets from the build.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/remove-asset-webpack-plugin/README.md#readme",
 	"bugs": {
diff --git a/projects/js-packages/shared-extension-utils/.gitattributes b/projects/js-packages/shared-extension-utils/.gitattributes
new file mode 100644
index 0000000000000..7e44bd96454e9
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/.gitattributes
@@ -0,0 +1,7 @@
+# Files not needed to be distributed in the package.
+.gitattributes    export-ignore
+node_modules      export-ignore
+
+# Files to exclude from the mirror repo
+/changelog/**     production-exclude
+/.eslintrc.cjs    production-exclude
diff --git a/projects/js-packages/shared-extension-utils/.gitignore b/projects/js-packages/shared-extension-utils/.gitignore
new file mode 100644
index 0000000000000..140fd587d2d52
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+node_modules/
diff --git a/projects/js-packages/shared-extension-utils/.nycrc b/projects/js-packages/shared-extension-utils/.nycrc
new file mode 100644
index 0000000000000..71db1fbf54c98
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/.nycrc
@@ -0,0 +1,5 @@
+{
+	"extensions": [".js", ".jsx"],
+	"exclude": "**/test/*.jsx",
+	"reporter": "clover"
+}
diff --git a/projects/js-packages/shared-extension-utils/CHANGELOG.md b/projects/js-packages/shared-extension-utils/CHANGELOG.md
new file mode 100644
index 0000000000000..721294abd00ad
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
diff --git a/projects/js-packages/shared-extension-utils/README.md b/projects/js-packages/shared-extension-utils/README.md
new file mode 100644
index 0000000000000..94c8bab09bd14
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/README.md
@@ -0,0 +1,26 @@
+# Shared Extension Utilities
+
+Utility functions used by the block editor extensions.
+
+This package is the new home for the code in [the `extensions/shared`
+directory](https://github.com/Automattic/jetpack/tree/master/projects/plugins/jetpack/extensions/shared)
+of the Jetpack plugin, so that plugins can share it. To begin with, we moving
+the code used by the Publicize editor extension, but the goal is to bring over
+all the shared code.
+
+## How to install shared-extension-utils
+
+### Installation From Git Repo
+
+## Contribute
+
+## Get Help
+
+## Security
+
+Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic).
+
+## License
+
+shared-extension-utils is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt)
+
diff --git a/projects/js-packages/shared-extension-utils/changelog/.gitkeep b/projects/js-packages/shared-extension-utils/changelog/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/js-packages/shared-extension-utils/changelog/add-shared-extension-utils b/projects/js-packages/shared-extension-utils/changelog/add-shared-extension-utils
new file mode 100644
index 0000000000000..d502d76a51958
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/changelog/add-shared-extension-utils
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Created the shared-extension-utils library
diff --git a/projects/js-packages/storybook/changelog/fix-style-inconsistencies-in-action-button b/projects/js-packages/shared-extension-utils/changelog/update-shared-extension-utils-prepare-release
similarity index 50%
rename from projects/js-packages/storybook/changelog/fix-style-inconsistencies-in-action-button
rename to projects/js-packages/shared-extension-utils/changelog/update-shared-extension-utils-prepare-release
index c47cb18e82997..df7ae220b753e 100644
--- a/projects/js-packages/storybook/changelog/fix-style-inconsistencies-in-action-button
+++ b/projects/js-packages/shared-extension-utils/changelog/update-shared-extension-utils-prepare-release
@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies.
+Core: prepare utility for release
diff --git a/projects/js-packages/shared-extension-utils/composer.json b/projects/js-packages/shared-extension-utils/composer.json
new file mode 100644
index 0000000000000..5e88b1125fe17
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/composer.json
@@ -0,0 +1,38 @@
+{
+	"name": "automattic/jetpack-shared-extension-utils",
+	"description": "Utility functions used by the block editor extensions",
+	"type": "library",
+	"license": "GPL-2.0-or-later",
+	"require": {},
+	"require-dev": {
+		"yoast/phpunit-polyfills": "1.0.3",
+		"automattic/jetpack-changelogger": "^3.0"
+	},
+	"scripts": {
+		"test-js": [
+			"pnpm run test"
+		],
+		"test-coverage": [
+			"pnpx nyc --report-dir=\"$COVERAGE_DIR\" pnpm run test"
+		]
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../packages/*",
+			"options": {
+				"monorepo": true
+			}
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"extra": {
+		"autotagger": true,
+		"npmjs-autopublish": true,
+		"mirror-repo": "Automattic/jetpack-shared-extension-utils",
+		"changelogger": {
+			"link-template": "https://github.com/Automattic/jetpack-shared-extension-utils/compare/${old}...${new}"
+		}
+	}
+}
diff --git a/projects/js-packages/shared-extension-utils/package.json b/projects/js-packages/shared-extension-utils/package.json
new file mode 100644
index 0000000000000..c05e0bfd3ef22
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/package.json
@@ -0,0 +1,30 @@
+{
+	"name": "@automattic/jetpack-shared-extension-utils",
+	"version": "0.1.0-alpha",
+	"description": "Utility functions used by the block editor extensions",
+	"homepage": "https://jetpack.com",
+	"bugs": {
+		"url": "https://github.com/Automattic/jetpack/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/Automattic/jetpack.git"
+	},
+	"license": "GPL-2.0-or-later",
+	"author": "Automattic",
+	"scripts": {
+		"test": "NODE_ENV=test NODE_PATH=tests:. js-test-runner --jsdom --initfile=test-main.jsx 'glob:./!(node_modules)/**/test/*.@(jsx|js)'"
+	},
+	"devDependencies": {
+		"jetpack-js-test-runner": "workspace:*",
+		"nyc": "15.1.0"
+	},
+	"engines": {
+		"node": "^14.18.3 || ^16.13.2",
+		"pnpm": "^6.23.6",
+		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
+	},
+	"exports": {
+		".": "./index.js"
+	}
+}
diff --git a/projects/js-packages/shared-extension-utils/test-main.jsx b/projects/js-packages/shared-extension-utils/test-main.jsx
new file mode 100644
index 0000000000000..c04304cbc5455
--- /dev/null
+++ b/projects/js-packages/shared-extension-utils/test-main.jsx
@@ -0,0 +1,7 @@
+/**
+ * External dependencies
+ */
+import Enzyme from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+
+Enzyme.configure( { adapter: new Adapter() } );
diff --git a/projects/js-packages/storybook/CHANGELOG.md b/projects/js-packages/storybook/CHANGELOG.md
index 721294abd00ad..a10c506bb6109 100644
--- a/projects/js-packages/storybook/CHANGELOG.md
+++ b/projects/js-packages/storybook/CHANGELOG.md
@@ -5,3 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.0 - 2022-02-01
+### Added
+- Added addons-essentials to the dependencies
+- Added storybook package for generating component previews
+- Add Gutenberg components tree to the storybook
+- Add jetpack-connection package to Storybook config.
+- Add support for base-style stories
+- Add support for the IDC package stories.
+- Storybook: Expose my-jetpack components
+
+### Changed
+- Allow Node ^14.17.6 to be used in this project. This shouldn't change the behavior of the code itself.
+- General: update required node version to v16.13.2
+- Publish to a mirror repo rather than the `gh-pages` branch.
+- Tests: update PHPUnit polyfills dependency (yoast/phpunit-polyfills).
+- Updated package dependencies.
+- Update webpack version to match other monorepo packages
+- Use Node 16.7.0 in tooling. This shouldn't change the behavior of the code itself.
+
+### Removed
+- removed knobs dependency
+- Remove use of deprecated `~` in sass-loader imports.
+
+### Fixed
+- fixed babel/preset-react dependency
+- GH only allows pages to be in `/` or `/docs`, so build to `/docs`.
diff --git a/projects/js-packages/storybook/changelog/add-@wordpress-eslint-plugin b/projects/js-packages/storybook/changelog/add-@wordpress-eslint-plugin
deleted file mode 100644
index 8434a35594759..0000000000000
--- a/projects/js-packages/storybook/changelog/add-@wordpress-eslint-plugin
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint configuration.
-
-
diff --git a/projects/js-packages/storybook/changelog/add-connection-button-spinner b/projects/js-packages/storybook/changelog/add-connection-button-spinner
deleted file mode 100644
index d7106586de2ce..0000000000000
--- a/projects/js-packages/storybook/changelog/add-connection-button-spinner
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Package version bump.
-
-
diff --git a/projects/js-packages/storybook/changelog/add-fancy-eslint-ignore b/projects/js-packages/storybook/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/js-packages/storybook/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/add-gutenberg-components b/projects/js-packages/storybook/changelog/add-gutenberg-components
deleted file mode 100644
index d404e4477b115..0000000000000
--- a/projects/js-packages/storybook/changelog/add-gutenberg-components
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add Gutenberg components tree to the storybook
diff --git a/projects/js-packages/storybook/changelog/add-rna-connect-screen-required-plan b/projects/js-packages/storybook/changelog/add-rna-connect-screen-required-plan
deleted file mode 100644
index 339c0db7713f1..0000000000000
--- a/projects/js-packages/storybook/changelog/add-rna-connect-screen-required-plan
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add jetpack-connection package to Storybook config.
diff --git a/projects/js-packages/storybook/changelog/add-storybook b/projects/js-packages/storybook/changelog/add-storybook
deleted file mode 100644
index b3fc796685da6..0000000000000
--- a/projects/js-packages/storybook/changelog/add-storybook
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: added
-
-Added storybook package for generating component previews
diff --git a/projects/js-packages/storybook/changelog/fix-babel-react-preset-dep b/projects/js-packages/storybook/changelog/fix-babel-react-preset-dep
deleted file mode 100644
index e8515cb792f1a..0000000000000
--- a/projects/js-packages/storybook/changelog/fix-babel-react-preset-dep
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-fixed babel/preset-react dependency
diff --git a/projects/js-packages/storybook/changelog/fix-rm-deprecated-sass-tilde b/projects/js-packages/storybook/changelog/fix-rm-deprecated-sass-tilde
deleted file mode 100644
index cf6ad99ec3974..0000000000000
--- a/projects/js-packages/storybook/changelog/fix-rm-deprecated-sass-tilde
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Remove use of deprecated `~` in sass-loader imports.
diff --git a/projects/js-packages/storybook/changelog/fix-storybook-in-mirror-repo b/projects/js-packages/storybook/changelog/fix-storybook-in-mirror-repo
deleted file mode 100644
index 77b211dd23dd6..0000000000000
--- a/projects/js-packages/storybook/changelog/fix-storybook-in-mirror-repo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-GH only allows pages to be in `/` or `/docs`, so build to `/docs`.
diff --git a/projects/js-packages/storybook/changelog/fix-storybook-stories-tab b/projects/js-packages/storybook/changelog/fix-storybook-stories-tab
deleted file mode 100644
index 3f748425caf45..0000000000000
--- a/projects/js-packages/storybook/changelog/fix-storybook-stories-tab
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Changed related to storybook, not a product feature
-
-
diff --git a/projects/js-packages/storybook/changelog/jetpack-branch-10.5 b/projects/js-packages/storybook/changelog/jetpack-branch-10.5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/jetpack-branch-10.5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/js-redirects-add-docs-and-tests b/projects/js-packages/storybook/changelog/js-redirects-add-docs-and-tests
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/js-redirects-add-docs-and-tests
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/prepare-10.4.a.7-release b/projects/js-packages/storybook/changelog/prepare-10.4.a.7-release
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/prepare-10.4.a.7-release
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/remove-es5-skeleton b/projects/js-packages/storybook/changelog/remove-es5-skeleton
deleted file mode 100644
index f63d54c7397b6..0000000000000
--- a/projects/js-packages/storybook/changelog/remove-es5-skeleton
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Removed unused ES5 validation command
-
-
diff --git a/projects/js-packages/storybook/changelog/remove-knobs-from-stories b/projects/js-packages/storybook/changelog/remove-knobs-from-stories
deleted file mode 100644
index f80c5fdb63c1e..0000000000000
--- a/projects/js-packages/storybook/changelog/remove-knobs-from-stories
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-removed knobs dependency
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#7 b/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#7
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-webpack-5.x b/projects/js-packages/storybook/changelog/renovate-webpack-5.x
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-webpack-5.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#2 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#2
index 302aa8cf46b5c..c47cb18e82997 100644
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#2
+++ b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#2
@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies
+Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#4 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#4
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#5 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#6 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#6
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#7 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#7
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#8 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#8
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#8
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#9 b/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#9
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#9
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index 76075df8b7415..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Tests: update PHPUnit polyfills dependency (yoast/phpunit-polyfills).
diff --git a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#2 b/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#2
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#3 b/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#3
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/js-packages/storybook/changelog/renovate-yoast-phpunit-polyfills-1.x#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/try-allow-node-14 b/projects/js-packages/storybook/changelog/try-allow-node-14
deleted file mode 100644
index ae4eabbe48728..0000000000000
--- a/projects/js-packages/storybook/changelog/try-allow-node-14
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Allow Node ^14.17.6 to be used in this project. This shouldn't change the behavior of the code itself.
diff --git a/projects/js-packages/storybook/changelog/try-html-only-stories b/projects/js-packages/storybook/changelog/try-html-only-stories
deleted file mode 100644
index f138e8c20beab..0000000000000
--- a/projects/js-packages/storybook/changelog/try-html-only-stories
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add support for base-style stories
diff --git a/projects/js-packages/storybook/changelog/try-rna-connection-store-export b/projects/js-packages/storybook/changelog/try-rna-connection-store-export
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/try-rna-connection-store-export
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/try-update-to-node-16 b/projects/js-packages/storybook/changelog/try-update-to-node-16
deleted file mode 100644
index ab9d2ba5149bc..0000000000000
--- a/projects/js-packages/storybook/changelog/try-update-to-node-16
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Use Node 16.7.0 in tooling. This shouldn't change the behavior of the code itself.
diff --git a/projects/js-packages/storybook/changelog/try-update-webpack-globally b/projects/js-packages/storybook/changelog/try-update-webpack-globally
deleted file mode 100644
index db3b9b8a2c639..0000000000000
--- a/projects/js-packages/storybook/changelog/try-update-webpack-globally
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Update webpack version to match other monorepo packages
diff --git a/projects/js-packages/storybook/changelog/update-backport-connection-package b/projects/js-packages/storybook/changelog/update-backport-connection-package
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-backport-connection-package
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-changelog-cherry-pick b/projects/js-packages/storybook/changelog/update-changelog-cherry-pick
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-changelog-cherry-pick
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-connect-button-visual-component b/projects/js-packages/storybook/changelog/update-connect-button-visual-component
deleted file mode 100644
index d41bfb7e83798..0000000000000
--- a/projects/js-packages/storybook/changelog/update-connect-button-visual-component
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Added addons-essentials to the dependencies
diff --git a/projects/js-packages/storybook/changelog/update-css-modules b/projects/js-packages/storybook/changelog/update-css-modules
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-css-modules
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-extend-disconnect-dialog-component b/projects/js-packages/storybook/changelog/update-extend-disconnect-dialog-component
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-extend-disconnect-dialog-component
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-idc-storybook b/projects/js-packages/storybook/changelog/update-idc-storybook
deleted file mode 100644
index fb6ace52a6e5d..0000000000000
--- a/projects/js-packages/storybook/changelog/update-idc-storybook
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add support for the IDC package stories.
diff --git a/projects/js-packages/storybook/changelog/update-idc_text b/projects/js-packages/storybook/changelog/update-idc_text
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-idc_text
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-jetpack-base-styles b/projects/js-packages/storybook/changelog/update-jetpack-base-styles
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-jetpack-base-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-jetpack-color-primary b/projects/js-packages/storybook/changelog/update-jetpack-color-primary
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-jetpack-color-primary
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-js-pkg-idc-v0.8.0 b/projects/js-packages/storybook/changelog/update-js-pkg-idc-v0.8.0
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-js-pkg-idc-v0.8.0
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-min-pnpm-version b/projects/js-packages/storybook/changelog/update-min-pnpm-version
deleted file mode 100644
index d824134990470..0000000000000
--- a/projects/js-packages/storybook/changelog/update-min-pnpm-version
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update minimum pnpm version.
-
-
diff --git a/projects/js-packages/storybook/changelog/update-my-jetpack-storybook b/projects/js-packages/storybook/changelog/update-my-jetpack-storybook
deleted file mode 100644
index 25bc5ef232cea..0000000000000
--- a/projects/js-packages/storybook/changelog/update-my-jetpack-storybook
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Storybook: Expose my-jetpack components
diff --git a/projects/js-packages/storybook/changelog/update-node-version-16132 b/projects/js-packages/storybook/changelog/update-node-version-16132
deleted file mode 100644
index feb2fb77ea11d..0000000000000
--- a/projects/js-packages/storybook/changelog/update-node-version-16132
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: update required node version to v16.13.2
diff --git a/projects/js-packages/storybook/changelog/update-project-scripts-no-install b/projects/js-packages/storybook/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/storybook/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/storybook/changelog/update-public-base-styles b/projects/js-packages/storybook/changelog/update-public-base-styles
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-public-base-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-refactor-connection-button b/projects/js-packages/storybook/changelog/update-refactor-connection-button
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-refactor-connection-button
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-refactor-number-format-location b/projects/js-packages/storybook/changelog/update-refactor-number-format-location
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-refactor-number-format-location
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-rna-connection-move-register-to-store b/projects/js-packages/storybook/changelog/update-rna-connection-move-register-to-store
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-rna-connection-move-register-to-store
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-rna-pricing-card-same-price b/projects/js-packages/storybook/changelog/update-rna-pricing-card-same-price
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-rna-pricing-card-same-price
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/update-storybook-add-jetpack-dashboard-bg-color b/projects/js-packages/storybook/changelog/update-storybook-add-jetpack-dashboard-bg-color
new file mode 100644
index 0000000000000..731644122d202
--- /dev/null
+++ b/projects/js-packages/storybook/changelog/update-storybook-add-jetpack-dashboard-bg-color
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add 'Jetpack Dashboard' background color
diff --git a/projects/js-packages/storybook/changelog/update-storybook-in-mirror-repo b/projects/js-packages/storybook/changelog/update-storybook-in-mirror-repo
deleted file mode 100644
index edb7c1dfdd387..0000000000000
--- a/projects/js-packages/storybook/changelog/update-storybook-in-mirror-repo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Publish to a mirror repo rather than the `gh-pages` branch.
diff --git a/projects/js-packages/storybook/changelog/update-user-data-on-initial-state b/projects/js-packages/storybook/changelog/update-user-data-on-initial-state
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/js-packages/storybook/changelog/update-user-data-on-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/package.json b/projects/js-packages/storybook/package.json
index 953c7d894c9f2..7cb2265914931 100644
--- a/projects/js-packages/storybook/package.json
+++ b/projects/js-packages/storybook/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-storybook",
-	"version": "0.1.0-alpha",
+	"version": "0.2.0-alpha",
 	"description": "Jetpack components storybook",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -23,7 +23,7 @@
 		"storybook:dev": "concurrently \"pnpm run dev:packages\" \"start-storybook -c ./storybook -p 50240 -s ./public\""
 	},
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/plugin-syntax-jsx": "7.16.0",
 		"@babel/preset-react": "7.16.0",
@@ -45,12 +45,12 @@
 		"@storybook/builder-webpack5": "6.4.10",
 		"@storybook/manager-webpack5": "6.4.10",
 		"@storybook/react": "6.4.10",
-		"@wordpress/babel-preset-default": "6.4.1",
-		"@wordpress/block-editor": "8.0.12",
-		"@wordpress/block-library": "6.0.17",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/format-library": "3.0.18",
-		"@wordpress/postcss-plugins-preset": "3.2.5",
+		"@wordpress/babel-preset-default": "6.5.0",
+		"@wordpress/block-editor": "8.1.0",
+		"@wordpress/block-library": "6.1.0",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/format-library": "3.1.0",
+		"@wordpress/postcss-plugins-preset": "3.3.0",
 		"babel-plugin-inline-json-import": "0.3.2",
 		"concurrently": "6.0.2",
 		"css-loader": "6.5.1",
diff --git a/projects/js-packages/storybook/storybook/preview.js b/projects/js-packages/storybook/storybook/preview.js
index 0974d9021fb93..25af1a2e3c5cb 100644
--- a/projects/js-packages/storybook/storybook/preview.js
+++ b/projects/js-packages/storybook/storybook/preview.js
@@ -17,3 +17,23 @@ import { withA11y } from '@storybook/addon-a11y';
 import './style.scss';
 
 addDecorator( withA11y );
+
+export const parameters = {
+	backgrounds: {
+		default: 'Jetpack Dashboard',
+		values: [
+			{
+				name: 'Jetpack Dashboard',
+				value: 'var(--jp-white-off)',
+			},
+			{
+				name: 'Dark',
+				value: 'rgb(51, 51, 51)',
+			},
+			{
+				name: 'Light',
+				value: '#FFF',
+			},
+		],
+	},
+};
diff --git a/projects/js-packages/webpack-config/CHANGELOG.md b/projects/js-packages/webpack-config/CHANGELOG.md
index 67427c4edbc97..4fcc3415a323a 100644
--- a/projects/js-packages/webpack-config/CHANGELOG.md
+++ b/projects/js-packages/webpack-config/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.1 - 2022-01-27
+### Changed
+- Updated package dependencies.
+
+## 1.1.0 - 2022-01-25
+### Added
+- Add missing dev dependency on `nyc` for code coverage.
+
+### Changed
+- Updated package dependencies. Major version bump for i18n-loader-webpack-plugin.
+
 ## 1.0.2 - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
diff --git a/projects/js-packages/storybook/changelog/renovate-sass-loader-12.x b/projects/js-packages/webpack-config/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-sass-loader-12.x
rename to projects/js-packages/webpack-config/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-11-09-14-35-04-196965 b/projects/js-packages/webpack-config/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-11-09-14-35-04-196965
rename to projects/js-packages/webpack-config/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/webpack-config/changelog/update-project-scripts-no-install b/projects/js-packages/webpack-config/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/js-packages/webpack-config/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/js-packages/webpack-config/package.json b/projects/js-packages/webpack-config/package.json
index 970aeff61fb5c..23b6924661a75 100644
--- a/projects/js-packages/webpack-config/package.json
+++ b/projects/js-packages/webpack-config/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-webpack-config",
-	"version": "1.0.3-alpha",
+	"version": "1.1.2-alpha",
 	"description": "Library of pieces for webpack config in Jetpack projects.",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -18,9 +18,9 @@
 	},
 	"dependencies": {
 		"@automattic/babel-plugin-preserve-i18n": "1.0.0",
-		"@automattic/babel-plugin-replace-textdomain": "workspace:^1.0.2-alpha",
-		"@automattic/i18n-check-webpack-plugin": "workspace:^1.0.3-alpha",
-		"@automattic/i18n-loader-webpack-plugin": "workspace:^1.0.3-alpha",
+		"@automattic/babel-plugin-replace-textdomain": "workspace:^1.0.2",
+		"@automattic/i18n-check-webpack-plugin": "workspace:^1.0.4",
+		"@automattic/i18n-loader-webpack-plugin": "workspace:^2.0.1-alpha",
 		"@automattic/webpack-rtl-plugin": "5.1.0",
 		"@babel/compat-data": "7.16.4",
 		"@babel/helper-compilation-targets": "7.16.3",
@@ -30,7 +30,7 @@
 		"@babel/preset-react": "7.16.0",
 		"@babel/preset-typescript": "7.16.0",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
+		"@wordpress/dependency-extraction-webpack-plugin": "3.3.0",
 		"babel-loader": "8.2.3",
 		"browserslist": "4.19.1",
 		"css-loader": "6.5.1",
@@ -43,6 +43,7 @@
 	"devDependencies": {
 		"@babel/core": "7.16.0",
 		"@babel/runtime": "7.16.3",
+		"nyc": "15.1.0",
 		"webpack": "5.65.0",
 		"webpack-cli": "4.9.1"
 	},
diff --git a/projects/packages/a8c-mc-stats/CHANGELOG.md b/projects/packages/a8c-mc-stats/CHANGELOG.md
index 15ab7fa59f9f5..465b913c9db05 100644
--- a/projects/packages/a8c-mc-stats/CHANGELOG.md
+++ b/projects/packages/a8c-mc-stats/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.12] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.4.11] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -83,6 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Creates the MC Stats package
 
+[1.4.12]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.11...v1.4.12
 [1.4.11]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.10...v1.4.11
 [1.4.10]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.9...v1.4.10
 [1.4.9]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.8...v1.4.9
diff --git a/projects/packages/a8c-mc-stats/changelog/update-project-scripts-no-install b/projects/packages/a8c-mc-stats/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/a8c-mc-stats/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/abtest/CHANGELOG.md b/projects/packages/abtest/CHANGELOG.md
index 1c0a26243c720..398465f0b94bf 100644
--- a/projects/packages/abtest/CHANGELOG.md
+++ b/projects/packages/abtest/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.20] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.9.19] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -208,6 +212,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a simple A/B test package
 
+[1.9.20]: https://github.com/Automattic/jetpack-abtest/compare/v1.9.19...v1.9.20
 [1.9.19]: https://github.com/Automattic/jetpack-abtest/compare/v1.9.18...v1.9.19
 [1.9.18]: https://github.com/Automattic/jetpack-abtest/compare/v1.9.17...v1.9.18
 [1.9.17]: https://github.com/Automattic/jetpack-abtest/compare/v1.9.16...v1.9.17
diff --git a/projects/packages/abtest/changelog/update-project-scripts-no-install b/projects/packages/abtest/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/abtest/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/admin-ui/.phpcs.dir.xml b/projects/packages/admin-ui/.phpcs.dir.xml
new file mode 100644
index 0000000000000..8ebbc7cd35a5f
--- /dev/null
+++ b/projects/packages/admin-ui/.phpcs.dir.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset>
+
+	<rule ref="WordPress.WP.I18n">
+		<properties>
+			<property name="text_domain" type="array">
+				<element value="jetpack-admin-ui" />
+			</property>
+		</properties>
+	</rule>
+	<rule ref="Jetpack.Functions.I18n">
+		<properties>
+			<property name="text_domain" value="jetpack-admin-ui" />
+		</properties>
+	</rule>
+
+	<rule ref="WordPress.Utils.I18nTextDomainFixer">
+		<properties>
+			<property name="old_text_domain" type="array" />
+			<property name="new_text_domain" value="jetpack-admin-ui" />
+		</properties>
+	</rule>
+
+</ruleset>
diff --git a/projects/packages/admin-ui/CHANGELOG.md b/projects/packages/admin-ui/CHANGELOG.md
index a0d80d685c00a..dbfcc276d447e 100644
--- a/projects/packages/admin-ui/CHANGELOG.md
+++ b/projects/packages/admin-ui/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.3] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [0.2.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -33,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixing menu visibility issues.
 
+[0.2.3]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.2...0.2.3
 [0.2.2]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.1...0.2.2
 [0.2.1]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-admin-ui/compare/0.1.1...0.2.0
diff --git a/projects/packages/admin-ui/changelog/add-anti-spam-my-jetpack b/projects/packages/admin-ui/changelog/add-anti-spam-my-jetpack
new file mode 100644
index 0000000000000..903c769c75af2
--- /dev/null
+++ b/projects/packages/admin-ui/changelog/add-anti-spam-my-jetpack
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Support for akismet menu with stand-alone plugins
diff --git a/projects/packages/admin-ui/changelog/update-project-scripts-no-install b/projects/packages/admin-ui/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/admin-ui/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/admin-ui/changelog/workaround-jetpack-submenu-order b/projects/packages/admin-ui/changelog/workaround-jetpack-submenu-order
new file mode 100644
index 0000000000000..c910c58a41d9f
--- /dev/null
+++ b/projects/packages/admin-ui/changelog/workaround-jetpack-submenu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixes menu order working around a bug in add_submenu_page
diff --git a/projects/packages/admin-ui/composer.json b/projects/packages/admin-ui/composer.json
index 770d8b70c8382..d0e8902fe75b3 100644
--- a/projects/packages/admin-ui/composer.json
+++ b/projects/packages/admin-ui/composer.json
@@ -40,6 +40,7 @@
 	"extra": {
 		"autotagger": true,
 		"mirror-repo": "Automattic/jetpack-admin-ui",
+		"textdomain": "jetpack-admin-ui",
 		"changelogger": {
 			"link-template": "https://github.com/Automattic/jetpack-admin-ui/compare/${old}...${new}"
 		},
diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json
index 63c4b8e7d6b9f..3dc6eaf75aa40 100644
--- a/projects/packages/admin-ui/package.json
+++ b/projects/packages/admin-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-admin-ui",
-	"version": "0.2.3-alpha",
+	"version": "0.2.4-alpha",
 	"description": "Generic Jetpack wp-admin UI elements",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php
index 0156f22a6592a..f62b3ee5fbb51 100644
--- a/projects/packages/admin-ui/src/class-admin-menu.php
+++ b/projects/packages/admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.3-alpha';
+	const PACKAGE_VERSION = '0.2.4-alpha';
 
 	/**
 	 * Whether this class has been initialized
@@ -37,10 +37,34 @@ class Admin_Menu {
 	public static function init() {
 		if ( ! self::$initialized ) {
 			self::$initialized = true;
+			self::handle_akismet_menu();
 			add_action( 'admin_menu', array( __CLASS__, 'admin_menu_hook_callback' ), 1000 ); // Jetpack uses 998.
 		}
 	}
 
+	/**
+	 * Handles the Akismet menu item when used alongside other stand-alone plugins
+	 *
+	 * When Jetpack plugin is present, Akismet menu item is moved under the Jetpack top level menu, but if Akismet is active alongside other stand-alone plugins,
+	 * we use this method to move the menu item.
+	 */
+	private static function handle_akismet_menu() {
+		if ( class_exists( 'Akismet_Admin' ) ) {
+			// Prevent Akismet from adding a menu item.
+			add_action(
+				'admin_menu',
+				function () {
+					remove_action( 'admin_menu', array( 'Akismet_Admin', 'admin_menu' ), 5 );
+				},
+				4
+			);
+
+			// Add an Anti-spam menu item for Jetpack.
+			self::add_menu( __( 'Anti-Spam', 'jetpack-admin-ui' ), __( 'Anti-Spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+
+		}
+	}
+
 	/**
 	 * Enqueue styles for the top level menu
 	 *
@@ -80,6 +104,22 @@ public static function admin_menu_hook_callback() {
 			$can_see_toplevel_menu = false;
 		}
 
+		/**
+		 * The add_sub_menu function has a bug and will not keep the right order of menu items.
+		 *
+		 * @see https://core.trac.wordpress.org/ticket/52035
+		 * Let's order the items before registering them.
+		 * Since this all happens after the Jetpack plugin menu items were added, all items will be added after Jetpack plugin items - unless position is very low number (smaller than the number of menu items present in Jetpack plugin).
+		 */
+		usort(
+			self::$menu_items,
+			function ( $a, $b ) {
+				$position_a = empty( $a['position'] ) ? 0 : $a['position'];
+				$position_b = empty( $b['position'] ) ? 0 : $b['position'];
+				return $position_a - $position_b;
+			}
+		);
+
 		foreach ( self::$menu_items as $menu_item ) {
 			if ( ! current_user_can( $menu_item['capability'] ) ) {
 				continue;
diff --git a/projects/packages/analyzer/.phpcs.dir.phpcompatibility.xml b/projects/packages/analyzer/.phpcs.dir.phpcompatibility.xml
new file mode 100644
index 0000000000000..72dd08d90e209
--- /dev/null
+++ b/projects/packages/analyzer/.phpcs.dir.phpcompatibility.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<ruleset>
+	<rule ref="PHPCompatibility">
+		<!-- Analyzer doesn't follow the same requirements. -->
+		<exclude-pattern>/*</exclude-pattern>
+	</rule>
+</ruleset>
diff --git a/projects/packages/analyzer/.phpcs.dir.xml b/projects/packages/analyzer/.phpcs.dir.xml
new file mode 100644
index 0000000000000..4985d18e46171
--- /dev/null
+++ b/projects/packages/analyzer/.phpcs.dir.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<ruleset>
+	<rule ref="Jetpack">
+		<exclude-pattern>/*</exclude-pattern>
+	</rule>
+</ruleset>
diff --git a/projects/packages/my-jetpack/changelog/add-analytics-to-my-jetpack b/projects/packages/analyzer/changelog/add-analyzer-api
similarity index 57%
rename from projects/packages/my-jetpack/changelog/add-analytics-to-my-jetpack
rename to projects/packages/analyzer/changelog/add-analyzer-api
index d89d62345a926..e06b5eec33bc8 100644
--- a/projects/packages/my-jetpack/changelog/add-analytics-to-my-jetpack
+++ b/projects/packages/analyzer/changelog/add-analyzer-api
@@ -1,4 +1,4 @@
 Significance: patch
 Type: added
 
-Added useAnalytics hook
+API for anayzer service
diff --git a/projects/packages/analyzer/composer.json b/projects/packages/analyzer/composer.json
index ed089d06f70e6..14968ca6a233d 100644
--- a/projects/packages/analyzer/composer.json
+++ b/projects/packages/analyzer/composer.json
@@ -7,6 +7,7 @@
 		"nikic/php-parser": "4.13.2"
 	},
 	"require-dev": {
+		"php": "^8.0",
 		"automattic/jetpack-changelogger": "^3.0"
 	},
 	"autoload": {
diff --git a/projects/packages/analyzer/scripts/jp-analyze-parallel.php b/projects/packages/analyzer/scripts/jp-analyze-parallel.php
new file mode 100644
index 0000000000000..1336f4531d6ee
--- /dev/null
+++ b/projects/packages/analyzer/scripts/jp-analyze-parallel.php
@@ -0,0 +1,99 @@
+<?php
+
+ini_set( 'memory_limit', '512M' );
+
+require dirname( __DIR__ ) . '/vendor/autoload.php';
+
+use Automattic\Jetpack\Analyzer\Locker;
+use Automattic\Jetpack\Analyzer\Model;
+use Automattic\Jetpack\Analyzer\PluginDownloader;
+use Automattic\Jetpack\Analyzer\Scripts;
+
+$slurper_path = dirname( __DIR__ ) . '/slurper/plugins';
+
+$jetpack_exclude = array( '.git', 'vendor', 'tests', 'docker', 'bin', 'scss', 'images', 'docs', 'languages', 'node_modules' );
+
+class ScanManager {
+	private $count          = 0;
+	private $procs          = array();
+	private $model;
+
+	public function __construct() {
+		$this->model = new Model();
+	}
+
+	public function start_proc( $folder_name ) {
+		echo 'Starting ' . basename( $folder_name ) . "\n";
+		$cmd = array( 'php', dirname( __DIR__ ) . '/scripts/jp-warnings-job.php', $folder_name );
+		$this->count++;
+
+		$descriptorspec = array(
+			0 => array( 'file', '/dev/null', 'r' ),
+			1 => array( 'file', dirname( __DIR__ ) . '/output.txt', 'a' ),
+			2 => array( 'file', dirname( __DIR__ ) . '/output.txt', 'a' ),
+		);
+		$process       = proc_open( $cmd, $descriptorspec, $pipes );
+		$this->procs[] = $process;
+		$this->model->update_process( 0, basename( $folder_name ) );
+	}
+
+	public function check_procs() {
+		foreach ( $this->procs as $id => $proc ) {
+			$status = proc_get_status( $proc );
+			if ( ! $status['running'] ) {
+				$folder_name = str_replace("'", '', explode( ' ', $status['command'] ))[2];
+				$this->model->update_process( -1, null, basename( $folder_name ) );
+
+				$this->count--;
+
+				proc_close( $proc );
+				unset( $this->procs[ $id ] );
+
+				echo 'Done with ' . basename( $folder_name ) . "\n";
+			}
+		}
+	}
+
+	public function wait_for_procs( $count = 10 ) {
+		$this->check_procs();
+		while ( $this->count > $count ) {
+			sleep( 1 );
+			$this->check_procs();
+		}
+	}
+
+	public function get_count() {
+		return $this->count;
+	}
+	public function scan( $arr ) {
+		$this->model->update_process( count( $arr ) );
+		foreach ( $arr as $folder_name ) {
+			$this->wait_for_procs();
+			$this->start_proc( $folder_name );
+		}
+
+		$this->wait_for_procs( 0 );
+
+		echo 'Analysis finished' . "\n";
+
+		$this->model->toggle_status();
+		$this->model->load_result();
+		Locker::unlock();
+	}
+}
+
+$type = $argv[1];
+$old = $argv[2];
+$new = $argv[3];
+
+$pd = new PluginDownloader($type);
+$old_path = $pd->get_version($old);
+$new_path = $pd->get_version($new);
+
+Scripts::cleanup();
+Scripts::get_differences( $new_path, $old_path );
+
+// $arr = glob( $slurper_path . '/*' );
+$arr  = array( $slurper_path . '/connect-for-woocommerce', $slurper_path . '/easyreservations' );
+$mngr = new ScanManager();
+$mngr->scan( $arr );
diff --git a/projects/packages/analyzer/scripts/jp-warnings-job.php b/projects/packages/analyzer/scripts/jp-warnings-job.php
new file mode 100755
index 0000000000000..c552b9320c10e
--- /dev/null
+++ b/projects/packages/analyzer/scripts/jp-warnings-job.php
@@ -0,0 +1,14 @@
+<?php
+
+require dirname( __DIR__ ) . '/vendor/autoload.php';
+
+// ini_set( 'memory_limit', '512M' );
+
+$folder_name = $argv[1];
+$excludes = array( '.git', 'vendor', 'tests', 'docker', 'bin', 'scss', 'images', 'docs', 'languages', 'node_modules' );
+
+$differences      = Automattic\Jetpack\Analyzer\Scripts::load_differences();
+
+Automattic\Jetpack\Analyzer\Scripts::get_warnings( $folder_name, $differences, $excludes );
+
+// phpcs:enable
diff --git a/projects/packages/analyzer/src/Warnings/class-warning.php b/projects/packages/analyzer/src/Warnings/class-warning.php
index 8b6978e4d37d4..7a79ff51d7e0a 100644
--- a/projects/packages/analyzer/src/Warnings/class-warning.php
+++ b/projects/packages/analyzer/src/Warnings/class-warning.php
@@ -86,4 +86,19 @@ public function to_csv_array() {
 			$this->old_declaration->display_name(),
 		);
 	}
+
+	/**
+	 * Returns an array of the Warnings item.
+	 *
+	 * @return array mapped array ready for JSONification.
+	 */
+	public function to_map() {
+		return array(
+			'warn_type'    => $this->type,
+			'path'         => $this->path,
+			'line'         => $this->line,
+			'message'      => $this->message,
+			'display_name' => $this->old_declaration->display_name(),
+		);
+	}
 }
diff --git a/projects/packages/analyzer/src/api/class-analyze-controller.php b/projects/packages/analyzer/src/api/class-analyze-controller.php
new file mode 100644
index 0000000000000..87638f400c2da
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-analyze-controller.php
@@ -0,0 +1,51 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+class Analyze_Controller extends Controller {
+	public function get() {
+		try {
+			Locker::lock();
+		} catch ( \Throwable $th ) {
+			// TODO: extend default Exception class, and use instance_of instead.
+			if ( 'Locked already' === $th->getMessage() ) {
+				return $this->model->get_status();
+			}
+			throw $th;
+		}
+
+		$this->model->reset();
+		$this->model->toggle_status();
+
+		$this->start_scan();
+
+		return $this->model->get_status();
+	}
+
+	private function start_scan() {
+		// TODO: maybe sanitize params?
+		$params = $this->params->get_params();
+		$args = $params['type'] . ' ' . $params['old'] . ' ' . $params['new'] . ' ';
+		$analyzer_folder = realpath( dirname( __DIR__ ) . '/../' );
+		// $cmd = 'nohup php ' . escapeshellarg( $analyzer_folder  . '/scripts/jp-analyze-parallel.php' ) . ' ' . $args . ' &';
+		$cmd = array(
+			'nohup',
+			'php',
+			$analyzer_folder  . '/scripts/jp-analyze-parallel.php',
+			$params['type'],
+			$params['old'],
+			$params['new'],
+			'&'
+		);
+		$descriptor_spec = array(
+			0 => array( 'file', '/dev/null', 'r' ),
+			1 => array( 'file', $analyzer_folder . '/output.txt', 'a' ),
+			2 => array( 'file', $analyzer_folder . '/output.txt', 'a' ),
+		);
+
+		proc_open( $cmd, $descriptor_spec, $pipes );
+	}
+
+	public function post() {
+		return array();
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-controller.php b/projects/packages/analyzer/src/api/class-controller.php
new file mode 100644
index 0000000000000..703b8b65a02e3
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-controller.php
@@ -0,0 +1,35 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+/**
+ * Abstract-ish controller class.
+ */
+class Controller {
+	protected $model;
+	protected $params;
+
+	public function __construct() {
+		$this->model = new Model();
+		$this->params = New Params();
+	}
+
+	public function process() {
+		$out  = array( 'result' => 'OK' );
+		$data = '';
+		switch ( $_SERVER['REQUEST_METHOD'] ) {
+			case 'GET':
+				$data = $this->get();
+				break;
+			case 'POST':
+				$data = $this->post();
+				break;
+
+			default:
+				break;
+		}
+
+		$out['data'] = $data;
+
+		return $out;
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-model.php b/projects/packages/analyzer/src/api/class-model.php
new file mode 100644
index 0000000000000..5aa928ff455d2
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-model.php
@@ -0,0 +1,96 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+class Model {
+	private $db_file;
+	private $content;
+
+	public function __construct() {
+		$this->db_file = dirname( __DIR__ ) . '/data-store.json';
+	}
+
+	public function get_status() {
+		$this->load();
+		return $this->content;
+	}
+
+	public function toggle_status() {
+		$this->load();
+		if ($this->content['status'] === 'finished') {
+			$this->content['status'] = 'in_progress';
+		} else {
+			$this->content['status'] = 'finished';
+		}
+		$this->persist();
+	}
+
+	public function get() {
+		return $this->content;
+	}
+
+	public function update_process( $increment, $started_plugin = null, $finished_plugin = null ) {
+		$this->load();
+		if ( ! isset( $this->content['progress'] ) ) {
+			$this->content['progress'] = array(
+				'plugins_left' => 0,
+				'in_progress'  => array(),
+			);
+		}
+
+		$current_list = $this->content['progress']['in_progress'];
+
+		if ( null !== $finished_plugin && false !== ( $key = array_search( $finished_plugin, $current_list ) ) ) {
+			array_splice( $current_list, $key, 1 );
+		}
+
+		if ( null !== $started_plugin ) {
+			array_push( $current_list, $started_plugin );
+		}
+
+		$this->content['progress']['in_progress']   = $current_list;
+		$this->content['progress']['plugins_left'] += $increment;
+		$this->persist();
+	}
+
+	public function load_result() {
+		$this->load();
+		$warn_folder = dirname( dirname( __DIR__ ) ) . '/output/warnings';
+		$warnings    = array_values ( array_diff( scandir( $warn_folder ), array( '.', '..' ) ) );
+
+		$this->content['result'] = array_reduce(
+			$warnings,
+			function ( $acc, $file ) use ( $warn_folder ) {
+				$file_data = json_decode( file_get_contents( $warn_folder . '/' . $file ) );
+				$key = pathinfo($file)['filename'];
+				$acc[$key] = $file_data;
+				return $acc;
+			},
+			array()
+		);
+		$this->persist();
+	}
+
+	public function load() {
+		if ( ! file_exists( $this->db_file ) ) {
+			$this->reset();
+		}
+		$json          = file_get_contents( $this->db_file );
+		$this->content = json_decode( $json, true );
+		echo 'DEBUG OUTPUT: ';
+		print_r( $json );
+		echo '<br><br><br>';
+
+		return $this->content;
+	}
+
+	public function persist( $arr = null ) {
+		if ( $arr === null ) {
+			$arr = $this->content;
+		}
+		file_put_contents( $this->db_file, json_encode( $arr ) );
+	}
+
+	public function reset() {
+		$this->persist( array( 'status' => 'finished' ) );
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-params.php b/projects/packages/analyzer/src/api/class-params.php
new file mode 100644
index 0000000000000..83c55921bcbe6
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-params.php
@@ -0,0 +1,20 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+/**
+ * Params class
+ */
+class Params {
+	public function get_params() {
+		parse_str($_SERVER['QUERY_STRING'], $params);
+		return $params;
+	}
+
+	public function get_param( $param ) {
+		$params = $this->get_params();
+		if( array_key_exists( $param, $params ) ) {
+			return $params[$param];
+		}
+		return false;
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-plugin-downloader.php b/projects/packages/analyzer/src/api/class-plugin-downloader.php
new file mode 100644
index 0000000000000..7e499ee0db294
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-plugin-downloader.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Automattic\Jetpack\Analyzer;
+
+use Automattic\Jetpack\Analyzer\Scripts;
+
+class PluginDownloader {
+	private $type;
+
+	public function __construct($type) {
+		$this->type = $type;
+		$this->output_dir = realpath( dirname( __DIR__ ) . '/../output' ) . '/';
+	}
+
+	public function get_version($version) {
+		echo 'Getting plugin ' . $this->type . '::' . $version . "\n";
+
+		$target_path = $this->get_target_path($version);
+		if (file_exists($target_path)) {
+			if( $version !== 'master' ) {
+				return $target_path;
+			}
+
+			echo "Removing " . $target_path . "\n";
+			Scripts::rm($target_path);
+		}
+
+		$url = $this->build_url($version);
+		$file_path = $this->download_raw($url);
+		$target_path = $this->unzip($file_path, $version);
+		echo 'Done with plugin ' . $this->type . '::' . $version . "\n";
+		return $target_path;
+	}
+
+	private function get_target_path($version) {
+		$target_folder = $this->type . '__' . $version;
+		return $this->output_dir . $target_folder;
+	}
+
+	private function download_raw($url) {
+		$url_filename = basename( parse_url( $url, PHP_URL_PATH ) );
+
+		$file_path = $this->output_dir . $url_filename;
+		if (false === strpos($url_filename, '.zip')) {
+			$file_path = $file_path  . '.zip';
+		}
+		$context = stream_context_create(array('http' => array(
+			'header' => 'User-Agent: jp-analyzer',
+		)));
+		$out = file_get_contents( $url, false, $context );
+		file_put_contents($file_path, $out);
+
+		return $file_path;
+	}
+
+	private function unzip($file_path, $version) {
+		$target_path = $this->get_target_path($version);
+		$zip = new \ZipArchive;
+
+		if ($zip->open($file_path) !== true) {
+			throw new \Exception("Failed to open plugin's zip file " . $file_path);
+		}
+		for($i = 0; $i < $zip->numFiles; $i++) {
+			$filename = $target_path . '/' . substr_replace($zip->getNameIndex($i), '', 0, strlen($zip->getNameIndex(0)));
+
+			if (substr( $filename, -1 ) === '/' && !file_exists($filename)) {
+					mkdir($filename);
+			} else {
+				copy("zip://" . $file_path . "#" . $zip->getNameIndex($i), $filename);
+			}
+		}
+		$zip->close();
+		return $target_path;
+	}
+
+	private function build_url($version) {
+		if ($this->type === 'jetpack') {
+		// https://api.github.com/repos/Automattic/jetpack-production/tags
+		// https://betadownload.jetpack.me/data/jetpack/master/jetpack-dev.zip
+			if ($version === 'master') {
+				return 'https://betadownload.jetpack.me/data/jetpack/master/jetpack-dev.zip';
+			}
+
+			$context = stream_context_create(array('http' => array( 'header' => 'User-Agent: jp-analyzer')));
+			$out = file_get_contents( 'https://api.github.com/repos/Automattic/jetpack-production/tags', false, $context );
+			$json = json_decode($out);
+			$version_obj = null;
+			foreach ($json as $key => $obj) {
+				if ($obj->name === $version) {
+					$version_obj = $obj;
+					break;
+				}
+			}
+
+			if ($version_obj === null) {
+				throw new \Exception($version . ' not found for ' . $this->type);
+			}
+
+			return $version_obj->zipball_url;
+		} else {
+			throw new \Exception( $this->type . ' is unsupported.');
+		}
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-router.php b/projects/packages/analyzer/src/api/class-router.php
new file mode 100644
index 0000000000000..e81feab9e72aa
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-router.php
@@ -0,0 +1,29 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+/**
+ * Router class. App entry point
+ */
+class Router {
+
+	private $status;
+	private $analyze;
+	private $params;
+
+	public function __construct() {
+		$this->status  = new Status_Controller();
+		$this->analyze = new Analyze_Controller();
+		$this->params = new Params();
+	}
+
+
+	public function handle_request() {
+		if ( $this->params->get_param( 'status' ) !== false ) {
+			return $this->status->process();
+		} elseif ( $this->params->get_param( 'analyze' ) !== false ) {
+			return $this->analyze->process();
+		} else {
+			throw new \Exception( 'Unknown route' );
+		}
+	}
+}
diff --git a/projects/packages/analyzer/src/api/class-status-controller.php b/projects/packages/analyzer/src/api/class-status-controller.php
new file mode 100644
index 0000000000000..9de147e8ec4f5
--- /dev/null
+++ b/projects/packages/analyzer/src/api/class-status-controller.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Automattic\Jetpack\Analyzer;
+
+class Status_Controller extends Controller {
+
+	public function get() {
+		return $this->model->get_status();
+	}
+
+	public function post() {
+		return 'Status_Controller post';
+	}
+
+}
diff --git a/projects/packages/analyzer/src/class-PersistentList.php b/projects/packages/analyzer/src/class-PersistentList.php
index 54d5e2efc7f90..f818120eb3b3d 100644
--- a/projects/packages/analyzer/src/class-PersistentList.php
+++ b/projects/packages/analyzer/src/class-PersistentList.php
@@ -41,7 +41,7 @@ public function save( $file_path, $allow_empty = true ) {
 			return '';
 		}
 
-		if ( ! file_exists( dirname( $file_path ) ) ) {
+		if ( 'php://memory' !== $file_path && ! file_exists( dirname( $file_path ) ) ) {
 			mkdir( dirname( $file_path ), 0777, true );
 		}
 
diff --git a/projects/packages/analyzer/src/class-declarations.php b/projects/packages/analyzer/src/class-declarations.php
index 79e4bf42c1abd..dad7b694578fb 100644
--- a/projects/packages/analyzer/src/class-declarations.php
+++ b/projects/packages/analyzer/src/class-declarations.php
@@ -126,7 +126,7 @@ public function load( $file_path ) {
 					break;
 				default:
 					// TODO: Implement handlers to other difference types.
-					echo $obj->decl_type . " not implemented!\n"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					echo "Declaration not implemented: " . $obj->decl_type . "\n"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					break;
 			}
 		}
diff --git a/projects/packages/analyzer/src/class-differences.php b/projects/packages/analyzer/src/class-differences.php
index 5ec7e970803d2..304b2ec9ccc59 100644
--- a/projects/packages/analyzer/src/class-differences.php
+++ b/projects/packages/analyzer/src/class-differences.php
@@ -155,25 +155,33 @@ public function load( $file_path ) {
 				case 'function_missing':
 					$this->add( new Differences\Function_Missing( Declarations\Function_::from_map( $obj->old_declaration ) ) );
 					break;
+				case 'function_moved':
+					$this->add(new Differences\Function_Moved( Declarations\Function_::from_map( $obj->old_declaration ), Declarations\Function_::from_map( $obj->new_declaration ) ) );
+					break;
 				case 'method_missing':
 					$this->add( new Differences\Class_Method_Missing( Declarations\Class_Method::from_map( $obj->old_declaration ) ) );
 					break;
-
+				case 'method_moved':
+					$this->add(new Differences\Class_Method_Moved( Declarations\Class_Method::from_map( $obj->old_declaration ), Declarations\Class_Method::from_map( $obj->new_declaration ) ) );
+					break;
 				case 'class_missing':
 					$this->add( new Differences\Class_Missing( Declarations\Class_::from_map( $obj->old_declaration ) ) );
 					break;
-
+				case 'class_moved':
+					$this->add(new Differences\Class_Moved( Declarations\Class_::from_map( $obj->old_declaration ), Declarations\Class_::from_map( $obj->new_declaration ) ) );
+					break;
 				case 'class_const_missing':
 					$this->add( new Differences\Class_Const_Missing( Declarations\Class_Const::from_map( $obj->old_declaration ) ) );
 					break;
-
 				case 'property_missing':
 					$this->add( new Differences\Class_Property_Missing( Declarations\Class_Property::from_map( $obj->old_declaration ) ) );
 					break;
-
+				case 'property_moved':
+					$this->add(new Differences\Class_Property_Moved( Declarations\Class_Property::from_map( $obj->old_declaration ), Declarations\Class_Property::from_map( $obj->new_declaration ) ) );
+					break;
 				default:
 					// TODO: Implement handlers to other difference types.
-					echo $obj->diff_type . " not implemented!\n"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+					echo "Difference not implemented: " . $obj->diff_type . "\n"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					break;
 			}
 		}
diff --git a/projects/packages/analyzer/src/diff-generator.php b/projects/packages/analyzer/src/diff-generator.php
new file mode 100644
index 0000000000000..6c0c653b6674f
--- /dev/null
+++ b/projects/packages/analyzer/src/diff-generator.php
@@ -0,0 +1,124 @@
+<?php
+namespace Automattic\Jetpack\Analyzer;
+
+class Scripts {
+	static function get_differences( $new_path, $old_path ) {
+		$excludes = array( '.git', 'vendor', 'tests', 'docker', 'bin', 'scss', 'images', 'docs', 'languages', 'node_modules' );
+
+		$new_out_path             = dirname( __DIR__ ) . '/output/differences/new_target.json';
+		$old_out_path             = dirname( __DIR__ ) . '/output/differences/old_target.json';
+		$diff_path                = dirname( __DIR__ ) . '/output/differences/diff.json';
+		$jetpack_new_declarations = new Declarations();
+		$jetpack_old_declarations = new Declarations();
+		$differences              = new Differences();
+
+		echo "Scanning new declarations\n";
+		if ( file_exists( $new_out_path ) ) {
+			$jetpack_new_declarations->load( $new_out_path );
+		} else {
+			$jetpack_new_declarations->scan( $new_path, $excludes );
+			$jetpack_new_declarations->save_json( $new_out_path, false );
+		}
+
+		echo "Scanning old declarations\n";
+		if ( file_exists( $old_out_path ) ) {
+			$jetpack_old_declarations->load( $old_out_path );
+		} else {
+			$jetpack_old_declarations->scan( $old_path, $excludes );
+			$jetpack_old_declarations->save_json( $old_out_path, false );
+		}
+
+		echo "Looking for differences\n";
+		if ( file_exists( $diff_path ) ) {
+			$differences->load( $diff_path );
+		} else {
+			$differences->find( $jetpack_new_declarations, $jetpack_old_declarations, $new_path );
+			$differences->save_json( $diff_path, false );
+		}
+
+		return $differences;
+	}
+
+	static function load_differences() {
+		$diff_path                = dirname( __DIR__ ) . '/output/differences/diff.json';
+		$differences              = new Differences();
+
+		if ( !file_exists( $diff_path ) ) {
+			throw new \Exception('Failed to load differences. File does not exist: ' . $diff_path);
+		}
+		$differences->load( $diff_path );
+		return $differences;
+	}
+
+	static function get_warnings( $folder_name, $differences, $excludes ) {
+		$warnings_folder = dirname( __DIR__ ) . '/output/warnings/';
+		$invocations_folder = dirname( __DIR__ ) . '/output/invocations/';
+
+		echo "Looking for invocations in:\n${folder_name}\n\n";
+		$invocations = new Invocations();
+		$invocations->scan( $folder_name, $excludes );
+		$invocations->save( $invocations_folder . basename( $folder_name ) . '.json', false );
+
+		echo "Generate warnings\n";
+		$warnings = new Warnings();
+		$warnings->generate( $invocations, $differences );
+		$warnings->output();
+		$warnings->save_json( $warnings_folder . basename( $folder_name ) . '.json', false );
+	}
+
+	static function cleanup() {
+		$diff_folder = dirname( __DIR__ ) . '/output/differences/';
+		$warnings_folder = dirname( __DIR__ ) . '/output/warnings/';
+		$invocations_folder = dirname( __DIR__ ) . '/output/invocations/';
+		echo "Removing " . $diff_folder . "\n";
+		self::rm($diff_folder);
+
+		echo "Removing " . $invocations_folder . "\n";
+		self::rm($invocations_folder);
+
+		echo "Removing " . $warnings_folder . "\n";
+		self::rm($warnings_folder);
+	}
+
+	static function rm($folder) {
+		$iter = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator( escapeshellarg( $folder ), \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS ),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
+		foreach ( $iter as $path ) {
+			if ( is_dir( $path ) ) {
+				rmdir( $path );
+			} else {
+				unlink( $path );
+			}
+		}
+	}
+}
+
+class Locker {
+	public static $__lock_file = 'jp-analyzer.pid';
+
+	static function lock() {
+		$fp = @fopen( self::lock_file(), 'x' );
+		if ( ! $fp ) {
+			throw new \Exception( 'Locked already' );
+		}
+		fwrite( $fp, (string) getmypid() );
+		fclose( $fp );
+	}
+	static function unlock() {
+		if ( self::is_locked() ) {
+			 unlink( self::lock_file() );
+		} else {
+			throw new \Exception( 'Not locked' );
+		}
+	}
+	static function is_locked() {
+		return file_exists( self::lock_file() );
+	}
+
+	static function lock_file() {
+		return '/tmp/' . self::$__lock_file;
+	}
+
+}
diff --git a/projects/packages/assets/.gitattributes b/projects/packages/assets/.gitattributes
index c4febe626d8c4..84cb90e530515 100644
--- a/projects/packages/assets/.gitattributes
+++ b/projects/packages/assets/.gitattributes
@@ -1,10 +1,15 @@
 # Files not needed to be distributed in the package.
-.gitattributes   export-ignore
-.github/         export-ignore
-phpunit.xml.dist export-ignore
-tests/           export-ignore
+.gitattributes    export-ignore
+.github/          export-ignore
+phpunit.xml.dist  export-ignore
+tests/            export-ignore
+webpack.config.js export-ignore
 
 # Files not needed in the production build.
-.phpcs.dir.xml   production-exclude
-.phpcsignore     production-exclude
-/changelog/**    production-exclude
+.gitignore        production-exclude
+.phpcs.dir.xml    production-exclude
+.phpcsignore      production-exclude
+/changelog/**     production-exclude
+
+# Files to include in the production build.
+/build/**         production-include
diff --git a/projects/packages/assets/.gitignore b/projects/packages/assets/.gitignore
new file mode 100644
index 0000000000000..b0c36702cd4c6
--- /dev/null
+++ b/projects/packages/assets/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+build/
+node_modules/
diff --git a/projects/packages/assets/CHANGELOG.md b/projects/packages/assets/CHANGELOG.md
index 833591466aefd..034ec94857943 100644
--- a/projects/packages/assets/CHANGELOG.md
+++ b/projects/packages/assets/CHANGELOG.md
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.17.3] - 2022-02-02
+### Fixed
+- Fixed minor coding standard violation.
+
+## [1.17.2] - 2022-02-01
+### Changed
+- Build: remove unneeded files from production build.
+
+## [1.17.1] - 2022-01-27
+### Changed
+- Updated package dependencies.
+
+## [1.17.0] - 2022-01-25
+### Added
+- Accept package path prefixes from jetpack-composer-plugin and use them when lazy-loading JS translations.
+- Generate the `wp-jp-i18n-loader` module needed by the new i18n-loader-webpack-plugin.
+
+### Deprecated
+- Deprecated the `wp-jp-i18n-state` module.
+
 ## [1.16.2] - 2022-01-18
 ### Fixed
 - Handle the case where `WP_LANG_DIR` is in `WP_CONTENT_DIR`, but `WP_CONTENT_DIR` is not in `ABSPATH`.
@@ -170,6 +190,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Statically access asset tools
 
+[1.17.3]: https://github.com/Automattic/jetpack-assets/compare/v1.17.2...v1.17.3
+[1.17.2]: https://github.com/Automattic/jetpack-assets/compare/v1.17.1...v1.17.2
+[1.17.1]: https://github.com/Automattic/jetpack-assets/compare/v1.17.0...v1.17.1
+[1.17.0]: https://github.com/Automattic/jetpack-assets/compare/v1.16.2...v1.17.0
 [1.16.2]: https://github.com/Automattic/jetpack-assets/compare/v1.16.1...v1.16.2
 [1.16.1]: https://github.com/Automattic/jetpack-assets/compare/v1.16.0...v1.16.1
 [1.16.0]: https://github.com/Automattic/jetpack-assets/compare/v1.15.0...v1.16.0
diff --git a/projects/packages/assets/README.md b/projects/packages/assets/README.md
index 68b283657e02b..ab84f8dfb941c 100644
--- a/projects/packages/assets/README.md
+++ b/projects/packages/assets/README.md
@@ -16,7 +16,7 @@ Includes manipulation of paths, enqueuing async scripts, and DNS resource hintin
 * `::alias_textdomains_from_file( $file )` -- Use data recorded by [automattic/jetpack-composer-plugin](https://packagist.org/packages/automattic/jetpack-composer-plugin) to enable use of translations for shared Composer libraries.
 * `::alias_textdomains( $from, $to, $totype, $ver )` -- Manually add a textdomain alias, if for some reason `::alias_textdomains_from_file()` is insufficient.
 
-The Assets package also provides a `wp-jp-i18n-state` script to support Webpack lazy-loaded bundles using [@automattic/i18n-loader-webpack-plugin](https://www.npmjs.com/package/@automattic/i18n-loader-webpack-plugin). No initialization is required, other than calling `::alias_textdomains_from_file()` or `::alias_textdomains()` if said bundles are coming from shared Composer libraries.
+The Assets package also provides a `wp-jp-i18n-loader` script to support Webpack lazy-loaded bundles using [@automattic/i18n-loader-webpack-plugin](https://www.npmjs.com/package/@automattic/i18n-loader-webpack-plugin). No initialization is required, other than calling `::alias_textdomains_from_file()` or `::alias_textdomains()` if said bundles are coming from shared Composer libraries.
 
 ## Testing
 
diff --git a/projects/js-packages/storybook/changelog/2021-11-16-15-55-31-535583 b/projects/packages/assets/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-11-16-15-55-31-535583
rename to projects/packages/assets/changelog/renovate-wordpress-monorepo
diff --git a/projects/packages/assets/changelog/update-project-scripts-no-install b/projects/packages/assets/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/assets/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/assets/composer.json b/projects/packages/assets/composer.json
index ccf8c81006263..3265ec5826105 100644
--- a/projects/packages/assets/composer.json
+++ b/projects/packages/assets/composer.json
@@ -21,11 +21,21 @@
 		]
 	},
 	"scripts": {
+		"build-development": [
+			"pnpm run build"
+		],
+		"build-production": [
+			"pnpm run build-production"
+		],
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
 		"test-coverage": [
-			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
+			"pnpm run test-coverage"
+		],
+		"test-js": [
+			"pnpm run test"
 		],
 		"test-php": [
 			"@composer phpunit"
@@ -50,7 +60,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "1.16.x-dev"
+			"dev-master": "1.17.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/assets/package.json b/projects/packages/assets/package.json
new file mode 100644
index 0000000000000..995f19dd161fe
--- /dev/null
+++ b/projects/packages/assets/package.json
@@ -0,0 +1,25 @@
+{
+	"private": true,
+	"browserslist": "extends @wordpress/browserslist-config",
+	"scripts": {
+		"build": "pnpm run clean && pnpm run build-js",
+		"build-js": "webpack",
+		"build-production": "pnpm run clean && pnpm run build-production-js && pnpm run validate",
+		"build-production-js": "NODE_ENV=production BABEL_ENV=production pnpm run build-js",
+		"clean": "rm -rf build",
+		"test": "jest tests",
+		"test-coverage": "jest tests --coverage --collectCoverageFrom='src/**/*.js' --coverageDirectory=\"$COVERAGE_DIR/js\" --coverageReporters=clover",
+		"validate": "pnpm exec validate-es build/"
+	},
+	"devDependencies": {
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
+		"md5-es": "1.8.2",
+		"jest": "27.3.1",
+		"webpack": "5.65.0"
+	},
+	"engines": {
+		"node": "^14.18.3 || ^16.13.2",
+		"pnpm": "^6.23.6",
+		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
+	}
+}
diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php
index 92883f2c12852..b2771eac784bf 100644
--- a/projects/packages/assets/src/class-assets.php
+++ b/projects/packages/assets/src/class-assets.php
@@ -32,7 +32,7 @@ class Assets {
 	/**
 	 * The registered textdomain mappings.
 	 *
-	 * @var array `array( mapped_domain => array( string target_domain, string target_type, string semver ) )`.
+	 * @var array `array( mapped_domain => array( string target_domain, string target_type, string semver, string path_prefix ) )`.
 	 */
 	private static $domain_map = array();
 
@@ -358,7 +358,7 @@ public static function register_script( $handle, $path, $relative_to, array $opt
 		}
 
 		if ( $options['asset_path'] && file_exists( "$dir/{$options['asset_path']}" ) ) {
-			$asset                       = require "$dir/{$options['asset_path']}";
+			$asset                       = require "$dir/{$options['asset_path']}"; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 			$options['dependencies']     = array_merge( $asset['dependencies'], $options['dependencies'] );
 			$options['css_dependencies'] = array_merge(
 				array_filter(
@@ -430,7 +430,7 @@ public static function enqueue_script( $handle ) {
 	/**
 	 * 'wp_default_scripts' action handler.
 	 *
-	 * This registers the `wp-jp-i18n-state` script for use by Webpack bundles built with
+	 * This registers the `wp-jp-i18n-loader` script for use by Webpack bundles built with
 	 * `@automattic/i18n-loader-webpack-plugin`.
 	 *
 	 * @since 1.14.0
@@ -438,9 +438,10 @@ public static function enqueue_script( $handle ) {
 	 */
 	public static function wp_default_scripts_hook( $wp_scripts ) {
 		$data = array(
-			'baseUrl'   => false,
-			'locale'    => determine_locale(),
-			'domainMap' => array(),
+			'baseUrl'     => false,
+			'locale'      => determine_locale(),
+			'domainMap'   => array(),
+			'domainPaths' => array(),
 		);
 
 		$lang_dir    = Jetpack_Constants::get_constant( 'WP_LANG_DIR' );
@@ -453,8 +454,11 @@ public static function wp_default_scripts_hook( $wp_scripts ) {
 			$data['baseUrl'] = site_url( substr( trailingslashit( $lang_dir ), strlen( untrailingslashit( $abspath ) ) ) );
 		}
 
-		foreach ( self::$domain_map as $from => list( $to, $type ) ) {
+		foreach ( self::$domain_map as $from => list( $to, $type, , $path ) ) {
 			$data['domainMap'][ $from ] = ( 'core' === $type ? '' : "{$type}/" ) . $to;
+			if ( '' !== $path ) {
+				$data['domainPaths'][ $from ] = trailingslashit( $path );
+			}
 		}
 
 		/**
@@ -468,25 +472,44 @@ public static function wp_default_scripts_hook( $wp_scripts ) {
 		 *  - `locale`: (string) The locale for the page.
 		 *  - `domainMap`: (string[]) A mapping from Composer package textdomains to the corresponding
 		 *    `plugins/textdomain` or `themes/textdomain` (or core `textdomain`, but that's unlikely).
+		 *  - `domainPaths`: (string[]) A mapping from Composer package textdomains to the corresponding package
+		 *     paths.
 		 */
 		$data = apply_filters( 'jetpack_i18n_state', $data );
 
+		// Can't use self::register_script(), this action is called too early.
+		if ( file_exists( __DIR__ . '/../build/i18n-loader.asset.php' ) ) {
+			$path  = '../build/i18n-loader.js';
+			$asset = require __DIR__ . '/../build/i18n-loader.asset.php';
+		} else {
+			$path  = 'js/i18n-loader.js';
+			$asset = array(
+				'dependencies' => array( 'wp-i18n' ),
+				'version'      => filemtime( __DIR__ . "/$path" ),
+			);
+		}
+		$url = self::normalize_path( plugins_url( $path, __FILE__ ) );
+		$url = add_query_arg( 'minify', 'true', $url );
+		$wp_scripts->add( 'wp-jp-i18n-loader', $url, $asset['dependencies'], $asset['version'] );
 		if ( ! is_array( $data ) ||
 			! isset( $data['baseUrl'] ) || ! ( is_string( $data['baseUrl'] ) || false === $data['baseUrl'] ) ||
 			! isset( $data['locale'] ) || ! is_string( $data['locale'] ) ||
-			! isset( $data['domainMap'] ) || ! is_array( $data['domainMap'] )
+			! isset( $data['domainMap'] ) || ! is_array( $data['domainMap'] ) ||
+			! isset( $data['domainPaths'] ) || ! is_array( $data['domainPaths'] )
 		) {
-			$js = 'console.warn( "I18n state deleted by jetpack_i18n_state hook" );';
+			$wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'console.warn( "I18n state deleted by jetpack_i18n_state hook" );' );
 		} elseif ( ! $data['baseUrl'] ) {
-			$js = 'console.warn( "Failed to determine languages base URL. Is WP_LANG_DIR in the WordPress root?" );';
+			$wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'console.warn( "Failed to determine languages base URL. Is WP_LANG_DIR in the WordPress root?" );' );
 		} else {
-			$data['domainMap'] = (object) $data['domainMap']; // Ensure it becomes a json object.
-			$js                = 'wp.jpI18nState = ' . wp_json_encode( $data, JSON_UNESCAPED_SLASHES ) . ';';
+			$data['domainMap']   = (object) $data['domainMap']; // Ensure it becomes a json object.
+			$data['domainPaths'] = (object) $data['domainPaths']; // Ensure it becomes a json object.
+			$wp_scripts->add_inline_script( 'wp-jp-i18n-loader', 'wp.jpI18nLoader.state = ' . wp_json_encode( $data, JSON_UNESCAPED_SLASHES ) . ';' );
 		}
 
-		// Depend on wp-i18n to ensure global `wp` exists and because anything needing this will need that too.
-		$wp_scripts->add( 'wp-jp-i18n-state', null, array( 'wp-i18n' ) );
-		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', $js, 'before' );
+		// Deprecated state module: Depend on wp-i18n to ensure global `wp` exists and because anything needing this will need that too.
+		$wp_scripts->add( 'wp-jp-i18n-state', null, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) );
+		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' );
+		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' );
 	}
 
 	// endregion .
@@ -510,9 +533,10 @@ public static function wp_default_scripts_hook( $wp_scripts ) {
 	 * @param string $to Domain to alias it to.
 	 * @param string $totype What is the target of the alias: 'plugins', 'themes', or 'core'.
 	 * @param string $ver Version of the `$from` domain.
+	 * @param string $path Path to prepend when lazy-loading from JavaScript.
 	 * @throws InvalidArgumentException If arguments are invalid.
 	 */
-	public static function alias_textdomain( $from, $to, $totype, $ver ) {
+	public static function alias_textdomain( $from, $to, $totype, $ver, $path = '' ) {
 		if ( ! in_array( $totype, array( 'plugins', 'themes', 'core' ), true ) ) {
 			throw new InvalidArgumentException( 'Type must be "plugins", "themes", or "core"' );
 		}
@@ -536,9 +560,9 @@ public static function alias_textdomain( $from, $to, $totype, $ver ) {
 
 		if ( empty( self::$domain_map[ $from ] ) ) {
 			self::init_domain_map_hooks( $from, array() === self::$domain_map );
-			self::$domain_map[ $from ] = array( $to, $totype, $ver );
+			self::$domain_map[ $from ] = array( $to, $totype, $ver, $path );
 		} elseif ( Semver::compare( $ver, self::$domain_map[ $from ][2] ) > 0 ) {
-			self::$domain_map[ $from ] = array( $to, $totype, $ver );
+			self::$domain_map[ $from ] = array( $to, $totype, $ver, $path );
 		}
 	}
 
@@ -549,15 +573,21 @@ public static function alias_textdomain( $from, $to, $totype, $ver ) {
 	 * with the following properties:
 	 *  - 'domain': String, `$to`
 	 *  - 'type': String, `$totype`
-	 *  - 'packages': Array, mapping `$from` to `$ver`.
+	 *  - 'packages': Array, mapping `$from` to `array( 'path' => $path, 'ver' => $ver )` (or to the string `$ver` for back compat).
 	 *
 	 * @since 1.15.0
 	 * @param string $file Mapping file.
 	 */
 	public static function alias_textdomains_from_file( $file ) {
 		$data = require $file;
-		foreach ( $data['packages'] as $from => $ver ) {
-			self::alias_textdomain( $from, $data['domain'], $data['type'], $ver );
+		foreach ( $data['packages'] as $from => $fromdata ) {
+			if ( ! is_array( $fromdata ) ) {
+				$fromdata = array(
+					'path' => '',
+					'ver'  => $fromdata,
+				);
+			}
+			self::alias_textdomain( $from, $data['domain'], $data['type'], $fromdata['ver'], $fromdata['path'] );
 		}
 	}
 
diff --git a/projects/packages/assets/src/js/i18n-loader.js b/projects/packages/assets/src/js/i18n-loader.js
new file mode 100644
index 0000000000000..6887aa8539f59
--- /dev/null
+++ b/projects/packages/assets/src/js/i18n-loader.js
@@ -0,0 +1,76 @@
+const { default: md5 } = require( 'md5-es' );
+const i18n = require( '@wordpress/i18n' );
+
+const locationMap = {
+	plugin: 'plugins/',
+	theme: 'themes/',
+	core: '',
+};
+
+const hasOwn = ( obj, prop ) => Object.prototype.hasOwnProperty.call( obj, prop );
+
+module.exports = {
+	state: {
+		baseUrl: null,
+		locale: null,
+		domainMap: {},
+		domainPaths: {},
+	},
+
+	/**
+	 * Download and register translations for a bundle.
+	 *
+	 * @param {string} path - Bundle path being fetched. May have a query part.
+	 * @param {string} domain - Text domain to register into.
+	 * @param {string} location - Location for the translation: 'plugin', 'theme', or 'core'.
+	 * @returns {Promise} Resolved when the translations are registered, or rejected with an `Error`.
+	 */
+	async downloadI18n( path, domain, location ) {
+		const state = this.state;
+		if ( ! state || typeof state.baseUrl !== 'string' ) {
+			throw new Error( 'wp.jpI18nLoader.state is not set' );
+		}
+
+		// "en_US" is the default, no translations are needed.
+		if ( state.locale === 'en_US' ) {
+			return;
+		}
+
+		// Check that fetch is available.
+		if ( typeof fetch === 'undefined' ) {
+			throw new Error( 'Fetch API is not available.' );
+		}
+
+		// Extract any query part and hash the script name like WordPress does.
+		const pathPrefix = hasOwn( state.domainPaths, domain ) ? state.domainPaths[ domain ] : '';
+		let hash, query;
+		const i = path.indexOf( '?' );
+		if ( i >= 0 ) {
+			hash = md5.hash( pathPrefix + path.substring( 0, i ) );
+			query = path.substring( i );
+		} else {
+			hash = md5.hash( pathPrefix + path );
+			query = '';
+		}
+
+		// Download.
+		const locationAndDomain = hasOwn( state.domainMap, domain )
+			? state.domainMap[ domain ]
+			: locationMap[ location ] + domain;
+		const res = await fetch(
+			// prettier-ignore
+			`${ state.baseUrl }${ locationAndDomain }-${ state.locale }-${ hash }.json${ query }`
+		);
+		if ( ! res.ok ) {
+			throw new Error( `HTTP request failed: ${ res.status } ${ res.statusText }` );
+		}
+		const data = await res.json();
+
+		// Extract the messages from the file and register them.
+		const localeData = hasOwn( data.locale_data, domain )
+			? data.locale_data[ domain ]
+			: data.locale_data.messages;
+		localeData[ '' ].domain = domain;
+		i18n.setLocaleData( localeData, domain );
+	},
+};
diff --git a/projects/packages/assets/tests/js/i18n-loader.test.js b/projects/packages/assets/tests/js/i18n-loader.test.js
new file mode 100644
index 0000000000000..903e65168e7e4
--- /dev/null
+++ b/projects/packages/assets/tests/js/i18n-loader.test.js
@@ -0,0 +1,215 @@
+global.fetch = jest.fn();
+fetch.mockFetchResponse = function ( body, init = {} ) {
+	const status = parseInt( init.status || 200 );
+	const statusText = init.statusText || 'OK';
+
+	let rbody = body;
+	if ( typeof rbody !== 'string' ) {
+		rbody = JSON.stringify( rbody );
+	}
+	if ( status < 200 || status > 599 ) {
+		throw new Error( `Invalid status: ${ init.status }` );
+	}
+
+	this.mockResolvedValueOnce( {
+		body: rbody,
+		ok: status < 300,
+		status: status,
+		statusText: statusText,
+		json: () => JSON.parse( rbody ),
+	} );
+};
+
+const mockSetLocaleData = jest.fn();
+jest.doMock( '@wordpress/i18n', () => ( {
+	setLocaleData: mockSetLocaleData,
+} ) );
+
+const translations = JSON.stringify( {
+	domain: 'messages',
+	locale_data: {
+		messages: {
+			'': {
+				domain: 'messages',
+				lang: 'en',
+				'plural-forms': 'nplurals=2; plural=(n != 1);',
+			},
+			'This is translated': [ 'is-Thay is-way anslated-tray' ],
+		},
+	},
+} );
+
+const loader = require( '../../src/js/i18n-loader.js' );
+
+beforeEach( () => {
+	global.fetch.mockReset();
+	mockSetLocaleData.mockReset();
+
+	loader.state = {
+		baseUrl: 'http://example.com/wp-content/languages/',
+		locale: 'en_piglatin',
+		domainMap: {},
+		domainPaths: {},
+	};
+} );
+
+test( 'No state', async () => {
+	loader.state = null;
+	await expect( loader.downloadI18n( 'foo', 'bar', 'baz' ) ).rejects.toThrow(
+		'wp.jpI18nLoader.state is not set'
+	);
+	expect( global.fetch ).not.toHaveBeenCalled();
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test( 'No baseUrl in state', async () => {
+	loader.state.baseUrl = null;
+	await expect( loader.downloadI18n( 'foo', 'bar', 'baz' ) ).rejects.toThrow(
+		'wp.jpI18nLoader.state is not set'
+	);
+	expect( global.fetch ).not.toHaveBeenCalled();
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test( 'Locale is en_US', async () => {
+	loader.state.locale = 'en_US';
+	await expect( loader.downloadI18n( 'foo', 'bar', 'baz' ) ).resolves.not.toThrow();
+	expect( global.fetch ).not.toHaveBeenCalled();
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test( 'No fetch', async () => {
+	const tmp = global.fetch;
+	try {
+		delete global.fetch;
+		await expect( loader.downloadI18n( 'foo', 'bar', 'baz' ) ).rejects.toThrow(
+			'Fetch API is not available.'
+		);
+	} finally {
+		global.fetch = tmp;
+	}
+	expect( global.fetch ).not.toHaveBeenCalled();
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test.each( [
+	[ 'plugin', 'plugins/' ],
+	[ 'theme', 'themes/' ],
+	[ 'core', '' ],
+] )( 'Simple fetch (location=%s)', async ( location, urlpart ) => {
+	fetch.mockFetchResponse( translations );
+	await expect( loader.downloadI18n( 'foo.js', 'bar', location ) ).resolves.not.toThrow();
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		`http://example.com/wp-content/languages/${ urlpart }bar-en_piglatin-c30102c2bcf57c992ba3491b22e1e4d0.json`
+	);
+	expect( mockSetLocaleData ).toHaveBeenCalledTimes( 1 );
+	expect( mockSetLocaleData ).toHaveBeenCalledWith(
+		{
+			'': {
+				domain: 'bar',
+				lang: 'en',
+				'plural-forms': 'nplurals=2; plural=(n != 1);',
+			},
+			'This is translated': [ 'is-Thay is-way anslated-tray' ],
+		},
+		'bar'
+	);
+} );
+
+test( 'Failed fetch', async () => {
+	fetch.mockFetchResponse( 'The specified document was not found.', {
+		status: 404,
+		statusText: 'Not found',
+	} );
+	await expect( loader.downloadI18n( 'foo.js', 'bar', 'plugin' ) ).rejects.toThrow(
+		'HTTP request failed: 404 Not found'
+	);
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		'http://example.com/wp-content/languages/plugins/bar-en_piglatin-c30102c2bcf57c992ba3491b22e1e4d0.json'
+	);
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test( 'Bad JSON', async () => {
+	fetch.mockFetchResponse( '<html>Whatever</html>' );
+	await expect( loader.downloadI18n( 'foo.js', 'bar', 'plugin' ) ).rejects.toThrow(
+		'Unexpected token < in JSON at position 0'
+	);
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		'http://example.com/wp-content/languages/plugins/bar-en_piglatin-c30102c2bcf57c992ba3491b22e1e4d0.json'
+	);
+	expect( mockSetLocaleData ).not.toHaveBeenCalled();
+} );
+
+test( 'Fetch with query part and domain map', async () => {
+	loader.state.domainMap.bar = 'themes/mytheme';
+	fetch.mockFetchResponse( translations );
+	await expect(
+		loader.downloadI18n( 'dist/foo.js?ver=12345?6789', 'bar', 'plugin' )
+	).resolves.not.toThrow();
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		'http://example.com/wp-content/languages/themes/mytheme-en_piglatin-1648792a465228e857cd166c292e2e4a.json?ver=12345?6789'
+	);
+	expect( mockSetLocaleData ).toHaveBeenCalledTimes( 1 );
+	expect( mockSetLocaleData ).toHaveBeenCalledWith(
+		{
+			'': {
+				domain: 'bar',
+				lang: 'en',
+				'plural-forms': 'nplurals=2; plural=(n != 1);',
+			},
+			'This is translated': [ 'is-Thay is-way anslated-tray' ],
+		},
+		'bar'
+	);
+} );
+
+test( 'Fetch with query part and domain map and path', async () => {
+	loader.state.domainMap.bar = 'themes/mytheme';
+	loader.state.domainPaths.bar = 'path/to/bar/';
+	fetch.mockFetchResponse( translations );
+	await expect(
+		loader.downloadI18n( 'dist/foo.js?ver=12345?6789', 'bar', 'plugin' )
+	).resolves.not.toThrow();
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		'http://example.com/wp-content/languages/themes/mytheme-en_piglatin-fe1568906ebfe6b7e22d422cba956f83.json?ver=12345?6789'
+	);
+	expect( mockSetLocaleData ).toHaveBeenCalledTimes( 1 );
+	expect( mockSetLocaleData ).toHaveBeenCalledWith(
+		{
+			'': {
+				domain: 'bar',
+				lang: 'en',
+				'plural-forms': 'nplurals=2; plural=(n != 1);',
+			},
+			'This is translated': [ 'is-Thay is-way anslated-tray' ],
+		},
+		'bar'
+	);
+} );
+
+test( 'Fetch with silly domain', async () => {
+	fetch.mockFetchResponse( translations );
+	await expect( loader.downloadI18n( 'foo.js', 'toString', 'plugin' ) ).resolves.not.toThrow();
+	expect( global.fetch ).toHaveBeenCalledTimes( 1 );
+	expect( global.fetch ).toHaveBeenCalledWith(
+		'http://example.com/wp-content/languages/plugins/toString-en_piglatin-c30102c2bcf57c992ba3491b22e1e4d0.json'
+	);
+	expect( mockSetLocaleData ).toHaveBeenCalledTimes( 1 );
+	expect( mockSetLocaleData ).toHaveBeenCalledWith(
+		{
+			'': {
+				domain: 'toString',
+				lang: 'en',
+				'plural-forms': 'nplurals=2; plural=(n != 1);',
+			},
+			'This is translated': [ 'is-Thay is-way anslated-tray' ],
+		},
+		'toString'
+	);
+} );
diff --git a/projects/packages/assets/tests/php/test-assets-files/i18n-map.php b/projects/packages/assets/tests/php/test-assets-files/i18n-map.php
index 522298c29c572..b9ee3fef2fbfa 100644
--- a/projects/packages/assets/tests/php/test-assets-files/i18n-map.php
+++ b/projects/packages/assets/tests/php/test-assets-files/i18n-map.php
@@ -3,7 +3,10 @@
 	'domain' => 'target',
 	'type' => 'plugins',
 	'packages' => array(
-		'foo' => '1.2.3',
+		'foo' => array(
+			'path' => 'path/to/foo',
+			'ver' => '1.2.3',
+		),
 		'bar' => '4.5.6',
 	),
 );
diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php
index 1195f69a40cef..a649f5336079a 100644
--- a/projects/packages/assets/tests/php/test-assets.php
+++ b/projects/packages/assets/tests/php/test-assets.php
@@ -672,10 +672,24 @@ function ( $v ) {
 		$mock = $this->getMockBuilder( stdClass::class )
 			->setMethods( array( 'add', 'add_inline_script' ) )
 			->getMock();
-		$mock->expects( $this->once() )->method( 'add' )
-			->with( 'wp-jp-i18n-state', null, array( 'wp-i18n' ) );
-		$mock->expects( $this->once() )->method( 'add_inline_script' )
-			->with( 'wp-jp-i18n-state', $expect_js, 'before' );
+		$mock->expects( $this->exactly( 2 ) )->method( 'add' )
+			->withConsecutive(
+				array(
+					'wp-jp-i18n-loader',
+					$this->logicalOr(
+						'http://www.example.com/wp-content/plugins/jetpack/packages/assets/build/i18n-loader.js?minify=true',
+						'http://www.example.com/wp-content/plugins/jetpack/packages/assets/src/js/i18n-loader.js?minify=true'
+					),
+					array( 'wp-i18n' ),
+				),
+				array( 'wp-jp-i18n-state', null, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) )
+			);
+		$mock->expects( $this->exactly( 3 ) )->method( 'add_inline_script' )
+			->withConsecutive(
+				array( 'wp-jp-i18n-loader', $expect_js ),
+				array( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' ),
+				array( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' )
+			);
 
 		Assets::wp_default_scripts_hook( $mock );
 	}
@@ -683,54 +697,58 @@ function ( $v ) {
 	/** Data provider for test_wp_default_scripts_hook. */
 	public function provide_wp_default_scripts_hook() {
 		$expect_filter = array(
-			'baseUrl'   => 'http://example.com/wp-content/languages/',
-			'locale'    => 'en_US',
-			'domainMap' => array(),
+			'baseUrl'     => 'http://example.com/wp-content/languages/',
+			'locale'      => 'en_US',
+			'domainMap'   => array(),
+			'domainPaths' => array(),
 		);
 
 		return array(
-			'Basic test'                       => array(
+			'Basic test'                         => array(
 				$expect_filter,
-				'wp.jpI18nState = {"baseUrl":"http://example.com/wp-content/languages/","locale":"en_US","domainMap":{}};',
+				'wp.jpI18nLoader.state = {"baseUrl":"http://example.com/wp-content/languages/","locale":"en_US","domainMap":{},"domainPaths":{}};',
 			),
-			'Basic test (2)'                   => array(
+			'Basic test (2)'                     => array(
 				array(
-					'baseUrl'   => 'http://example.com/wp-includes/languages/',
-					'locale'    => 'de_DE',
-					'domainMap' => array(
+					'baseUrl'     => 'http://example.com/wp-includes/languages/',
+					'locale'      => 'de_DE',
+					'domainMap'   => array(
 						'jetpack-foo' => 'plugins/jetpack',
 						'jetpack-bar' => 'themes/sometheme',
 						'core'        => 'default',
 					),
+					'domainPaths' => array(
+						'jetpack-foo' => 'path/to/foo/',
+					),
 				),
-				'wp.jpI18nState = {"baseUrl":"http://example.com/wp-includes/languages/","locale":"de_DE","domainMap":{"jetpack-foo":"plugins/jetpack","jetpack-bar":"themes/sometheme","core":"default"}};',
+				'wp.jpI18nLoader.state = {"baseUrl":"http://example.com/wp-includes/languages/","locale":"de_DE","domainMap":{"jetpack-foo":"plugins/jetpack","jetpack-bar":"themes/sometheme","core":"default"},"domainPaths":{"jetpack-foo":"path/to/foo/"}};',
 				array(
 					'constants'  => array( 'WP_LANG_DIR' => '/path/to/wordpress/wp-includes/languages' ),
 					'locale'     => 'de_DE',
 					'domain_map' => array(
-						'jetpack-foo' => array( 'jetpack', 'plugins', '1.2.3' ),
-						'jetpack-bar' => array( 'sometheme', 'themes', '1.2.3' ),
-						'core'        => array( 'default', 'core', '1.2.3' ),
+						'jetpack-foo' => array( 'jetpack', 'plugins', '1.2.3', 'path/to/foo' ),
+						'jetpack-bar' => array( 'sometheme', 'themes', '1.2.3', '' ),
+						'core'        => array( 'default', 'core', '1.2.3', '' ),
 					),
 				),
 			),
-			'Bad WP_LANG_DIR'                  => array(
+			'Bad WP_LANG_DIR'                    => array(
 				array( 'baseUrl' => false ) + $expect_filter,
 				'console.warn( "Failed to determine languages base URL. Is WP_LANG_DIR in the WordPress root?" );',
 				array(
 					'constants' => array( 'WP_LANG_DIR' => '/not/path/to/wordpress/wp-content/languages' ),
 				),
 			),
-			'WP_LANG_DIR in wp-includes'       => array(
+			'WP_LANG_DIR in wp-includes'         => array(
 				array( 'baseUrl' => 'http://example.com/wp-includes/languages/' ) + $expect_filter,
-				'wp.jpI18nState = {"baseUrl":"http://example.com/wp-includes/languages/","locale":"en_US","domainMap":{}};',
+				'wp.jpI18nLoader.state = {"baseUrl":"http://example.com/wp-includes/languages/","locale":"en_US","domainMap":{},"domainPaths":{}};',
 				array(
 					'constants' => array( 'WP_LANG_DIR' => '/path/to/wordpress/wp-includes/languages' ),
 				),
 			),
-			'WP_CONTENT_DIR not in ABSPATH'    => array(
+			'WP_CONTENT_DIR not in ABSPATH'      => array(
 				array( 'baseUrl' => 'http://example.com/wp-content/languages/' ) + $expect_filter,
-				'wp.jpI18nState = {"baseUrl":"http://example.com/wp-content/languages/","locale":"en_US","domainMap":{}};',
+				'wp.jpI18nLoader.state = {"baseUrl":"http://example.com/wp-content/languages/","locale":"en_US","domainMap":{},"domainPaths":{}};',
 				array(
 					'constants' => array(
 						'ABSPATH'        => '/srv/htdocs/__wp__/',
@@ -739,72 +757,101 @@ public function provide_wp_default_scripts_hook() {
 					),
 				),
 			),
-			'Filter'                           => array(
+			'Filter'                             => array(
 				array( 'baseUrl' => false ) + $expect_filter,
-				'wp.jpI18nState = {"baseUrl":"http://example.org/languages/","locale":"klingon","domainMap":{"foo":"plugins/bar"}};',
+				'wp.jpI18nLoader.state = {"baseUrl":"http://example.org/languages/","locale":"klingon","domainMap":{"foo":"plugins/bar"},"domainPaths":{"foo":"path/to/bar/"}};',
 				array(
 					'constants' => array( 'WP_LANG_DIR' => '/not/path/to/wordpress/wp-content/languages' ),
 					'filter'    => array(
-						'baseUrl'   => 'http://example.org/languages/',
-						'locale'    => 'klingon',
-						'domainMap' => array( 'foo' => 'plugins/bar' ),
+						'baseUrl'     => 'http://example.org/languages/',
+						'locale'      => 'klingon',
+						'domainMap'   => array( 'foo' => 'plugins/bar' ),
+						'domainPaths' => array( 'foo' => 'path/to/bar/' ),
 					),
 				),
 			),
-			'Bad filter: not array'            => array(
+			'Bad filter: not array'              => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array( 'filter' => null ),
 			),
-			'Bad filter: baseUrl is not set'   => array(
+			'Bad filter: baseUrl is not set'     => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array(
 					'filter' => array(
-						'locale'    => 'en_US',
-						'domainMap' => array(),
+						'locale'      => 'en_US',
+						'domainMap'   => array(),
+						'domainPaths' => array(),
 					),
 				),
 			),
-			'Bad filter: locale is not set'    => array(
+			'Bad filter: locale is not set'      => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array(
 					'filter' => array(
-						'baseUrl'   => 'http://example.com/wp-content/languages/',
-						'domainMap' => array(),
+						'baseUrl'     => 'http://example.com/wp-content/languages/',
+						'domainMap'   => array(),
+						'domainPaths' => array(),
 					),
 				),
 			),
-			'Bad filter: locale is bad'        => array(
+			'Bad filter: locale is bad'          => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array(
 					'filter' => array(
-						'baseUrl'   => 'http://example.com/wp-content/languages/',
-						'locale'    => false,
-						'domainMap' => array(),
+						'baseUrl'     => 'http://example.com/wp-content/languages/',
+						'locale'      => false,
+						'domainMap'   => array(),
+						'domainPaths' => array(),
 					),
 				),
 			),
-			'Bad filter: domainMap is not set' => array(
+			'Bad filter: domainMap is not set'   => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array(
 					'filter' => array(
-						'baseUrl' => 'http://example.com/wp-content/languages/',
-						'locale'  => 'en_US',
+						'baseUrl'     => 'http://example.com/wp-content/languages/',
+						'locale'      => 'en_US',
+						'domainPaths' => array(),
 					),
 				),
 			),
-			'Bad filter: domainMap is bad'     => array(
+			'Bad filter: domainMap is bad'       => array(
+				$expect_filter,
+				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
+				array(
+					'filter' => array(
+						'baseUrl'     => 'http://example.com/wp-content/languages/',
+						'locale'      => 'en_US',
+						'domainMap'   => (object) array(),
+						'domainPaths' => array(),
+					),
+				),
+			),
+			'Bad filter: domainPaths is not set' => array(
 				$expect_filter,
 				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
 				array(
 					'filter' => array(
 						'baseUrl'   => 'http://example.com/wp-content/languages/',
 						'locale'    => 'en_US',
-						'domainMap' => (object) array(),
+						'domainMap' => array(),
+					),
+				),
+			),
+			'Bad filter: domainPaths is bad'     => array(
+				$expect_filter,
+				'console.warn( "I18n state deleted by jetpack_i18n_state hook" );',
+				array(
+					'filter' => array(
+						'baseUrl'     => 'http://example.com/wp-content/languages/',
+						'locale'      => 'en_US',
+						'domainMap'   => array(),
+						'domainPaths' => (object) array(),
 					),
 				),
 			),
@@ -823,15 +870,15 @@ public function test_alias_textdomain() {
 		Filters\expectAdded( 'ngettext_with_context_bar' )->once()->with( array( Assets::class, 'filter_ngettext_with_context' ), 10, 6 );
 		Filters\expectAdded( 'load_script_translation_file' )->once()->with( array( Assets::class, 'filter_load_script_translation_file' ), 10, 3 );
 
-		Assets::alias_textdomain( 'foo', 'one', 'plugins', '1.2.3' );
-		Assets::alias_textdomain( 'foo', 'two', 'plugins', '1.2.4' );
-		Assets::alias_textdomain( 'bar', 'one', 'themes', '1.2.3' );
-		Assets::alias_textdomain( 'bar', 'two', 'themes', '1.2.2' );
+		Assets::alias_textdomain( 'foo', 'one', 'plugins', '1.2.3', 'path/to/foo/1.2.3' );
+		Assets::alias_textdomain( 'foo', 'two', 'plugins', '1.2.4', 'path/to/foo/1.2.4' );
+		Assets::alias_textdomain( 'bar', 'one', 'themes', '1.2.3', 'path/to/bar/1.2.3' );
+		Assets::alias_textdomain( 'bar', 'two', 'themes', '1.2.2', 'path/to/bar/1.2.2' );
 
 		$this->assertEquals(
 			array(
-				'foo' => array( 'two', 'plugins', '1.2.4' ),
-				'bar' => array( 'one', 'themes', '1.2.3' ),
+				'foo' => array( 'two', 'plugins', '1.2.4', 'path/to/foo/1.2.4' ),
+				'bar' => array( 'one', 'themes', '1.2.3', 'path/to/bar/1.2.3' ),
 			),
 			TestingAccessWrapper::newFromClass( Assets::class )->domain_map
 		);
@@ -849,8 +896,8 @@ public function test_alias_textdomains_from_file() {
 		Assets::alias_textdomains_from_file( __DIR__ . '/test-assets-files/i18n-map.php' );
 		$this->assertEquals(
 			array(
-				'foo' => array( 'target', 'plugins', '1.2.3' ),
-				'bar' => array( 'target', 'plugins', '4.5.6' ),
+				'foo' => array( 'target', 'plugins', '1.2.3', 'path/to/foo' ),
+				'bar' => array( 'target', 'plugins', '4.5.6', '' ),
 			),
 			TestingAccessWrapper::newFromClass( Assets::class )->domain_map
 		);
@@ -869,7 +916,7 @@ public function test_alias_textdomain__after_wp_default_scripts() {
 
 	/** Test filter_gettext. */
 	public function test_filter_gettext() {
-		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3' ) );
+		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3', '' ) );
 
 		Functions\expect( '__' )->once()->with( 'foo', 'newdomain' )->andReturn( 'oo-fay' );
 		Functions\expect( '__' )->never()->with( 'bar', 'newdomain' );
@@ -881,7 +928,7 @@ public function test_filter_gettext() {
 
 	/** Test filter_ngettext. */
 	public function test_filter_ngettext() {
-		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3' ) );
+		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3', '' ) );
 
 		Functions\expect( '_n' )->once()->with( 'foo', 'foos', 10, 'newdomain' )->andReturn( 'oos-fay' );
 		Functions\expect( '_n' )->never()->with( 'bar', 'bars', 42, 'newdomain' );
@@ -893,7 +940,7 @@ public function test_filter_ngettext() {
 
 	/** Test filter_gettext_with_context. */
 	public function test_filter_gettext_with_context() {
-		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3' ) );
+		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3', '' ) );
 
 		Functions\expect( '_x' )->once()->with( 'foo', 'context', 'newdomain' )->andReturn( 'oo-fay' );
 		Functions\expect( '_x' )->never()->with( 'bar', 'context', 'newdomain' );
@@ -905,7 +952,7 @@ public function test_filter_gettext_with_context() {
 
 	/** Test filter_ngettext_with_context. */
 	public function test_filter_ngettext_with_context() {
-		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3' ) );
+		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array( 'olddomain' => array( 'newdomain', 'plugins', '1.2.3', '' ) );
 
 		Functions\expect( '_nx' )->once()->with( 'foo', 'foos', 10, 'context', 'newdomain' )->andReturn( 'oos-fay' );
 		Functions\expect( '_nx' )->never()->with( 'bar', 'bars', 42, 'context', 'newdomain' );
@@ -926,9 +973,9 @@ public function test_filter_ngettext_with_context() {
 	public function test_filter_load_script_translation_file( $args, $is_readable, $expect ) {
 		Jetpack_Constants::set_constant( 'WP_LANG_DIR', '/path/to/wordpress/wp-content/languages' );
 		TestingAccessWrapper::newFromClass( Assets::class )->domain_map = array(
-			'one'   => array( 'new1', 'plugins', '1.2.3' ),
-			'two'   => array( 'new2', 'themes', '1.2.3' ),
-			'three' => array( 'new3', 'core', '1.2.3' ),
+			'one'   => array( 'new1', 'plugins', '1.2.3', 'path/to/one' ),
+			'two'   => array( 'new2', 'themes', '1.2.3', '' ),
+			'three' => array( 'new3', 'core', '1.2.3', '' ),
 		);
 		Functions\when( 'is_readable' )->alias(
 			function ( $file ) use ( $is_readable ) {
diff --git a/projects/packages/assets/webpack.config.js b/projects/packages/assets/webpack.config.js
new file mode 100644
index 0000000000000..31af843abff68
--- /dev/null
+++ b/projects/packages/assets/webpack.config.js
@@ -0,0 +1,37 @@
+const jetpackWebpackConfig = require( '@automattic/jetpack-webpack-config/webpack' );
+const path = require( 'path' );
+
+module.exports = [
+	{
+		entry: {
+			'i18n-loader': {
+				import: './src/js/i18n-loader.js',
+				library: {
+					name: [ 'wp', 'jpI18nLoader' ],
+					type: 'window',
+				},
+			},
+		},
+		mode: jetpackWebpackConfig.mode,
+		devtool: jetpackWebpackConfig.isProduction ? false : 'source-map',
+		output: {
+			...jetpackWebpackConfig.output,
+			path: path.resolve( './build' ),
+		},
+		optimization: {
+			...jetpackWebpackConfig.optimization,
+		},
+		resolve: {
+			...jetpackWebpackConfig.resolve,
+		},
+		node: false,
+		plugins: [ ...jetpackWebpackConfig.StandardPlugins() ],
+		module: {
+			strictExportPresence: true,
+			rules: [
+				// Transpile JavaScript, including node_modules.
+				jetpackWebpackConfig.TranspileRule(),
+			],
+		},
+	},
+];
diff --git a/projects/packages/autoloader/CHANGELOG.md b/projects/packages/autoloader/CHANGELOG.md
index 14167ae2a0274..a895b18c8d900 100644
--- a/projects/packages/autoloader/CHANGELOG.md
+++ b/projects/packages/autoloader/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.10.12] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [2.10.11] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -221,6 +225,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add Custom Autoloader
 
+[2.10.12]: https://github.com/Automattic/jetpack-autoloader/compare/v2.10.11...v2.10.12
 [2.10.11]: https://github.com/Automattic/jetpack-autoloader/compare/v2.10.10...v2.10.11
 [2.10.10]: https://github.com/Automattic/jetpack-autoloader/compare/v2.10.9...v2.10.10
 [2.10.9]: https://github.com/Automattic/jetpack-autoloader/compare/v2.10.8...v2.10.9
diff --git a/projects/packages/autoloader/changelog/update-project-scripts-no-install b/projects/packages/autoloader/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/autoloader/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/backup/CHANGELOG.md b/projects/packages/backup/CHANGELOG.md
index cd5b3bb331ac4..8d63dd84d7083 100644
--- a/projects/packages/backup/CHANGELOG.md
+++ b/projects/packages/backup/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.3] - 2022-01-25
+### Changed
+- Dependency Update - Sync from 1.29 to 1.29
+
 ## [1.2.2] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -102,6 +106,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add API endpoints and Jetpack Backup package for managing Help…
 
+[1.2.3]: https://github.com/Automattic/jetpack-backup/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/Automattic/jetpack-backup/compare/v1.2.1...v1.2.2
 [1.2.1]: https://github.com/Automattic/jetpack-backup/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/Automattic/jetpack-backup/compare/v1.1.11...v1.2.0
diff --git a/projects/packages/backup/changelog/add-jp-search-sync2 b/projects/packages/backup/changelog/add-jp-search-sync2
deleted file mode 100644
index 042129798fa81..0000000000000
--- a/projects/packages/backup/changelog/add-jp-search-sync2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Dependency Update - Sync from 1.29 to 1.29
diff --git a/projects/packages/backup/changelog/update-project-scripts-no-install b/projects/packages/backup/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/backup/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
index e87ace5d402db..33ec82e922dc1 100644
--- a/projects/packages/backup/src/class-package-version.php
+++ b/projects/packages/backup/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.2.3-alpha';
+	const PACKAGE_VERSION = '1.2.3';
 
 	const PACKAGE_SLUG = 'backup';
 
diff --git a/projects/packages/blocks/CHANGELOG.md b/projects/packages/blocks/CHANGELOG.md
index de4cec7982fbb..48afbf696c19f 100644
--- a/projects/packages/blocks/CHANGELOG.md
+++ b/projects/packages/blocks/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.11] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.4.10] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -96,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Blocks: introduce new package for block management
 
+[1.4.11]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.10...v1.4.11
 [1.4.10]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.9...v1.4.10
 [1.4.9]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.8...v1.4.9
 [1.4.8]: https://github.com/Automattic/jetpack-blocks/compare/v1.4.7...v1.4.8
diff --git a/projects/packages/blocks/changelog/update-project-scripts-no-install b/projects/packages/blocks/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/blocks/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/changelogger/CHANGELOG.md b/projects/packages/changelogger/CHANGELOG.md
index 9a3c117416daa..e3b00628fac8f 100644
--- a/projects/packages/changelogger/CHANGELOG.md
+++ b/projects/packages/changelogger/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.6] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [3.0.5] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -86,6 +90,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 - Initial version.
 
+[3.0.6]: https://github.com/Automattic/jetpack-changelogger/compare/3.0.5...3.0.6
 [3.0.5]: https://github.com/Automattic/jetpack-changelogger/compare/3.0.4...3.0.5
 [3.0.4]: https://github.com/Automattic/jetpack-changelogger/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/Automattic/jetpack-changelogger/compare/3.0.2...3.0.3
diff --git a/projects/packages/changelogger/changelog/update-project-scripts-no-install b/projects/packages/changelogger/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/changelogger/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/changelogger/changelog/update-wpcs-to-dev-branch b/projects/packages/changelogger/changelog/update-wpcs-to-dev-branch
new file mode 100644
index 0000000000000..09ac220faa608
--- /dev/null
+++ b/projects/packages/changelogger/changelog/update-wpcs-to-dev-branch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed some new PHPCS warnings.
diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php
index cd218a98bbd08..2290ad95fe480 100644
--- a/projects/packages/changelogger/src/Application.php
+++ b/projects/packages/changelogger/src/Application.php
@@ -18,7 +18,7 @@
  */
 class Application extends SymfonyApplication {
 
-	const VERSION = '3.0.6-alpha';
+	const VERSION = '3.0.7-alpha';
 
 	/**
 	 * Constructor.
diff --git a/projects/packages/changelogger/tests/php/includes/lib/ParserTestCase.php b/projects/packages/changelogger/tests/php/includes/lib/ParserTestCase.php
index ffd6ce788e9ad..13103a1c0a2b7 100644
--- a/projects/packages/changelogger/tests/php/includes/lib/ParserTestCase.php
+++ b/projects/packages/changelogger/tests/php/includes/lib/ParserTestCase.php
@@ -132,7 +132,7 @@ protected function writeFixture( $filename, array $data ) {
 				$contents .= '  ' . get_class( $data['parse-exception'] ) . "\n";
 				$contents .= $this->indent( $data['parse-exception']->getMessage() ) . "\n";
 				$contents .= "  ~~~~~~~~\n";
-			} elseif ( isset( $data['parse-output'] ) && ! ( isset( $data['object'] ) && $data['object'] == $data['parse-output'] ) ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			} elseif ( isset( $data['parse-output'] ) && ! ( isset( $data['object'] ) && $data['object'] == $data['parse-output'] ) ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				$this->assertInstanceOf( Changelog::class, $data['parse-output'] );
 				$contents .= "\n## Expected output from `parse()`\n";
 				$contents .= "  ~~~~~~~~json parse-output\n";
@@ -150,7 +150,7 @@ protected function writeFixture( $filename, array $data ) {
 				$contents .= '  ' . get_class( $data['format-exception'] ) . "\n";
 				$contents .= $this->indent( $data['format-exception']->getMessage() ) . "\n";
 				$contents .= "  ~~~~~~~~\n";
-			} elseif ( isset( $data['format-output'] ) && ! ( isset( $data['changelog'] ) && $data['changelog'] == $data['format-output'] ) ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			} elseif ( isset( $data['format-output'] ) && ! ( isset( $data['changelog'] ) && $data['changelog'] == $data['format-output'] ) ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				$this->assertIsString( $data['format-output'] );
 				$contents .= "\n## Expected output from `format()`\n";
 				$contents .= "  ~~~~~~~~markdown format-output\n";
diff --git a/projects/packages/codesniffer/CHANGELOG.md b/projects/packages/codesniffer/CHANGELOG.md
index 6e6abec854130..4eacfa4e388b2 100644
--- a/projects/packages/codesniffer/CHANGELOG.md
+++ b/projects/packages/codesniffer/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.0] - 2022-02-01
+### Added
+- Add a sniff to check the textdomain passed to `Assets::register_script()`.
+
+### Changed
+- Disable CI tests on 8.1, PHPCompatibility raises deprecation warnings.
+- Reconfigure phpcs so we don't need so many `phpcs:ignore` comments.
+- Switch to pcov for code coverage.
+- Updated package dependencies
+
 ## [2.3.0] - 2021-11-02
 ### Changed
 - Set `convertDeprecationsToExceptions` true in PHPUnit config.
@@ -63,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Codesniffer: Add a package to hold our coding standard
 
+[2.4.0]: https://github.com/Automattic/jetpack-codesniffer/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/Automattic/jetpack-codesniffer/compare/v2.2.1...v2.3.0
 [2.2.1]: https://github.com/Automattic/jetpack-codesniffer/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/Automattic/jetpack-codesniffer/compare/v2.1.1...v2.2.0
diff --git a/projects/packages/codesniffer/Jetpack/ruleset.xml b/projects/packages/codesniffer/Jetpack/ruleset.xml
index 22aea15b3c373..fa02f39e9cd10 100644
--- a/projects/packages/codesniffer/Jetpack/ruleset.xml
+++ b/projects/packages/codesniffer/Jetpack/ruleset.xml
@@ -42,6 +42,9 @@
 		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
 	</rule>
 
+	<!-- Only include select VIP rules -->
+	<rule ref="WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath" />
+
 	<!-- Elevate undefined variables to an Error instead of a Warning. -->
 	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable">
 		<type>error</type>
diff --git a/projects/packages/codesniffer/changelog/add-disallow-relative-includes b/projects/packages/codesniffer/changelog/add-disallow-relative-includes
new file mode 100644
index 0000000000000..8ea39d66578b5
--- /dev/null
+++ b/projects/packages/codesniffer/changelog/add-disallow-relative-includes
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add sniff to disallow relative file includes.
diff --git a/projects/packages/codesniffer/changelog/add-disallow-relative-includes-2 b/projects/packages/codesniffer/changelog/add-disallow-relative-includes-2
new file mode 100644
index 0000000000000..d455739c9d693
--- /dev/null
+++ b/projects/packages/codesniffer/changelog/add-disallow-relative-includes-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed minor coding standard violation.
diff --git a/projects/packages/codesniffer/changelog/add-phpcs-per-director-config b/projects/packages/codesniffer/changelog/add-phpcs-per-director-config
deleted file mode 100644
index 196bbd6894eb7..0000000000000
--- a/projects/packages/codesniffer/changelog/add-phpcs-per-director-config
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Reconfigure phpcs so we don't need so many `phpcs:ignore` comments.
diff --git a/projects/packages/codesniffer/changelog/add-phpcs-sniff-for-assets-register_script-textdomain b/projects/packages/codesniffer/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
deleted file mode 100644
index 42c68f42f1d8a..0000000000000
--- a/projects/packages/codesniffer/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Add a sniff to check the textdomain passed to `Assets::register_script()`.
diff --git a/projects/packages/codesniffer/changelog/fix-disable-codesniffer-tests-on-8.1 b/projects/packages/codesniffer/changelog/fix-disable-codesniffer-tests-on-8.1
deleted file mode 100644
index e07dec6413dbb..0000000000000
--- a/projects/packages/codesniffer/changelog/fix-disable-codesniffer-tests-on-8.1
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Disable CI tests on 8.1, PHPCompatibility raises deprecation warnings.
diff --git a/projects/packages/codesniffer/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/packages/codesniffer/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/packages/codesniffer/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/packages/codesniffer/changelog/try-pcov b/projects/packages/codesniffer/changelog/try-pcov
deleted file mode 100644
index bbcd26b6ce57e..0000000000000
--- a/projects/packages/codesniffer/changelog/try-pcov
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Switch to pcov for code coverage.
diff --git a/projects/packages/codesniffer/changelog/update-composer b/projects/packages/codesniffer/changelog/update-composer
deleted file mode 100644
index 9d476b2308bac..0000000000000
--- a/projects/packages/codesniffer/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Tooling update: Use composer 2.2.
-
-
diff --git a/projects/packages/codesniffer/changelog/update-project-scripts-no-install b/projects/packages/codesniffer/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/codesniffer/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/codesniffer/changelog/update-wpcs-to-dev-branch b/projects/packages/codesniffer/changelog/update-wpcs-to-dev-branch
new file mode 100644
index 0000000000000..9834031ba0637
--- /dev/null
+++ b/projects/packages/codesniffer/changelog/update-wpcs-to-dev-branch
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fixed
+
+Update `wp-coding-standards/wpcs` to `dev-develop`. They haven't done a release in over a year, and we need fixes for errors in PHP 8.0 and 8.1.
diff --git a/projects/packages/codesniffer/composer.json b/projects/packages/codesniffer/composer.json
index eeada7d163c10..b451c637bcc11 100644
--- a/projects/packages/codesniffer/composer.json
+++ b/projects/packages/codesniffer/composer.json
@@ -8,7 +8,8 @@
 		"mediawiki/mediawiki-codesniffer": "^38.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.1",
 		"sirbrillig/phpcs-variable-analysis": "^2.10",
-		"wp-coding-standards/wpcs": "^2.3"
+		"wp-coding-standards/wpcs": "dev-develop as 2.3.1",
+		"automattic/vipwpcs": "^2.3"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.0.3",
@@ -54,7 +55,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-codesniffer/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "2.4.x-dev"
+			"dev-master": "2.5.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.fixed b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.fixed
index fd40a059572d9..4840f30e46c3e 100644
--- a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.fixed
+++ b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.fixed
@@ -41,8 +41,8 @@ Automattic\Jetpack\Assets::register_script( 'handle', 'path', __FILE__, array( '
 \Automattic\Jetpack\Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'domain' ) );
 Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain', 'foo' => 'bar' ) );
 Assets::register_script( 'handle', 'path', __FILE__, array('textdomain'=>'domain') );
-Assets::register_script( 'handle', 'path', __FILE__, [ 'textdomain' => 'domain' ] );
-Assets::register_script( 'handle', 'path', __FILE__, ['textdomain'=>'domain'] );
+Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'domain' ) );
+Assets::register_script( 'handle', 'path', __FILE__, array('textdomain'=>'domain') );
 Assets::register_script( 'handle', 'path', __FILE__, array( "textdomain" => "domain" ) );
 Assets::register_script(
 	'handle',
@@ -50,7 +50,7 @@ Assets::register_script(
 	__FILE__,
 	array(
 		'foo'        => array( 'bar', 'textdomain' => 'wrongdomain' ),
-		'bar'        => [ 'baz', 'textdomain' => 'wrongdomain' ],
+		'bar'        => array( 'baz', 'textdomain' => 'wrongdomain' ),
 		'textdomain' => 'domain',
 	)
 );
@@ -60,8 +60,8 @@ Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'dom
 Automattic\Jetpack\Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'domain' ) );
 \Automattic\Jetpack\Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'domain' ) );
 Assets::register_script( 'handle', 'path', __FILE__, array('textdomain'=>'domain') );
-Assets::register_script( 'handle', 'path', __FILE__, [ 'textdomain' => 'domain' ] );
-Assets::register_script( 'handle', 'path', __FILE__, ['textdomain'=>'domain'] );
+Assets::register_script( 'handle', 'path', __FILE__, array( 'textdomain' => 'domain' ) );
+Assets::register_script( 'handle', 'path', __FILE__, array('textdomain'=>'domain') );
 Assets::register_script( 'handle', 'path', __FILE__, array( "textdomain" => 'domain' ) );
 Assets::register_script(
 	'handle',
diff --git a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report
index d5c6e54cd60fe..db390251a1fa5 100644
--- a/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report
+++ b/projects/packages/codesniffer/tests/php/tests/files/i18n.php.report
@@ -9,11 +9,16 @@
  30 | ERROR | [ ] The domain must not contain interpolated variables. Found $domain.
     |       |     (Jetpack.Functions.I18n.InterpolatedVariable)
  33 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'a $domain'. (Jetpack.Functions.I18n.TextDomainMismatch)
+ 44 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found)
+ 45 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found)
+ 53 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found)
  59 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
  60 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
  61 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
  62 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
+ 63 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found)
  63 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
+ 64 | ERROR | [x] Short array syntax is not allowed (Universal.Arrays.DisallowShortArraySyntax.Found)
  64 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
  65 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
  72 | ERROR | [x] Mismatched text domain. Expected 'domain' but got 'wrongdomain'. (Jetpack.Functions.I18n.TextDomainMismatch)
diff --git a/projects/packages/codesniffer/tests/php/tests/files/mediawiki-imports.php.report b/projects/packages/codesniffer/tests/php/tests/files/mediawiki-imports.php.report
index 498aba1bc0562..6962a61af7546 100644
--- a/projects/packages/codesniffer/tests/php/tests/files/mediawiki-imports.php.report
+++ b/projects/packages/codesniffer/tests/php/tests/files/mediawiki-imports.php.report
@@ -3,6 +3,8 @@
  16 | WARNING | [x] Unused use statement "Unused" (MediaWiki.Classes.UnusedUseStatement.UnusedUse)
  37 | WARNING | [x] Floats should have a leading 0 (MediaWiki.AlternativeSyntax.LeadingZeroInFloat.Found)
  40 | WARNING | [x] require_once keyword must not be used as a function. (MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords)
+ 40 | ERROR   | [ ] Absolute include path must be used. Use `get_template_directory()`, `get_stylesheet_directory()` or `plugin_dir_path()`.
+    |         |     (WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath)
  41 | WARNING | [x] clone keyword must not be used as a function. (MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords)
  44 | ERROR   | [x] Use __DIR__ constant instead of calling dirname(__FILE__) (MediaWiki.Usage.DirUsage.FunctionFound)
  47 | WARNING | [x] Use (bool) instead of !! (MediaWiki.Usage.DoubleNotOperator.DoubleNotOperator)
@@ -13,8 +15,7 @@
  65 | ERROR   | [ ] Function nested is nested inside of another function or closure (MediaWiki.Usage.NestedFunctions.NestedFunction)
  69 | ERROR   | [ ] Use "." for string concat (MediaWiki.Usage.PlusStringConcat.Found)
  70 | ERROR   | [ ] Use ".=" for string concat (MediaWiki.Usage.PlusStringConcat.Found)
- 73 | ERROR   | [ ] The ampersand in "&$this" must be removed. If you plan to get back another instance of this class, assign $this to a temporary variable.
-    |         |     (MediaWiki.Usage.ReferenceThis.Found)
+ 73 | ERROR   | [ ] The ampersand in "&$this" must be removed. If you plan to get back another instance of this class, assign $this to a temporary variable. (MediaWiki.Usage.ReferenceThis.Found)
  76 | ERROR   | [x] Multiple empty lines should not exist in a row; found 2 consecutive empty lines (MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines)
  79 | ERROR   | [x] A single space should be after the function keyword in closures (MediaWiki.WhiteSpace.SpaceAfterClosure.NoWhitespaceAfterClosure)
  86 | ERROR   | [x] Multiple empty lines should not exist in a row; found 2 consecutive empty lines (MediaWiki.WhiteSpace.MultipleEmptyLines.MultipleEmptyLines)
diff --git a/projects/packages/codesniffer/tests/php/tests/test-jetpackstandard.php b/projects/packages/codesniffer/tests/php/tests/test-jetpackstandard.php
index b6b3b8099d656..6d4a22f813f5d 100644
--- a/projects/packages/codesniffer/tests/php/tests/test-jetpackstandard.php
+++ b/projects/packages/codesniffer/tests/php/tests/test-jetpackstandard.php
@@ -87,10 +87,16 @@ private function run_phpcs( $file, $fix ) {
 	 * @param bool   $fix Run as phpcbf rather than phpcs.
 	 */
 	public function test_phpcs( $file, $fix ) {
-		$expect = file_get_contents( $fix ? "$file.fixed" : "$file.report" );
+		$snapfile = $fix ? "$file.fixed" : "$file.report";
+		$expect   = file_get_contents( $snapfile );
 		$this->assertIsString( $expect );
-		file_put_contents( $fix ? "$file.fixed" : "$file.report", $expect = $this->run_phpcs( $file, $fix ) );
-		$this->assertEquals( $expect, $this->run_phpcs( $file, $fix ) );
+		$actual = $this->run_phpcs( $file, $fix );
+		if ( getenv( 'UPDATE_SNAPSHOTS' ) && $expect !== $actual ) {
+			file_put_contents( $snapfile, $actual );
+			$this->addWarning( "Updated snapshot in $snapfile" );
+		} else {
+			$this->assertEquals( $expect, $actual, '(Run with UPDATE_SNAPSHOTS=1 to update snapshots)' );
+		}
 	}
 
 	/**
diff --git a/projects/packages/composer-plugin/CHANGELOG.md b/projects/packages/composer-plugin/CHANGELOG.md
index 9b6ea6609edc9..0368a922e8938 100644
--- a/projects/packages/composer-plugin/CHANGELOG.md
+++ b/projects/packages/composer-plugin/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2022-01-25
+### Added
+- Include package path prefixes in `i18n-map.php` so Assets can map them when lazy-loading.
+
 ## [1.0.2] - 2022-01-13
 ### Fixed
 - Composer's `getVersion()` likes to return 4-component versions, while semver wants only 3 components. Strip any extra components instead of considering that invalid.
@@ -30,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added the Jetpack Installer package.
 
+[1.1.0]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Automattic/jetpack-composer-plugin/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/Automattic/jetpack-composer-plugin/compare/v0.2.0...v1.0.0
diff --git a/projects/packages/composer-plugin/changelog/update-project-scripts-no-install b/projects/packages/composer-plugin/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/composer-plugin/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/composer-plugin/composer.json b/projects/packages/composer-plugin/composer.json
index 7609c6604bb88..f421251325324 100644
--- a/projects/packages/composer-plugin/composer.json
+++ b/projects/packages/composer-plugin/composer.json
@@ -46,7 +46,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-master": "1.0.x-dev"
+			"dev-master": "1.1.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/composer-plugin/src/class-plugin.php b/projects/packages/composer-plugin/src/class-plugin.php
index 7f932fd3503bb..b176905b2d50a 100644
--- a/projects/packages/composer-plugin/src/class-plugin.php
+++ b/projects/packages/composer-plugin/src/class-plugin.php
@@ -123,8 +123,11 @@ public function generateManifest( Event $event ) {
 			if ( empty( $extra['textdomain'] ) ) {
 				$io->info( "  {$package->getName()} ($ver): no textdomain set" );
 			} else {
-				$data['packages'][ $extra['textdomain'] ] = $ver;
-				$io->info( "  {$package->getName()} ($ver): textdomain is {$extra['textdomain']}" );
+				$data['packages'][ $extra['textdomain'] ] = array(
+					'path' => 'jetpack_vendor/' . $package->getPrettyName(),
+					'ver'  => $ver,
+				);
+				$io->info( "  {$package->getName()} ($ver): textdomain is {$extra['textdomain']}, path is jetpack_vendor/{$package->getPrettyName()}" );
 			}
 		}
 
diff --git a/projects/packages/connection-ui/CHANGELOG.md b/projects/packages/connection-ui/CHANGELOG.md
index 13783f661d629..95250a036adcd 100644
--- a/projects/packages/connection-ui/CHANGELOG.md
+++ b/projects/packages/connection-ui/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.4] - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## [2.3.3] - 2022-01-25
+### Added
+- connection initial state
+
+### Changed
+- Updated package dependencies.
+
 ## [2.3.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -170,7 +181,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Connection UI: Building the Framework
 
-[2.3.2]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.3.1...v2.3.2
+[2.3.4]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.3.3...v2.3.4
+[2.3.3]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.3.2...v2.3.3
 [2.3.2]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/Automattic/jetpack-connection-ui/compare/v2.2.0...v2.3.0
diff --git a/projects/packages/connection-ui/changelog/add-fancy-eslint-ignore b/projects/packages/connection-ui/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/connection-ui/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-addon-knobs-6.x b/projects/packages/connection-ui/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-addon-knobs-6.x
rename to projects/packages/connection-ui/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-11-23-12-49-57-152426 b/projects/packages/connection-ui/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-11-23-12-49-57-152426
rename to projects/packages/connection-ui/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/packages/connection-ui/changelog/update-connection-enforce-initial-state b/projects/packages/connection-ui/changelog/update-connection-enforce-initial-state
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/connection-ui/changelog/update-connection-enforce-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/connection-ui/changelog/update-project-scripts-no-install b/projects/packages/connection-ui/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/connection-ui/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/connection-ui/composer.json b/projects/packages/connection-ui/composer.json
index 55227dc5d0e0c..98d2f23f43aeb 100644
--- a/projects/packages/connection-ui/composer.json
+++ b/projects/packages/connection-ui/composer.json
@@ -4,11 +4,11 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-assets": "^1.16",
+		"automattic/jetpack-assets": "^1.17",
 		"automattic/jetpack-connection": "^1.36",
 		"automattic/jetpack-constants": "^1.6",
 		"automattic/jetpack-device-detection": "^1.4",
-		"automattic/jetpack-identity-crisis": "^0.6"
+		"automattic/jetpack-identity-crisis": "^0.7"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.0"
diff --git a/projects/packages/connection-ui/package.json b/projects/packages/connection-ui/package.json
index e31a41e852317..6b126b7461c92 100644
--- a/projects/packages/connection-ui/package.json
+++ b/projects/packages/connection-ui/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-connection-manager-ui",
-	"version": "2.3.3-alpha",
+	"version": "2.3.5-alpha",
 	"description": "Jetpack Connection Manager UI",
 	"main": "_inc/admin.jsx",
 	"repository": "https://github.com/Automattic/jetpack-connection-ui",
@@ -15,19 +15,19 @@
 	},
 	"browserslist": "extends @wordpress/browserslist-config",
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-connection": "workspace:^0.14.0-alpha",
-		"@wordpress/data": "6.1.5"
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.15.1-alpha",
+		"@wordpress/data": "6.2.0"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-env": "7.16.4",
 		"@babel/register": "7.16.0",
 		"@babel/runtime": "7.16.3",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/i18n": "4.2.4",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/i18n": "4.3.0",
 		"enzyme": "3.11.0",
 		"jest": "27.3.1",
 		"react": "17.0.2",
diff --git a/projects/packages/connection/CHANGELOG.md b/projects/packages/connection/CHANGELOG.md
index 4868b0ca44205..3c3365967e4f9 100644
--- a/projects/packages/connection/CHANGELOG.md
+++ b/projects/packages/connection/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.36.1] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.36.0] - 2022-01-18
 ### Added
 - Debugging: Add a filter to add XDEBUG_PROFILE to requests made to the sandbox.
@@ -499,6 +503,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[1.36.1]: https://github.com/Automattic/jetpack-connection/compare/v1.36.0...v1.36.1
 [1.36.0]: https://github.com/Automattic/jetpack-connection/compare/v1.35.0...v1.36.0
 [1.35.0]: https://github.com/Automattic/jetpack-connection/compare/v1.34.0...v1.35.0
 [1.34.0]: https://github.com/Automattic/jetpack-connection/compare/v1.33.0...v1.34.0
diff --git a/projects/packages/connection/changelog/add-visitor-status b/projects/packages/connection/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/connection/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/connection/changelog/update-project-scripts-no-install b/projects/packages/connection/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/connection/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/connection/changelog/update-wpcs-to-dev-branch b/projects/packages/connection/changelog/update-wpcs-to-dev-branch
new file mode 100644
index 0000000000000..09ac220faa608
--- /dev/null
+++ b/projects/packages/connection/changelog/update-wpcs-to-dev-branch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed some new PHPCS warnings.
diff --git a/projects/packages/connection/src/class-client.php b/projects/packages/connection/src/class-client.php
index fea9e9c7fcbd5..69e5198579d26 100644
--- a/projects/packages/connection/src/class-client.php
+++ b/projects/packages/connection/src/class-client.php
@@ -310,7 +310,7 @@ public static function set_time_diff( &$response, $force_set = false ) {
 		$code = wp_remote_retrieve_response_code( $response );
 
 		// Only trust the Date header on some responses.
-		if ( 200 != $code && 304 != $code && 400 != $code && 401 != $code ) { // phpcs:ignore  WordPress.PHP.StrictComparisons.LooseComparison
+		if ( 200 != $code && 304 != $code && 400 != $code && 401 != $code ) { // phpcs:ignore  Universal.Operators.StrictComparisons.LooseNotEqual
 			return;
 		}
 
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
index 1761a8eac1625..70a72bc95e530 100644
--- a/projects/packages/connection/src/class-package-version.php
+++ b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.36.1-alpha';
+	const PACKAGE_VERSION = '1.36.2-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 
diff --git a/projects/packages/connection/src/class-rest-connector.php b/projects/packages/connection/src/class-rest-connector.php
index 1f4dfb5e21dc6..077dadfdd7cba 100644
--- a/projects/packages/connection/src/class-rest-connector.php
+++ b/projects/packages/connection/src/class-rest-connector.php
@@ -323,7 +323,7 @@ public static function connection_status( $rest_response = true ) {
 				'filter'          => ( apply_filters( 'jetpack_development_mode', false ) || apply_filters( 'jetpack_offline_mode', false ) ), // jetpack_development_mode is deprecated.
 				'wpLocalConstant' => defined( 'WP_LOCAL_DEV' ) && WP_LOCAL_DEV,
 			),
-			'isPublic'          => '1' == get_option( 'blog_public' ), // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			'isPublic'          => '1' == get_option( 'blog_public' ), // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 		);
 
 		/**
diff --git a/projects/packages/connection/src/class-tokens.php b/projects/packages/connection/src/class-tokens.php
index 38fb58d4124b9..7522f40e9a590 100644
--- a/projects/packages/connection/src/class-tokens.php
+++ b/projects/packages/connection/src/class-tokens.php
@@ -58,7 +58,7 @@ public function validate( $user_id = null ) {
 		// Cannot validate non-existent tokens.
 		if ( false === $user_token || false === $blog_token ) {
 			return false;
-		};
+		}
 
 		$method   = 'POST';
 		$body     = array(
diff --git a/projects/packages/constants/CHANGELOG.md b/projects/packages/constants/CHANGELOG.md
index c4b42f4562d55..d8b6f4ba293a9 100644
--- a/projects/packages/constants/CHANGELOG.md
+++ b/projects/packages/constants/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.15] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.6.14] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -118,6 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Finish the constants package
 
+[1.6.15]: https://github.com/Automattic/jetpack-constants/compare/v1.6.14...v1.6.15
 [1.6.14]: https://github.com/Automattic/jetpack-constants/compare/v1.6.13...v1.6.14
 [1.6.13]: https://github.com/Automattic/jetpack-constants/compare/v1.6.12...v1.6.13
 [1.6.12]: https://github.com/Automattic/jetpack-constants/compare/v1.6.11...v1.6.12
diff --git a/projects/packages/constants/changelog/update-project-scripts-no-install b/projects/packages/constants/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/constants/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/device-detection/CHANGELOG.md b/projects/packages/device-detection/CHANGELOG.md
index 7330dceda6648..6d65c5e5a1e45 100644
--- a/projects/packages/device-detection/CHANGELOG.md
+++ b/projects/packages/device-detection/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.12] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.4.11] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -96,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Moving jetpack_is_mobile into a package
 
+[1.4.12]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.11...v1.4.12
 [1.4.11]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.10...v1.4.11
 [1.4.10]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.9...v1.4.10
 [1.4.9]: https://github.com/Automattic/jetpack-device-detection/compare/v1.4.8...v1.4.9
diff --git a/projects/packages/device-detection/changelog/update-project-scripts-no-install b/projects/packages/device-detection/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/device-detection/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/device-detection/changelog/update-wpcs-to-dev-branch b/projects/packages/device-detection/changelog/update-wpcs-to-dev-branch
new file mode 100644
index 0000000000000..09ac220faa608
--- /dev/null
+++ b/projects/packages/device-detection/changelog/update-wpcs-to-dev-branch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed some new PHPCS warnings.
diff --git a/projects/packages/device-detection/src/class-user-agent-info.php b/projects/packages/device-detection/src/class-user-agent-info.php
index e8d2f20acea14..20852e7c3c064 100644
--- a/projects/packages/device-detection/src/class-user-agent-info.php
+++ b/projects/packages/device-detection/src/class-user-agent-info.php
@@ -1445,7 +1445,7 @@ public static function is_mobile_app() {
 		// the mobile reader on iOS has an incorrect UA when loading the reader
 		// currently it is the default one provided by the iOS framework which
 		// causes problems with 2-step-auth
-		// User-Agent	WordPress/3.1.4 CFNetwork/609 Darwin/13.0.0.
+		// User-Agent   WordPress/3.1.4 CFNetwork/609 Darwin/13.0.0.
 		$app_agents[] = 'wordpress/3.1';
 
 		foreach ( $app_agents as $app_agent ) {
diff --git a/projects/packages/error/CHANGELOG.md b/projects/packages/error/CHANGELOG.md
index ea0c6df4e8741..fe268048e6dc2 100644
--- a/projects/packages/error/CHANGELOG.md
+++ b/projects/packages/error/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.13] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.3.12] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -92,6 +96,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a jetpack-error package
 
+[1.3.13]: https://github.com/Automattic/jetpack-error/compare/v1.3.12...v1.3.13
 [1.3.12]: https://github.com/Automattic/jetpack-error/compare/v1.3.11...v1.3.12
 [1.3.11]: https://github.com/Automattic/jetpack-error/compare/v1.3.10...v1.3.11
 [1.3.10]: https://github.com/Automattic/jetpack-error/compare/v1.3.9...v1.3.10
diff --git a/projects/packages/error/changelog/update-project-scripts-no-install b/projects/packages/error/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/error/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/identity-crisis/CHANGELOG.md b/projects/packages/identity-crisis/CHANGELOG.md
index 8ca4619c1f170..77506aba0b285 100644
--- a/projects/packages/identity-crisis/CHANGELOG.md
+++ b/projects/packages/identity-crisis/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.1] - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## [0.7.0] - 2022-01-27
+### Changed
+- IDC "Safe Mode" admin bar button redesign.
+
+## [0.6.4] - 2022-01-25
+### Changed
+- Add class notice to the IDC container div.
+- Add missing JS peer dependency.
+- Updated package dependencies.
+
 ## [0.6.3] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -131,7 +145,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Use Connection/Urls for home_url and site_url functions migrated from Sync.
 
-[0.6.3]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.2...v0.6.3
+[0.7.1]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.7.0...v0.7.1
+[0.7.0]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.4...v0.7.0
+[0.6.4]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.3...v0.6.4
 [0.6.3]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.2...v0.6.3
 [0.6.2]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.1...v0.6.2
 [0.6.1]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.6.0...v0.6.1
diff --git a/projects/packages/identity-crisis/changelog/add-fancy-eslint-ignore b/projects/packages/identity-crisis/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index eed3c13831009..0000000000000
--- a/projects/packages/identity-crisis/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-Add missing JS peer dependency.
diff --git a/projects/packages/identity-crisis/changelog/add-idc-customizate-labels b/projects/packages/identity-crisis/changelog/add-idc-customizate-labels
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/identity-crisis/changelog/add-idc-customizate-labels
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/identity-crisis/changelog/add-idc-customizer-tags b/projects/packages/identity-crisis/changelog/add-idc-customizer-tags
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/identity-crisis/changelog/add-idc-customizer-tags
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/identity-crisis/changelog/add-visitor-status b/projects/packages/identity-crisis/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/identity-crisis/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo b/projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo
rename to projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2021-11-30-15-13-01-232780 b/projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-11-30-15-13-01-232780
rename to projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/packages/identity-crisis/changelog/update-jetpack-idc-notice b/projects/packages/identity-crisis/changelog/update-jetpack-idc-notice
deleted file mode 100644
index daf7b7b240747..0000000000000
--- a/projects/packages/identity-crisis/changelog/update-jetpack-idc-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Add class notice to the IDC container div.
diff --git a/projects/packages/identity-crisis/changelog/update-project-scripts-no-install b/projects/packages/identity-crisis/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/identity-crisis/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/identity-crisis/composer.json b/projects/packages/identity-crisis/composer.json
index 11eb1a9cf216d..f029c7dd0ad2c 100644
--- a/projects/packages/identity-crisis/composer.json
+++ b/projects/packages/identity-crisis/composer.json
@@ -10,7 +10,7 @@
 		"automattic/jetpack-status": "^1.10",
 		"automattic/jetpack-tracking": "^1.14",
 		"automattic/jetpack-logo": "^1.5",
-		"automattic/jetpack-assets": "^1.16"
+		"automattic/jetpack-assets": "^1.17"
 	},
 	"require-dev": {
 		"automattic/jetpack-changelogger": "^3.0",
@@ -66,7 +66,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "0.6.x-dev"
+			"dev-master": "0.7.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/identity-crisis/package.json b/projects/packages/identity-crisis/package.json
index 515f519db39c7..6aabcbafd05ea 100644
--- a/projects/packages/identity-crisis/package.json
+++ b/projects/packages/identity-crisis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-identity-crisis",
-	"version": "0.6.4-alpha",
+	"version": "0.7.2-alpha",
 	"description": "Jetpack Identity Crisis",
 	"main": "_inc/admin.jsx",
 	"repository": "https://github.com/Automattic/jetpack-identity-crisis",
@@ -15,11 +15,11 @@
 	},
 	"browserslist": "extends @wordpress/browserslist-config",
 	"dependencies": {
-		"@automattic/jetpack-idc": "workspace:^0.9.0-alpha",
-		"@wordpress/data": "6.1.5"
+		"@automattic/jetpack-idc": "workspace:^0.9.2-alpha",
+		"@wordpress/data": "6.2.0"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-env": "7.16.4",
 		"@babel/register": "7.16.0",
diff --git a/projects/packages/identity-crisis/src/_inc/admin-bar.scss b/projects/packages/identity-crisis/src/_inc/admin-bar.scss
index cd2008cf1d109..262b0819da211 100644
--- a/projects/packages/identity-crisis/src/_inc/admin-bar.scss
+++ b/projects/packages/identity-crisis/src/_inc/admin-bar.scss
@@ -1,28 +1,30 @@
-#wp-admin-bar-jetpack-idc.hide {
-  display: none;
-}
+#wpadminbar #wp-admin-bar-jetpack-idc {
+	margin-right: 5px;
 
-#wp-admin-bar-jetpack-idc .jp-idc-admin-bar {
-  background: #fff;
-  border-radius: 2px;
-  color: #1d2327;
-  padding: 4px 8px;
-  font-size: 12px;
-}
+	.jp-idc-admin-bar {
+		border-radius: 2px;
+		font-weight: 500;
+		font-size: 14px;
+		line-height: 20px;
+		color: #EFEFF0;
+		padding: 6px 8px;
+	}
 
-#wpadminbar #wp-admin-bar-jetpack-idc .dashicons {
-  color: #1d2327;
-  font-family: 'dashicons';
-}
+	&.hide {
+		display: none;
+	}
 
-#wpadminbar #wp-admin-bar-jetpack-idc .dashicons:before {
-  font-size: 16px;
-}
+	.dashicons {
+		font-family: 'dashicons';
+		margin-top: -6px;
 
-#wpadminbar #wp-admin-bar-jetpack-idc:hover .ab-item {
-  background: inherit;
-}
+		&:before {
+			font-size: 18px;
+		}
+	}
 
-#wpadminbar #wp-admin-bar-jetpack-idc:hover .jp-idc-admin-bar {
-  background: #f0f0f1;
+	.ab-item {
+		padding: 0;
+		background: #E68B28;
+	}
 }
diff --git a/projects/packages/identity-crisis/src/class-identity-crisis.php b/projects/packages/identity-crisis/src/class-identity-crisis.php
index 2fb43e29f54e7..8c84da9858d3b 100644
--- a/projects/packages/identity-crisis/src/class-identity-crisis.php
+++ b/projects/packages/identity-crisis/src/class-identity-crisis.php
@@ -28,7 +28,7 @@ class Identity_Crisis {
 	/**
 	 * Package Version
 	 */
-	const PACKAGE_VERSION = '0.6.4-alpha';
+	const PACKAGE_VERSION = '0.7.2-alpha';
 
 	/**
 	 * Instance of the object.
@@ -247,10 +247,15 @@ public function display_admin_bar_button() {
 
 		$href = wp_nonce_url( $href, 'jetpack_idc_clear_confirmation' );
 
+		$consumer_data = UI::get_consumer_data();
+		$label         = isset( $consumer_data['customContent']['adminBarSafeModeLabel'] )
+			? esc_html( $consumer_data['customContent']['adminBarSafeModeLabel'] )
+			: esc_html__( 'Jetpack Safe Mode', 'jetpack-idc' );
+
 		$title = sprintf(
 			'<span class="jp-idc-admin-bar">%s %s</span>',
-			'<span class="dashicons dashicons-warning"></span>',
-			esc_html__( 'Jetpack Safe Mode', 'jetpack-idc' )
+			'<span class="dashicons dashicons-info-outline"></span>',
+			$label
 		);
 
 		$menu = array(
diff --git a/projects/packages/identity-crisis/src/class-ui.php b/projects/packages/identity-crisis/src/class-ui.php
index b33c573e94538..becc04c830c58 100644
--- a/projects/packages/identity-crisis/src/class-ui.php
+++ b/projects/packages/identity-crisis/src/class-ui.php
@@ -17,6 +17,13 @@
  */
 class UI {
 
+	/**
+	 * Temporary storage for consumer data.
+	 *
+	 * @var array
+	 */
+	private static $consumers;
+
 	/**
 	 * Initialization.
 	 */
@@ -114,7 +121,11 @@ private static function get_initial_state_data() {
 	 *
 	 * @return array
 	 */
-	private static function get_consumer_data() {
+	public static function get_consumer_data() {
+		if ( null !== static::$consumers ) {
+			return static::$consumers;
+		}
+
 		$consumers = apply_filters( 'jetpack_idc_consumers', array() );
 
 		if ( ! $consumers ) {
@@ -145,7 +156,9 @@ function ( $c1, $c2 ) {
 			}
 		}
 
-		return $consumer_chosen ? $consumer_chosen : array_shift( $consumers );
+		static::$consumers = $consumer_chosen ? $consumer_chosen : array_shift( $consumers );
+
+		return static::$consumers;
 	}
 
 }
diff --git a/projects/packages/jitm/.gitattributes b/projects/packages/jitm/.gitattributes
index b25e37c5f25fc..cc749a05d3703 100644
--- a/projects/packages/jitm/.gitattributes
+++ b/projects/packages/jitm/.gitattributes
@@ -12,4 +12,5 @@ webpack.config.js export-ignore
 .gitignore        production-exclude
 .phpcs.dir.xml    production-exclude
 phpunit.xml.dist  production-exclude
+.eslintignore     production-exclude
 tests/**          production-exclude
diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
index 3735344b8caf2..b1ddb362b2772 100644
--- a/projects/packages/jitm/CHANGELOG.md
+++ b/projects/packages/jitm/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.4] - 2022-02-02
+### Changed
+- Build: remove unneeded files from production build.
+- Update use of old jQuery interfaces
+
+## [2.2.3] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [2.2.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -369,6 +378,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update Jetpack to use new JITM package
 
+[2.2.4]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.3...v2.2.4
+[2.2.3]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.2...v2.2.3
 [2.2.2]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/Automattic/jetpack-jitm/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/Automattic/jetpack-jitm/compare/v2.1.1...v2.2.0
diff --git a/projects/packages/jitm/changelog/add-fancy-eslint-ignore b/projects/packages/jitm/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/jitm/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/packages/jitm/changelog/add-visitor-status b/projects/packages/jitm/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/jitm/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/2021-12-07-15-51-02-511843 b/projects/packages/jitm/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-12-07-15-51-02-511843
rename to projects/packages/jitm/changelog/renovate-wordpress-monorepo
diff --git a/projects/packages/jitm/changelog/update-project-scripts-no-install b/projects/packages/jitm/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/jitm/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json
index 52ec7017538c4..13566c2fe2592 100644
--- a/projects/packages/jitm/composer.json
+++ b/projects/packages/jitm/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-a8c-mc-stats": "^1.4",
-		"automattic/jetpack-assets": "^1.16",
+		"automattic/jetpack-assets": "^1.17",
 		"automattic/jetpack-connection": "^1.36",
 		"automattic/jetpack-device-detection": "^1.4",
 		"automattic/jetpack-logo": "^1.5",
diff --git a/projects/packages/jitm/package.json b/projects/packages/jitm/package.json
index dfda33bce08a2..a4cbb96c680c3 100644
--- a/projects/packages/jitm/package.json
+++ b/projects/packages/jitm/package.json
@@ -22,7 +22,7 @@
 	},
 	"browserslist": "extends @wordpress/browserslist-config",
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@wordpress/browserslist-config": "4.1.0",
 		"sass": "1.43.3",
 		"sass-loader": "12.4.0",
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index 786843b77e657..6150e400cc665 100644
--- a/projects/packages/jitm/src/class-jitm.php
+++ b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
  */
 class JITM {
 
-	const PACKAGE_VERSION = '2.2.3-alpha';
+	const PACKAGE_VERSION = '2.2.5-alpha';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/jitm/src/js/jetpack-jitm.js b/projects/packages/jitm/src/js/jetpack-jitm.js
index 785a38a73cd1f..61c5837aea54e 100644
--- a/projects/packages/jitm/src/js/jetpack-jitm.js
+++ b/projects/packages/jitm/src/js/jetpack-jitm.js
@@ -73,7 +73,9 @@ jQuery( document ).ready( function ( $ ) {
 				html += '<div class="jitm-banner__action">';
 				html +=
 					'<a href="' +
-					( envelope.CTA.hasOwnProperty( 'link' ) && envelope.CTA.link.length ? envelope.CTA.link : envelope.url ) +
+					( envelope.CTA.hasOwnProperty( 'link' ) && envelope.CTA.link.length
+						? envelope.CTA.link
+						: envelope.url ) +
 					'" target="' +
 					( envelope.CTA.newWindow === false || ajaxAction ? '_self' : '_blank' ) +
 					'" rel="noopener noreferrer" title="' +
@@ -139,7 +141,7 @@ jQuery( document ).ready( function ( $ ) {
 		response.url = response.url + '&redirect=' + redirect;
 
 		var $template = templates[ template ]( response );
-		$template.find( '.jitm-banner__dismiss' ).click( render( $template ) );
+		$template.find( '.jitm-banner__dismiss' ).on( 'click', render( $template ) );
 
 		if ( $( '#jp-admin-notices' ).length > 0 ) {
 			// Add to Jetpack notices within the Jetpack settings app.
@@ -158,7 +160,7 @@ jQuery( document ).ready( function ( $ ) {
 		}
 
 		// Handle Module activation button if it exists.
-		$template.find( '#jitm-banner__activate a' ).click( function () {
+		$template.find( '#jitm-banner__activate a' ).on( 'click', function () {
 			var $activate_button = $( this );
 
 			// Do not allow any requests if the button is disabled.
@@ -193,7 +195,7 @@ jQuery( document ).ready( function ( $ ) {
 		} );
 
 		// Handle CTA ajax actions.
-		$template.find( '.jitm-button[data-ajax-action]' ).click( function ( e ) {
+		$template.find( '.jitm-button[data-ajax-action]' ).on( 'click', function ( e ) {
 			e.preventDefault();
 			var button = $( this );
 			button.attr( 'disabled', true );
@@ -253,7 +255,7 @@ jQuery( document ).ready( function ( $ ) {
 
 	reFetch();
 
-	$( window ).bind( 'hashchange', function ( e ) {
+	$( window ).on( 'hashchange', function ( e ) {
 		var newURL = e.originalEvent.newURL;
 
 		if ( newURL.indexOf( 'jetpack#/' ) >= 0 ) {
diff --git a/projects/packages/lazy-images/CHANGELOG.md b/projects/packages/lazy-images/CHANGELOG.md
index 3cab4a1e4a352..593a900c822c5 100644
--- a/projects/packages/lazy-images/CHANGELOG.md
+++ b/projects/packages/lazy-images/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.4] - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## [2.1.3] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [2.1.2] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -168,6 +176,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Lazy Images: Move into a package
 
+[2.1.4]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.3...v2.1.4
+[2.1.3]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.2...v2.1.3
 [2.1.2]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.1...v2.1.2
 [2.1.1]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/Automattic/jetpack-lazy-images/compare/v2.0.10...v2.1.0
diff --git a/projects/packages/lazy-images/changelog/add-fancy-eslint-ignore b/projects/packages/lazy-images/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/lazy-images/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/js-packages/storybook/changelog/2021-12-14-15-28-06-798680 b/projects/packages/lazy-images/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/2021-12-14-15-28-06-798680
rename to projects/packages/lazy-images/changelog/renovate-wordpress-monorepo
diff --git a/projects/packages/lazy-images/changelog/update-project-scripts-no-install b/projects/packages/lazy-images/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/lazy-images/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/lazy-images/composer.json b/projects/packages/lazy-images/composer.json
index 29ae13f06384f..a9b906f71b8b7 100644
--- a/projects/packages/lazy-images/composer.json
+++ b/projects/packages/lazy-images/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-constants": "^1.6",
-		"automattic/jetpack-assets": "^1.16"
+		"automattic/jetpack-assets": "^1.17"
 	},
 	"require-dev": {
 		"automattic/wordbless": "dev-master",
diff --git a/projects/packages/lazy-images/package.json b/projects/packages/lazy-images/package.json
index 81a4a078f7ebc..813086ffe128e 100644
--- a/projects/packages/lazy-images/package.json
+++ b/projects/packages/lazy-images/package.json
@@ -23,7 +23,7 @@
 		"validate": "pnpm exec validate-es dist/"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"copy-webpack-plugin": "10.2.0",
 		"intersection-observer": "0.12.0",
 		"webpack": "5.65.0"
diff --git a/projects/packages/licensing/CHANGELOG.md b/projects/packages/licensing/CHANGELOG.md
index b47ec7458b91e..9df75f5d03b32 100644
--- a/projects/packages/licensing/CHANGELOG.md
+++ b/projects/packages/licensing/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.2] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.6.1] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -155,6 +159,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Licensing: Add support for Jetpack licenses
 
+[1.6.2]: https://github.com/Automattic/jetpack-licensing/compare/v1.6.1...v1.6.2
 [1.6.1]: https://github.com/Automattic/jetpack-licensing/compare/v1.6.0...v1.6.1
 [1.6.0]: https://github.com/Automattic/jetpack-licensing/compare/v1.5.4...v1.6.0
 [1.5.4]: https://github.com/Automattic/jetpack-licensing/compare/v1.5.3...v1.5.4
diff --git a/projects/packages/licensing/changelog/update-project-scripts-no-install b/projects/packages/licensing/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/licensing/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/logo/CHANGELOG.md b/projects/packages/logo/CHANGELOG.md
index c922a297366b7..b767990429409 100644
--- a/projects/packages/logo/CHANGELOG.md
+++ b/projects/packages/logo/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.14] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.5.13] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -110,6 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Add a basic Jetpack Logo package
 
+[1.5.14]: https://github.com/Automattic/jetpack-logo/compare/v1.5.13...v1.5.14
 [1.5.13]: https://github.com/Automattic/jetpack-logo/compare/v1.5.12...v1.5.13
 [1.5.12]: https://github.com/Automattic/jetpack-logo/compare/v1.5.11...v1.5.12
 [1.5.11]: https://github.com/Automattic/jetpack-logo/compare/v1.5.10...v1.5.11
diff --git a/projects/packages/logo/changelog/update-project-scripts-no-install b/projects/packages/logo/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/logo/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/my-jetpack/.gitattributes b/projects/packages/my-jetpack/.gitattributes
index c81ce254119dd..b299fb7aee346 100644
--- a/projects/packages/my-jetpack/.gitattributes
+++ b/projects/packages/my-jetpack/.gitattributes
@@ -10,6 +10,7 @@ package.json      export-ignore
 # Remember to end all directories with `/**` to properly tag every file.
 .gitignore          production-exclude
 .phpcs.dir.xml      production-exclude
+jest.setup.js       production-exclude
 _inc/**             production-exclude
 changelog/**        production-exclude
 phpunit.xml.dist    production-exclude
diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/projects/packages/my-jetpack/CHANGELOG.md
index 63e088bbdb1b7..c3d755c9796a1 100644
--- a/projects/packages/my-jetpack/CHANGELOG.md
+++ b/projects/packages/my-jetpack/CHANGELOG.md
@@ -5,6 +5,67 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2022-02-02
+### Added
+- Added plugin installation functionality
+- Adds Tracks events for activating and deactivating products from the product cards
+- Fixes stories for ProductCard component
+- Handle when site is not connected
+- Initial approach to handle global notice
+- Module Products
+- My Jetpack: Add route handling
+- My Jetpack: connect all product cards with data provider
+- My Jetpack: connect Backup product class with Product class. Add long description and features fields.
+- My Jetpack: handle redirect when no connection #22549
+- My Jetpack: reorganize stores by project/name
+- Remove getProduct() resolver
+- Support to Hybrid products
+- Tweak dimms of the Product card status
+- Update data handling - Implement request status in Product Card
+- User connection requirement to product info
+- uses the Plugin Installer package to safely checks plugins statuses
+
+### Changed
+- Added filter for disabling the initialization of the My Jetpack package
+- Build: remove unneeded files from production build.
+- Do not initialize My Jetpack id site is not connected
+- My Jetpack: Refactor styles to use layout components and theme provider
+- My Jetpack: Update gap between product cards section
+- Pick API root and nonce values from a new window var myJetpackRest
+- Updated package dependencies.
+- Update plugin absent status consistently
+
+### Fixed
+- added unit test mock for new global variable myJetpackRest
+- Fix tests
+- Fix unsafe optional chaining.
+- my-jetpack: fix tracking event when activating product
+- Resolved minor code standard violation after implementing a stricter rule.
+
+## [0.4.0] - 2022-01-25
+### Added
+- add API endpoints to manipulate products
+- Added css module for My Jetpack Plans Section
+- Added useAnalytics hook
+- Added Visitor class for status regarding the site visitor.
+- Add first data approach
+- Add Products and REST_Products basic classes
+- Adds very basic product cards section component to my jetpack
+- My Jetpack: Add Product Card component
+- My Jetpack: check user connectivity before to hit wpcom side
+- My Jetpack: Implement data handling for enable/disable products
+- Removed endpoint plans superseded by purchases
+
+### Changed
+- Add Connections Section wrapping the Connection Status Card to My Jetpack
+- Build: do not ship raw files in production bundle.
+
+### Removed
+- Remove unused usePlans() custom react hook
+
+### Fixed
+- Fixed svg attribute strokeWidth for Boost Card
+
 ## [0.3.3] - 2022-01-18
 ### Added
 - Added redux store specific to my-jetpack
@@ -75,6 +136,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[0.5.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/0.4.0...0.5.0
+[0.4.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/0.3.3...0.4.0
 [0.3.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/0.3.2...0.3.3
 [0.3.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/0.3.1...0.3.2
 [0.3.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/0.3.0...0.3.1
diff --git a/projects/packages/my-jetpack/_inc/admin.jsx b/projects/packages/my-jetpack/_inc/admin.jsx
index 50f640884d2a3..9db135ddabb28 100644
--- a/projects/packages/my-jetpack/_inc/admin.jsx
+++ b/projects/packages/my-jetpack/_inc/admin.jsx
@@ -3,26 +3,86 @@
  */
 import ReactDOM from 'react-dom';
 import React from 'react';
+import { HashRouter, Routes, Route } from 'react-router-dom';
+import { Container, Col, JetpackFooter } from '@automattic/jetpack-components';
 
 /**
  * Internal dependencies
  */
 import MyJetpackScreen from './components/my-jetpack-screen';
+import ConnectionScreen from './components/connection-screen';
 import { initStore } from './state/store';
+import { BoostInterstitial, SearchInterstitial } from './components/product-interstitial';
+import GoBackLink from './components/go-back-link';
+import styles from './style.module.scss';
 
 initStore();
 
+/**
+ * Main layout component.
+ * Takes it as an initil basic approach that
+ * could get more complex in the future.
+ *
+ * @param {object} props          - Component props.
+ * @param {boolean} props.nav     - Header navigation.
+ * @param {object} props.children - Child components.
+ * @returns {object}                Layout react component.
+ */
+function Layout( { nav = false, children } ) {
+	if ( ! nav ) {
+		return children;
+	}
+
+	const headerNav = nav ? (
+		<Container horizontalSpacing={ 3 } horizontalGap={ 3 }>
+			<Col>
+				<GoBackLink />
+			</Col>
+		</Container>
+	) : null;
+
+	return (
+		<div className={ styles.layout }>
+			<div className={ styles.nav }>{ headerNav }</div>
+
+			<div className={ styles.primary }>{ children }</div>
+
+			<div className={ styles.footer }>
+				<JetpackFooter />
+			</div>
+		</div>
+	);
+}
+
 /**
  * The initial renderer function.
  */
 function render() {
 	const container = document.getElementById( 'my-jetpack-container' );
-
 	if ( null === container ) {
 		return;
 	}
 
-	ReactDOM.render( <MyJetpackScreen />, container );
+	ReactDOM.render(
+		<HashRouter>
+			<Routes>
+				<Route path="/" element={ <MyJetpackScreen /> } />
+				<Route
+					path="/connection"
+					element={ <Layout nav={ true } children={ <ConnectionScreen /> } /> }
+				/>
+				<Route
+					path="/add-boost"
+					element={ <Layout nav={ true } children={ <BoostInterstitial /> } /> }
+				/>
+				<Route
+					path="/add-search"
+					element={ <Layout nav={ true } children={ <SearchInterstitial /> } /> }
+				/>
+			</Routes>
+		</HashRouter>,
+		container
+	);
 }
 
 render();
diff --git a/projects/packages/my-jetpack/_inc/components/connection-screen/connect.png b/projects/packages/my-jetpack/_inc/components/connection-screen/connect.png
new file mode 100644
index 0000000000000..66f8710ac0634
Binary files /dev/null and b/projects/packages/my-jetpack/_inc/components/connection-screen/connect.png differ
diff --git a/projects/packages/my-jetpack/_inc/components/connection-screen/index.jsx b/projects/packages/my-jetpack/_inc/components/connection-screen/index.jsx
new file mode 100644
index 0000000000000..1976d0cf4235e
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/connection-screen/index.jsx
@@ -0,0 +1,49 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { ConnectScreen } from '@automattic/jetpack-connection';
+import { Container, Col } from '@automattic/jetpack-components';
+
+/**
+ * Internal dependencies
+ */
+import useMyJetpackConnection from '../../hooks/use-my-jetpack-connection';
+import connectImage from './connect.png';
+
+const ConnectionScreen = () => {
+	const { apiRoot, apiNonce } = useMyJetpackConnection();
+	return (
+		<Container horizontalSpacing={ 0 } horizontalGap={ 3 }>
+			<Col>
+				<ConnectScreen
+					title={ __(
+						'Unlock all the amazing features of Jetpack by connecting now',
+						'jetpack-my-jetpack'
+					) }
+					buttonLabel={ __( 'Connect your user account', 'jetpack-my-jetpack' ) }
+					apiRoot={ apiRoot }
+					apiNonce={ apiNonce }
+					images={ [ connectImage ] }
+				>
+					<ul>
+						<li>{ __( 'Receive instant downtime alerts', 'jetpack-my-jetpack' ) }</li>
+						<li>
+							{ __( 'Automatically share your content on social media', 'jetpack-my-jetpack' ) }
+						</li>
+						<li>{ __( 'Let your subscribers know when you post', 'jetpack-my-jetpack' ) }</li>
+						<li>
+							{ __( 'Receive notifications about new likes and comments', 'jetpack-my-jetpack' ) }
+						</li>
+						<li>
+							{ __( 'Let visitors share your content on social media', 'jetpack-my-jetpack' ) }
+						</li>
+					</ul>
+				</ConnectScreen>
+			</Col>
+		</Container>
+	);
+};
+
+export default ConnectionScreen;
diff --git a/projects/packages/my-jetpack/_inc/components/connection-screen/styles.module.scss b/projects/packages/my-jetpack/_inc/components/connection-screen/styles.module.scss
new file mode 100644
index 0000000000000..0a2c9c9ef8b6c
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/connection-screen/styles.module.scss
@@ -0,0 +1,14 @@
+.icon {
+	width: 16px;
+	margin-right: 4px;
+}
+
+.link {
+	--gray-70: #3C434A;
+
+	font-size: 14px;
+	color: var(--gray-70);
+	display: flex;
+	text-decoration: none;
+	align-items: center;
+}
diff --git a/projects/packages/my-jetpack/_inc/components/connections-section/index.jsx b/projects/packages/my-jetpack/_inc/components/connections-section/index.jsx
index c4c82e6d6c3f4..671bfede4589a 100644
--- a/projects/packages/my-jetpack/_inc/components/connections-section/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/connections-section/index.jsx
@@ -1,9 +1,9 @@
-/* global myJetpackInitialState */
 /**
  * External dependencies
  */
-import React, { useCallback } from 'react';
+import React from 'react';
 import { ConnectionStatusCard } from '@automattic/jetpack-connection';
+import useMyJetpackConnection from '../../hooks/use-my-jetpack-connection';
 
 /**
  * Plan section component.
@@ -11,15 +11,8 @@ import { ConnectionStatusCard } from '@automattic/jetpack-connection';
  * @returns {object} ConnectionsSection React component.
  */
 export default function ConnectionsSection() {
-	const redirectAfterDisconnect = useCallback( () => {
-		window.location = myJetpackInitialState.topJetpackMenuItemUrl;
-	}, [] );
+	const { apiRoot, apiNonce, redirectUrl } = useMyJetpackConnection();
 	return (
-		<ConnectionStatusCard
-			apiRoot={ myJetpackInitialState.apiRoot }
-			apiNonce={ myJetpackInitialState.apiNonce }
-			redirectUri={ myJetpackInitialState.redirectUri }
-			onDisconnected={ redirectAfterDisconnect }
-		/>
+		<ConnectionStatusCard apiRoot={ apiRoot } apiNonce={ apiNonce } redirectUri={ redirectUrl } />
 	);
 }
diff --git a/projects/packages/my-jetpack/_inc/components/go-back-link/index.js b/projects/packages/my-jetpack/_inc/components/go-back-link/index.js
new file mode 100644
index 0000000000000..596375dd7fcf1
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/go-back-link/index.js
@@ -0,0 +1,26 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Icon, arrowLeft } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import styles from './styles.module.scss';
+
+/**
+ * Simple component that renders a go back link
+ *
+ * @returns {object} GoBackLink component.
+ */
+export default function GoBackLink() {
+	return (
+		<Link to="/" className={ styles.link }>
+			<Icon icon={ arrowLeft } className={ styles.icon } />
+			{ __( 'Go back', 'jetpack-my-jetpack' ) }
+		</Link>
+	);
+}
diff --git a/projects/packages/my-jetpack/_inc/components/go-back-link/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/go-back-link/stories/index.jsx
new file mode 100644
index 0000000000000..50a9885c8619d
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/go-back-link/stories/index.jsx
@@ -0,0 +1,29 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { HashRouter, Routes, Route } from 'react-router-dom';
+
+/**
+ * Internal dependencies
+ */
+import GoBackLink from '..';
+
+export default {
+	title: 'Packages/My Jetpack/GoBackLink',
+	component: GoBackLink,
+};
+
+const DefaultArgs = {};
+
+const Template = args => (
+	<HashRouter>
+		<Routes>
+			<Route path="/" element={ <GoBackLink { ...args } /> } />
+		</Routes>
+	</HashRouter>
+);
+
+export const _default = Template.bind( {} );
+_default.parameters = {};
+_default.args = DefaultArgs;
diff --git a/projects/packages/my-jetpack/_inc/components/go-back-link/styles.module.scss b/projects/packages/my-jetpack/_inc/components/go-back-link/styles.module.scss
new file mode 100644
index 0000000000000..0a2c9c9ef8b6c
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/go-back-link/styles.module.scss
@@ -0,0 +1,14 @@
+.icon {
+	width: 16px;
+	margin-right: 4px;
+}
+
+.link {
+	--gray-70: #3C434A;
+
+	font-size: 14px;
+	color: var(--gray-70);
+	display: flex;
+	text-decoration: none;
+	align-items: center;
+}
diff --git a/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/index.jsx b/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/index.jsx
index 9de47a85bb346..0e4c3577d96d9 100644
--- a/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/index.jsx
@@ -3,22 +3,44 @@
  */
 import React, { useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
+import { Notice } from '@wordpress/components';
+import { Icon, warning, info } from '@wordpress/icons';
 import {
 	AdminSection,
 	AdminSectionHero,
 	AdminPage,
-	Row,
+	Container,
 	Col,
 } from '@automattic/jetpack-components';
 
 /**
  * Internal dependencies
  */
-import './style.scss';
 import ConnectionsSection from '../connections-section';
 import PlansSection from '../plans-section';
 import ProductCardsSection from '../product-cards-section';
 import useAnalytics from '../../hooks/use-analytics';
+import useNoticeWatcher, { useGlobalNotice } from '../../hooks/use-notice';
+import useMyJetpackConnection from '../../hooks/use-my-jetpack-connection';
+import styles from './styles.module.scss';
+
+const GlobalNotice = ( { message, options, clean } ) => {
+	/*
+	 * Map Notice statuses with Icons.
+	 * `success`, `info`, `warning`, `error`
+	 */
+	const iconMap = {
+		error: warning,
+		info,
+	};
+
+	return (
+		<Notice { ...options } onRemove={ clean } className={ styles.notice } isDismissible={ false }>
+			{ iconMap?.[ options.status ] && <Icon icon={ iconMap[ options.status ] } /> }
+			<div className={ styles.message }>{ message }</div>
+		</Notice>
+	);
+};
 
 /**
  * The My Jetpack App Main Screen.
@@ -26,40 +48,57 @@ import useAnalytics from '../../hooks/use-analytics';
  * @returns {object} The MyJetpackScreen component.
  */
 export default function MyJetpackScreen() {
+	useNoticeWatcher();
+	const { message, options, clean } = useGlobalNotice();
+
 	const {
 		tracks: { recordEvent },
 	} = useAnalytics();
+
 	useEffect( () => {
 		recordEvent( 'jetpack_myjetpack_page_view' );
 	}, [ recordEvent ] );
+
+	// No render when site is not connected.
+	const { isSiteConnected } = useMyJetpackConnection( { redirect: true } );
+
+	if ( ! isSiteConnected ) {
+		return null;
+	}
+
 	return (
-		<div className="jp-my-jetpack-screen">
-			<AdminPage>
-				<AdminSectionHero>
-					<Row>
-						<Col lg={ 12 } md={ 8 } sm={ 4 }>
-							<h1>
-								{ __(
-									'Manage your Jetpack plan and products all in one place',
-									'jetpack-my-jetpack'
-								) }
-							</h1>
-							<ProductCardsSection />
+		<AdminPage>
+			<AdminSectionHero>
+				<Container horizontalSpacing={ 5 } horizontalGap={ message ? 3 : 6 }>
+					<Col sm={ 4 } md={ 7 } lg={ 6 }>
+						<h1 className={ styles.heading }>
+							{ __(
+								'Manage your Jetpack plan and products all in one place',
+								'jetpack-my-jetpack'
+							) }
+						</h1>
+					</Col>
+					{ message && (
+						<Col>
+							<GlobalNotice message={ message } options={ options } clean={ clean } />
 						</Col>
-					</Row>
-				</AdminSectionHero>
+					) }
+					<Col>
+						<ProductCardsSection />
+					</Col>
+				</Container>
+			</AdminSectionHero>
 
-				<AdminSection>
-					<Row>
-						<Col lg={ 6 } sm={ 4 }>
-							<PlansSection />
-						</Col>
-						<Col lg={ 6 } sm={ 4 }>
-							<ConnectionsSection />
-						</Col>
-					</Row>
-				</AdminSection>
-			</AdminPage>
-		</div>
+			<AdminSection>
+				<Container horizontalSpacing={ 8 }>
+					<Col sm={ 2 } md={ 4 } lg={ 6 }>
+						<PlansSection />
+					</Col>
+					<Col sm={ 2 } md={ 4 } lg={ 6 }>
+						<ConnectionsSection />
+					</Col>
+				</Container>
+			</AdminSection>
+		</AdminPage>
 	);
 }
diff --git a/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/style.scss b/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/style.scss
deleted file mode 100644
index f5b473ebb435f..0000000000000
--- a/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/style.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '@automattic/jetpack-base-styles/style';
diff --git a/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/styles.module.scss b/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/styles.module.scss
new file mode 100644
index 0000000000000..26e050d25f7cc
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/my-jetpack-screen/styles.module.scss
@@ -0,0 +1,34 @@
+@import '@automattic/jetpack-base-styles/style';
+
+.heading {
+	font-size: 36px;
+	line-height: 40px;
+	margin: 0;
+}
+
+.notice {
+	margin: 0;
+	font-size: 16px;
+
+	&:global(.is-error) {
+		background-color: var(--jp-red-0);
+	}
+
+	& > *:first-child {
+		display: flex;
+		align-items: center;
+		margin: 0;
+		padding: 12px 4px;
+	}
+
+	& :global(.is-link) {
+		color: var( --jp-black );
+		font-size: 16px;
+		font-weight: 600;
+	}
+}
+
+.message {
+	margin-left: 8px;
+}
+
diff --git a/projects/packages/my-jetpack/_inc/components/plans-section/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/plans-section/stories/index.jsx
index 9f59635adbc3f..15ea531f27c79 100644
--- a/projects/packages/my-jetpack/_inc/components/plans-section/stories/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/plans-section/stories/index.jsx
@@ -12,7 +12,7 @@ import { purchasesList, siteWithSecurityPlanResponseBody } from './mock-data';
 import PlansSection from '../index.jsx';
 
 export default {
-	title: 'My Jetpack/Plans Section',
+	title: 'Packages/My Jetpack/Plans Section',
 	component: PlansSection,
 	decorators: [ withMock ],
 	argTypes: {
diff --git a/projects/packages/my-jetpack/_inc/components/product-card/index.jsx b/projects/packages/my-jetpack/_inc/components/product-card/index.jsx
index 9be5bab09971a..dce96000c9805 100644
--- a/projects/packages/my-jetpack/_inc/components/product-card/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-card/index.jsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import React from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { __, sprintf } from '@wordpress/i18n';
@@ -11,17 +11,20 @@ import { ButtonGroup, Button, DropdownMenu } from '@wordpress/components';
  * Internal dependencies
  */
 import styles from './style.module.scss';
+import useAnalytics from '../../hooks/use-analytics';
 
 export const PRODUCT_STATUSES = {
 	ACTIVE: 'active',
 	INACTIVE: 'inactive',
 	ERROR: 'error',
-	ABSENT: 'absent',
+	ABSENT: 'plugin_absent',
+	NEEDS_PURCHASE: 'needs_purchase',
 };
 
 const PRODUCT_STATUSES_LABELS = {
 	[ PRODUCT_STATUSES.ACTIVE ]: __( 'Active', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.INACTIVE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.NEEDS_PURCHASE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.ERROR ]: __( 'Error', 'jetpack-my-jetpack' ),
 };
 
@@ -41,10 +44,11 @@ const renderActionButton = ( {
 	admin,
 	name,
 	onLearn,
+	onActivate,
 	onAdd,
 	onManage,
 	onFixConnection,
-	onActivate,
+	isFetching,
 } ) => {
 	if ( ! admin ) {
 		return (
@@ -57,7 +61,13 @@ const renderActionButton = ( {
 		);
 	}
 
+	const buttonState = {
+		isPressed: ! isFetching,
+		disabled: isFetching,
+	};
+
 	switch ( status ) {
+		case PRODUCT_STATUSES.NEEDS_PURCHASE:
 		case PRODUCT_STATUSES.ABSENT:
 			return (
 				<Button variant="link" onClick={ onAdd }>
@@ -69,19 +79,19 @@ const renderActionButton = ( {
 			);
 		case PRODUCT_STATUSES.ACTIVE:
 			return (
-				<Button isPressed onClick={ onManage }>
+				<Button { ...buttonState } onClick={ onManage }>
 					{ __( 'Manage', 'jetpack-my-jetpack' ) }
 				</Button>
 			);
 		case PRODUCT_STATUSES.ERROR:
 			return (
-				<Button isPressed onClick={ onFixConnection }>
+				<Button { ...buttonState } onClick={ onFixConnection }>
 					{ __( 'Fix connection', 'jetpack-my-jetpack' ) }
 				</Button>
 			);
 		case PRODUCT_STATUSES.INACTIVE:
 			return (
-				<Button isPressed onClick={ onActivate }>
+				<Button { ...buttonState } onClick={ onActivate }>
 					{ __( 'Activate', 'jetpack-my-jetpack' ) }
 				</Button>
 			);
@@ -89,24 +99,71 @@ const renderActionButton = ( {
 };
 
 const ProductCard = props => {
-	const { name, admin, description, icon, status, onDeactivate } = props;
+	const {
+		name,
+		admin,
+		description,
+		icon,
+		status,
+		onActivate,
+		onAdd,
+		onDeactivate,
+		isFetching,
+	} = props;
 	const isActive = status === PRODUCT_STATUSES.ACTIVE;
 	const isError = status === PRODUCT_STATUSES.ERROR;
 	const isInactive = status === PRODUCT_STATUSES.INACTIVE;
-	const isAbsent = status === PRODUCT_STATUSES.ABSENT;
+	const isAbsent = status === PRODUCT_STATUSES.ABSENT || status === PRODUCT_STATUSES.NEEDS_PURCHASE;
+	const isPurchaseRequired = status === PRODUCT_STATUSES.NEEDS_PURCHASE;
 	const flagLabel = PRODUCT_STATUSES_LABELS[ status ];
 	const canDeactivate = ( isActive || isError ) && admin;
 
 	const containerClassName = classNames( styles.container, {
-		[ styles.absent ]: isAbsent,
+		[ styles.plugin_absent ]: isAbsent,
+		[ styles[ 'is-purchase-required' ] ]: isPurchaseRequired,
 	} );
 
 	const statusClassName = classNames( styles.status, {
 		[ styles.active ]: isActive,
 		[ styles.inactive ]: isInactive,
 		[ styles.error ]: isError,
+		[ styles[ 'is-fetching' ] ]: isFetching,
 	} );
 
+	const {
+		tracks: { recordEvent },
+	} = useAnalytics();
+
+	/**
+	 * Calls the passed function onDeactivate after firing Tracks event
+	 */
+	const deactivateHandler = useCallback( () => {
+		recordEvent( 'jetpack_myjetpack_product_card_deactivate_click', {
+			product: name,
+		} );
+		onDeactivate();
+	}, [ name, onDeactivate, recordEvent ] );
+
+	/**
+	 * Calls the passed function onActivate after firing Tracks event
+	 */
+	const activateHandler = useCallback( () => {
+		recordEvent( 'jetpack_myjetpack_product_card_activate_click', {
+			product: name,
+		} );
+		onActivate();
+	}, [ name, onActivate, recordEvent ] );
+
+	/**
+	 * Calls the passed function onAdd after firing Tracks event
+	 */
+	const addHandler = useCallback( () => {
+		recordEvent( 'jetpack_myjetpack_product_card_add_click', {
+			product: name,
+		} );
+		onAdd();
+	}, [ name, onAdd, recordEvent ] );
+
 	return (
 		<div className={ containerClassName }>
 			<div className={ styles.name }>
@@ -116,24 +173,25 @@ const ProductCard = props => {
 			<p className={ styles.description }>{ description }</p>
 			<div className={ styles.actions }>
 				{ canDeactivate ? (
-					<ButtonGroup>
-						{ renderActionButton( props ) }
+					<ButtonGroup className={ styles.group }>
+						{ renderActionButton( { ...props, onActivate: activateHandler } ) }
 						<DropdownMenu
 							className={ styles.dropdown }
-							toggleProps={ { isPressed: true } }
+							toggleProps={ { isPressed: true, disabled: isFetching } }
 							popoverProps={ { noArrow: false } }
 							icon={ DownIcon }
+							disableOpenOnArrowDown={ true }
 							controls={ [
 								{
 									title: __( 'Deactivate', 'jetpack-my-jetpack' ),
 									icon: null,
-									onClick: onDeactivate,
+									onClick: deactivateHandler,
 								},
 							] }
 						/>
 					</ButtonGroup>
 				) : (
-					renderActionButton( props )
+					renderActionButton( { ...props, onActivate: activateHandler, onAdd: addHandler } )
 				) }
 				{ ! isAbsent && <div className={ statusClassName }>{ flagLabel }</div> }
 			</div>
@@ -146,6 +204,7 @@ ProductCard.propTypes = {
 	description: PropTypes.string.isRequired,
 	icon: PropTypes.element,
 	admin: PropTypes.bool.isRequired,
+	isFetching: PropTypes.bool,
 	onDeactivate: PropTypes.func,
 	onManage: PropTypes.func,
 	onFixConnection: PropTypes.func,
@@ -157,11 +216,13 @@ ProductCard.propTypes = {
 		PRODUCT_STATUSES.INACTIVE,
 		PRODUCT_STATUSES.ERROR,
 		PRODUCT_STATUSES.ABSENT,
+		PRODUCT_STATUSES.NEEDS_PURCHASE,
 	] ).isRequired,
 };
 
 ProductCard.defaultProps = {
 	icon: null,
+	isFetching: false,
 	onDeactivate: () => {},
 	onManage: () => {},
 	onFixConnection: () => {},
diff --git a/projects/packages/my-jetpack/_inc/components/product-card/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/product-card/stories/index.jsx
index b840c1689db30..2b8d3ab5a8031 100644
--- a/projects/packages/my-jetpack/_inc/components/product-card/stories/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-card/stories/index.jsx
@@ -1,4 +1,5 @@
 /* eslint-disable react/react-in-jsx-scope */
+
 /**
  * External dependencies
  */
@@ -8,9 +9,15 @@ import React from 'react';
  * Internal dependencies
  */
 import ProductCard, { PRODUCT_STATUSES } from '../index.jsx';
+import { initStore } from '../../../state/store';
+
+// Set myJetpackRest global var.
+window.myJetpackRest = {};
+
+initStore();
 
 export default {
-	title: 'My Jetpack/Product Card',
+	title: 'Packages/My Jetpack/Product Card',
 	component: ProductCard,
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
diff --git a/projects/packages/my-jetpack/_inc/components/product-card/style.module.scss b/projects/packages/my-jetpack/_inc/components/product-card/style.module.scss
index b70e31b52b9d1..a590af4ab23c2 100644
--- a/projects/packages/my-jetpack/_inc/components/product-card/style.module.scss
+++ b/projects/packages/my-jetpack/_inc/components/product-card/style.module.scss
@@ -9,11 +9,12 @@
   --product-card-description-font-size: 14px;
   --product-card-actions-font-size: 12px;
   --product-card-margin-base: 4px;
+  --product-card-actions-size: 36px;
   --status-size: 8px;
   --status-active: #008710;
   --status-inactive: #646970;
   --status-error: #B32D2E;
-  --status-absent: #C3C4C7;
+  --status-plugin_absent: #C3C4C7;
 
   padding: 24px;
   background: var( --jp-white );
@@ -24,10 +25,11 @@
   flex-direction: column;
   justify-content: space-between;
 
-  &.absent {
+  &.is-purchase-required,
+  &.plugin_absent {
     background: none;
     box-shadow: none;
-    box-shadow: 0 0 0 1px var( --status-absent ) inset;
+    box-shadow: 0 0 0 1px var( --status-plugin_absent ) inset;
   }
 }
 
@@ -51,15 +53,23 @@
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  height: 36px;
+  min-height: var(--product-card-actions-size);
   margin-top: calc(var(--product-card-margin-base) * 4); // 16px
   font-size: var(--product-card-actions-font-size);
   font-weight: 600;
+  flex-wrap: wrap;
+}
+
+.group {
+  display: flex;
+  height: var(--product-card-actions-size);
 }
 
 .status {
   margin-left: var(--product-card-margin-base);
   white-space: nowrap;
+  height: var(--product-card-actions-size);
+  line-height: var(--product-card-actions-size);
 
   &:before {
     content: "";
@@ -70,7 +80,7 @@
     border-radius: 50%;
   }
 
-  // in absent case, there's not status flag
+  // in plugin absent case, there's not status flag
   $statuses: active, inactive, error;
 
   @each $status in $statuses {
@@ -83,5 +93,23 @@
       }
     }
   }
+
+  &.is-fetching {
+    &:before {
+      animation: blink-animation 0.5s linear infinite;
+    }
+  }
+}
+
+@keyframes blink-animation{
+  0%{
+    opacity: 0;
+  }
+  50%{
+    opacity: 0.5;
+  }
+  100%{
+    opacity: 0;
+  }
 }
 
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/anti-spam-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/anti-spam-card.jsx
index 5384dd4398f1f..8da3fcbc77783 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/anti-spam-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/anti-spam-card.jsx
@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const AntiSpamIcon = () => (
+export const AntiSpamIcon = () => (
 	<svg width="14" height="19" viewBox="0 0 14 19" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
 			fillRule="evenodd"
@@ -21,14 +22,19 @@ const AntiSpamIcon = () => (
 );
 
 const AntiSpamCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'anti-spam' );
+	const { name, description } = detail;
+
 	return (
 		<ProductCard
-			name="Anti-spam"
-			description="Stop comment and form spam"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <AntiSpamIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/backup-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/backup-card.jsx
index e2e110085d450..2f78bdbb726ed 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/backup-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/backup-card.jsx
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 import ProductCard from '../product-card';
 import { useProduct } from '../../hooks/use-product';
 
-const BackupIcon = () => (
+export const BackupIcon = () => (
 	<svg width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
 			fillRule="evenodd"
@@ -22,7 +22,7 @@ const BackupIcon = () => (
 );
 
 const BackupCard = ( { admin } ) => {
-	const { status, activate, deactivate, detail } = useProduct( 'backup' );
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'backup' );
 	const { name, description } = detail;
 
 	return (
@@ -31,6 +31,7 @@ const BackupCard = ( { admin } ) => {
 			description={ description }
 			status={ status }
 			icon={ <BackupIcon /> }
+			isFetching={ isFetching }
 			admin={ admin }
 			onDeactivate={ deactivate }
 			onActivate={ activate }
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/boost-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/boost-card.jsx
index 149b5ac4bf97c..ae84a80f474e3 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/boost-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/boost-card.jsx
@@ -1,29 +1,42 @@
 /**
  * External dependencies
  */
-import React from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
+import { useNavigate } from 'react-router-dom';
 
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const BoostIcon = () => (
+export const BoostIcon = () => (
 	<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path d="M7 1.5L12 7L7 12.5M1 1.5L6 7L1 12.5" stroke="#1E1E1E" strokeWidth="1.5" />
 	</svg>
 );
 
 const BoostCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'boost' );
+	const { name, description } = detail;
+	const navigate = useNavigate();
+
+	const onAddHandler = useCallback( () => {
+		navigate( '/add-boost' );
+	}, [ navigate ] );
+
 	return (
 		<ProductCard
-			name="Boost"
-			description="Instant speed and SEO"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <BoostIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
+			onAdd={ onAddHandler }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/crm-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/crm-card.jsx
index 84011e5362ad3..7bb1055a0ce8a 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/crm-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/crm-card.jsx
@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const CrmIcon = () => (
+export const CrmIcon = () => (
 	<svg width="18" height="11" viewBox="0 0 18 11" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
 			d="M9.5 11L9.5 9C9.5 7.89543 8.60457 7 7.5 7L3.5 7C2.39543 7 1.5 7.89543 1.5 9L1.5 11"
@@ -23,14 +24,19 @@ const CrmIcon = () => (
 );
 
 const CrmCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'crm' );
+	const { name, description } = detail;
+
 	return (
 		<ProductCard
-			name="CRM"
-			description="Connect with your people"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <CrmIcon /> }
+			isFetching={ isFetching }
 			admin={ admin }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/extras-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/extras-card.jsx
index ea738502bb7de..fc499d46a8732 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/extras-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/extras-card.jsx
@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const ExtrasIcon = () => (
+export const ExtrasIcon = () => (
 	<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
 			fillRule="evenodd"
@@ -21,14 +22,19 @@ const ExtrasIcon = () => (
 );
 
 const ExtrasCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'extras' );
+	const { name, description } = detail;
+
 	return (
 		<ProductCard
-			name="Extras"
-			description="Basic tools for a successful site"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <ExtrasIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/index.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/index.jsx
index e94f4b3f51749..2f70eed8d4645 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/index.jsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import React from 'react';
-import { Container, Row, Col } from '@automattic/jetpack-components';
+import { Container, Col } from '@automattic/jetpack-components';
 
 /**
  * Internal dependencies
@@ -23,33 +23,31 @@ import ExtrasCard from './extras-card';
  */
 const ProductCardsSection = () => {
 	return (
-		<Container>
-			<Row>
-				<Col sm={ 3 }>
-					<BackupCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<ScanCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<AntiSpamCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<BoostCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<SearchCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<VideopressCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<CrmCard admin={ true } />
-				</Col>
-				<Col sm={ 3 }>
-					<ExtrasCard admin={ true } />
-				</Col>
-			</Row>
+		<Container fluid horizontalSpacing={ 0 } horizontalGap={ 3 }>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<BackupCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<ScanCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<AntiSpamCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<BoostCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<SearchCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<VideopressCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<CrmCard admin={ true } />
+			</Col>
+			<Col sm={ 4 } md={ 4 } lg={ 3 }>
+				<ExtrasCard admin={ true } />
+			</Col>
 		</Container>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/scan-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/scan-card.jsx
index 6ddc3b7bd8ce6..e96f97fd41c43 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/scan-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/scan-card.jsx
@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const ScanIcon = () => (
+export const ScanIcon = () => (
 	<svg width="14" height="17" viewBox="0 0 14 17" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
 			fillRule="evenodd"
@@ -21,14 +22,19 @@ const ScanIcon = () => (
 );
 
 const ScanCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'scan' );
+	const { name, description } = detail;
+
 	return (
 		<ProductCard
-			name="Scan"
-			description="Stay one step ahead of threats"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <ScanIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/search-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/search-card.jsx
index afecdb5daceaa..ac424d1147cf4 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/search-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/search-card.jsx
@@ -1,15 +1,17 @@
 /**
  * External dependencies
  */
-import React from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
+import { useNavigate } from 'react-router-dom';
 
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const SearchIcon = () => (
+export const SearchIcon = () => (
 	<svg width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path d="M1 12L5 8.5" stroke="#1E1E1E" strokeWidth="1.5" />
 		<circle cx="8.5" cy="5.5" r="4.75" stroke="#1E1E1E" strokeWidth="1.5" />
@@ -17,14 +19,23 @@ const SearchIcon = () => (
 );
 
 const SearchCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'search' );
+	const { name, description } = detail;
+
+	const navigate = useNavigate();
+	const onAddHandler = useCallback( () => navigate( '/add-search' ), [ navigate ] );
+
 	return (
 		<ProductCard
-			name="Search"
-			description="Help them find what they need"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <SearchIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
+			onAdd={ onAddHandler }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/stories/index.jsx
index 1fe6bd32bdaf3..d95bcf2b5fa2c 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/stories/index.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/stories/index.jsx
@@ -9,7 +9,7 @@ import React from 'react';
 import ProductCardsSection from '../index.jsx';
 
 export default {
-	title: 'My Jetpack/Product Cards Section',
+	title: 'Packages/My Jetpack/Product Cards Section',
 	component: ProductCardsSection,
 	parameters: {
 		actions: { argTypesRegex: '^on.*' },
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/videopress-card.jsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/videopress-card.jsx
index 7e23886d86e2b..d125b7db73e25 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/videopress-card.jsx
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/videopress-card.jsx
@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 /**
  * Internal dependencies
  */
-import ProductCard, { PRODUCT_STATUSES } from '../product-card';
+import ProductCard from '../product-card';
+import { useProduct } from '../../hooks/use-product';
 
-const VideopressIcon = () => (
+export const VideopressIcon = () => (
 	<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<rect
 			x="0.75"
@@ -25,14 +26,19 @@ const VideopressIcon = () => (
 );
 
 const VideopressCard = ( { admin } ) => {
-	// @todo: implement action handlers
+	const { status, activate, deactivate, detail, isFetching } = useProduct( 'videopress' );
+	const { name, description } = detail;
+
 	return (
 		<ProductCard
-			name="VideoPress"
-			description="High-quality, ad-free video"
-			status={ PRODUCT_STATUSES.ABSENT }
+			name={ name }
+			description={ description }
+			status={ status }
 			icon={ <VideopressIcon /> }
 			admin={ admin }
+			isFetching={ isFetching }
+			onDeactivate={ deactivate }
+			onActivate={ activate }
 		/>
 	);
 };
diff --git a/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx b/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx
new file mode 100644
index 0000000000000..994acfc46bdb6
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-detail-card/index.jsx
@@ -0,0 +1,140 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import classnames from 'classnames';
+import { Button } from '@wordpress/components';
+import { Icon, check } from '@wordpress/icons';
+import { getCurrencyObject } from '@automattic/format-currency';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { useProduct } from '../../hooks/use-product';
+import { BackupIcon } from '../product-cards-section/backup-card';
+import styles from './style.module.scss';
+import { BoostIcon } from '../product-cards-section/boost-card';
+
+/**
+ * Simple react component to render the product icon,
+ * depending on the product slug.
+ *
+ * @param {string} slug - The product slug.
+ * @returns {object}    ProductDetailCard react component.
+ */
+function ProductIcon( { slug } ) {
+	switch ( slug ) {
+		case 'backup':
+			return <BackupIcon />;
+
+		case 'boost':
+			return <BoostIcon />;
+		default:
+			return null;
+	}
+}
+
+/**
+ * React component to render the price.
+ *
+ * @param {object} props          - Component props.
+ * @param {string} props.value    - Product price
+ * @param {string} props.currency - Product current code
+ * @param {string} props.isOld    - True when the product price is old
+ * @returns {object}                Price react component.
+ */
+function Price( { value, currency, isOld } ) {
+	const priceObject = getCurrencyObject( value, currency );
+
+	const classNames = classnames( styles.price, {
+		[ styles[ 'is-old' ] ]: isOld,
+	} );
+
+	return (
+		<div className={ classNames }>
+			<sup className={ styles[ 'price-symbol' ] }>{ priceObject.symbol }</sup>
+			<span className={ styles[ 'price-number' ] }>{ priceObject.integer }</span>
+			<sup className={ styles[ 'price-fraction' ] }>{ priceObject.fraction }</sup>
+		</div>
+	);
+}
+
+/**
+ * Product Detail component.
+ *
+ * @param {object} props                    - Component props.
+ * @param {string} props.slug               - Product slug
+ * @param {Function} props.trackButtonClick - Function to call for tracking clicks on Call To Action button
+ * @returns {object}                          ProductDetailCard react component.
+ */
+const ProductDetail = ( { slug, trackButtonClick } ) => {
+	const { detail } = useProduct( slug );
+	const { title, longDescription, features, pricingForUi = {} } = detail;
+	const { isFree, fullPrice, currencyCode } = pricingForUi;
+
+	return (
+		<div className={ styles.container }>
+			<ProductIcon slug={ slug } />
+
+			<h3>{ title }</h3>
+			<p className={ styles.name }>{ longDescription }</p>
+			<ul className={ styles.features }>
+				{ features.map( ( feature, id ) => (
+					<li key={ `feature-${ id }` }>
+						<Icon icon={ check } size={ 30 } />
+						{ feature }
+					</li>
+				) ) }
+			</ul>
+
+			{ ! isFree && (
+				<div className={ styles[ 'price-container' ] }>
+					<Price value={ fullPrice } currency={ currencyCode } isOld={ true } />
+					<Price value={ fullPrice } currency={ currencyCode } isOld={ false } />
+					<div className={ styles[ 'price-description' ] }>
+						{ __( '/month, paid yearly', 'jetpack-my-jetpack' ) }
+					</div>
+				</div>
+			) }
+
+			{ isFree && (
+				<h3 className={ styles[ 'product-free' ] }>{ __( 'Free', 'jetpack-my-jetpack' ) }</h3>
+			) }
+
+			<Button
+				onClick={ trackButtonClick }
+				isLink
+				isPrimary
+				href="#"
+				className={ styles[ 'checkout-button' ] }
+			>
+				{
+					/* translators: placeholder is product name. */
+					sprintf( __( 'Add %s', 'jetpack-my-jetpack' ), title )
+				}
+			</Button>
+		</div>
+	);
+};
+
+ProductDetail.defaultProps = {
+	trackButtonClick: () => {},
+};
+
+export { ProductDetail };
+
+/**
+ * ProductDetailCard component.
+ *
+ * @param {object} props          - Component props.
+ * @param {string} props.slug     - Product slug
+ * @returns {object}                ProductDetailCard react component.
+ */
+export default function ProductDetailCard( { slug } ) {
+	return (
+		<div className={ styles.card }>
+			<ProductDetail slug={ slug } />
+		</div>
+	);
+}
diff --git a/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/index.jsx
new file mode 100644
index 0000000000000..622933713c258
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/index.jsx
@@ -0,0 +1,74 @@
+/* eslint-disable react/react-in-jsx-scope */
+/**
+ * External dependencies
+ */
+import React from 'react';
+import withMock from 'storybook-addon-mock';
+
+/**
+ * Internal dependencies
+ */
+import ProductDetailCard, { ProductDetail } from '../index.jsx';
+import { backupProductData, boostProductData } from './mock-data.js';
+
+export default {
+	title: 'Packages/My Jetpack/Product Detail Card',
+	component: ProductDetailCard,
+	decorators: [ withMock ],
+};
+
+const DefaultArgs = {};
+
+const DefaultProductDetailCard = args => <ProductDetailCard { ...args } slug="backup" />;
+
+const mapResponse = {
+	backup: backupProductData,
+	boost: boostProductData,
+};
+
+/**
+ * Helper function that returns the story mock data.
+ *
+ * @param {string} product - Product slug
+ * @returns {Array}          Story mock data
+ */
+function getMockData( product ) {
+	return [
+		{
+			url: `my-jetpack/v1/site/products/${ product }?_locale=user`,
+			method: 'GET',
+			status: 200,
+			response: mapResponse[ product ],
+		},
+	];
+}
+
+export const _default = DefaultProductDetailCard.bind( {} );
+_default.parameters = {
+	mockData: getMockData( 'backup' ),
+};
+_default.args = DefaultArgs;
+
+const BackupTemplate = args => <ProductDetail { ...args } slug="backup" />;
+export const JetpackBackup = BackupTemplate.bind( {} );
+JetpackBackup.parameters = {
+	mockData: getMockData( 'backup' ),
+};
+
+const BoostTemplate = args => <ProductDetail { ...args } slug="boost" />;
+export const BoostBackup = BoostTemplate.bind( {} );
+BoostBackup.parameters = {
+	mockData: getMockData( 'boost' ),
+};
+
+const BackupCardTemplate = args => <ProductDetailCard { ...args } slug="backup" />;
+export const JetpackBackupCard = BackupCardTemplate.bind( {} );
+JetpackBackupCard.parameters = {
+	mockData: getMockData( 'backup' ),
+};
+
+const BoostCardTemplate = args => <ProductDetailCard { ...args } slug="boost" />;
+export const BoostBackupCard = BoostCardTemplate.bind( {} );
+BoostBackupCard.parameters = {
+	mockData: getMockData( 'boost' ),
+};
diff --git a/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/mock-data.js b/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/mock-data.js
new file mode 100644
index 0000000000000..906d34440a8d2
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-detail-card/stories/mock-data.js
@@ -0,0 +1,40 @@
+export const backupProductData = {
+	slug: 'backup',
+	name: 'Backup',
+	title: 'Jepack Backup',
+	description: 'Save every change',
+	long_description:
+		'Real-time backups save every change and one-click restores get you back online quickly.',
+	status: 'active',
+	features: [
+		'Real-time cloud backups',
+		'10GB of backup storage',
+		'30-day archive & activity log',
+		'One-click restores',
+	],
+	pricingForUi: {
+		available: true,
+		currencyCode: 'EUR',
+		fullPrice: '9',
+		promotionPercentage: '50',
+	},
+};
+
+export const boostProductData = {
+	slug: 'boost',
+	name: 'Boost',
+	title: 'Jepack Boost',
+	description: 'Instant speed and SEO',
+	long_description:
+		'Jetpack Boost gives your site the same performance advantages as the world’s leading websites, no developer required.',
+	status: 'inactive',
+	features: [
+		'Check your site performance',
+		'Enable improvements in one click',
+		'Standalone free plugin for those focused on speed',
+	],
+	pricingForUi: {
+		available: true,
+		is_free: true,
+	},
+};
diff --git a/projects/packages/my-jetpack/_inc/components/product-detail-card/style.module.scss b/projects/packages/my-jetpack/_inc/components/product-detail-card/style.module.scss
new file mode 100644
index 0000000000000..b8bc78facfacb
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-detail-card/style.module.scss
@@ -0,0 +1,152 @@
+.card {
+	// Card main wrapper
+	--product-card-bg-color: white;
+	--product-card-border-color: #d5d5d5;
+	--product-card-shadow: rgb(0 0 0 / 3%);
+	--product-card-border-radius: 4px;
+	
+	background-color: var(--product-card-bg-color);
+	border: 1px solid var(--product-card-border-color);
+	border-radius: var(--product-card-border-radius);
+	box-shadow: 0 2px 6px var(--product-card-shadow), 0 1px 2px var(--product-card-shadow);
+	max-width: 384px;
+}
+
+.container {
+	// @todo find a better way to change link color
+	// since this could affect more places
+	--wp-admin-theme-color: var(--jp-black);
+
+	// all css variables used down in product-detail-card
+
+	// Colors
+	--jp-green-primary: #069e08;
+	--jp-green-secondary: #2fb41f;
+	--jp-text-color: ###;
+
+	// Text
+	--product-card-description-line-height: 1.5;
+	--product-card-description-font-size: 16px;
+	--product-card-price-font-size: 4rem;
+
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	max-width: 600px;
+	padding: 60px 40px;
+
+	h3 {
+		font-size: var(--font-title-large);
+		font-weight: 700;
+		margin-top: 48px;
+		line-height: 1.1;
+		color: var( --jp-black );
+		margin: 10px 0;
+	}
+
+	.checkout-button {
+		margin-top: 20px;
+		white-space: pre-line;
+		height: auto;
+		line-height: 26px;
+	}
+
+	// Product Icon
+	& > svg {
+		height: 30px;
+		line-height: 30px;
+	}
+}
+
+.name {
+	line-height: var(--product-card-description-line-height);
+	font-size: var(--product-card-description-font-size);
+	margin: 0 0 22px;
+}
+
+.features {
+	margin: 0 0 30px;
+	padding: 0;
+	li {
+		list-style: none;
+		display: flex;
+		align-items: center;
+		margin-bottom: 8px;
+		font-size: 14px;
+		line-height: 1.4;
+	}
+
+	svg {
+		fill: var(--jp-green-primary);
+	}
+}
+
+.price-container {
+	display: flex;
+	flex-wrap: wrap;
+	flex-direction: row;
+	align-items: flex-end;
+	margin-top: auto;
+	color: var(--jp-text-color);
+}
+
+.price {
+	font-size: var(--product-card-price-font-size);
+    display: flex;
+	margin: 0;
+	position: relative;
+
+	&:first-child {
+		margin-right: 10px;
+	}
+
+	.price-symbol {
+		padding-right: 1px;
+		font-size: 0.5em;
+		line-height: 1.4;
+	}
+
+	.price-number {
+		font-size: inherit;
+		font-weight: 700;
+		line-height: 1;
+	}
+
+	.price-fraction {
+		padding-left: 1px;
+		font-size: 0.35em;
+		font-weight: 700;
+		line-height: 1.7;
+	}
+
+	&.is-old {
+    	color: #a7aaad;
+		&:after {
+			content: " ";
+			display: block;
+			width: 100%;
+			height: 3px;
+			background: #c9356e;
+			border-radius: 5px;
+			position: absolute;
+			top: 50%;
+			margin-top: -2px;
+			pointer-events: none;
+		}
+	}
+}
+
+.price-description {
+	color: #787c82;
+	letter-spacing: 0.2px;
+	flex-grow: 2;
+}
+
+.checkout-button {
+	align-self: flex-start;
+	font-size: 16px;
+	padding: 8px 60px;
+    text-align: center;;
+	width: 100%;
+	display: inline-block;
+}
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/boost.png b/projects/packages/my-jetpack/_inc/components/product-interstitial/boost.png
new file mode 100644
index 0000000000000..65a8aedd98f67
Binary files /dev/null and b/projects/packages/my-jetpack/_inc/components/product-interstitial/boost.png differ
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx
new file mode 100644
index 0000000000000..ad06224fbaa57
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-interstitial/index.jsx
@@ -0,0 +1,88 @@
+/**
+ * External dependencies
+ */
+import React, { useCallback, useEffect } from 'react';
+import { Container, Col } from '@automattic/jetpack-components';
+
+/**
+ * Internal dependencies
+ */
+import { ProductDetail } from '../product-detail-card';
+import styles from './style.module.scss';
+import useAnalytics from '../../hooks/use-analytics';
+import boostImage from './boost.png';
+import searchImage from './search.png';
+
+/**
+ * Product Interstitial component.
+ *
+ * @param {object} props          - Component props.
+ * @param {string} props.slug     - Product slug
+ * @param {object} props.children - Product additional content
+ * @returns {object}                ProductInterstitial react component.
+ */
+export default function ProductInterstitial( { slug, children = null } ) {
+	const {
+		tracks: { recordEvent },
+	} = useAnalytics();
+
+	useEffect( () => {
+		recordEvent( 'jetpack_myjetpack_product_interstitial_view', { product: slug } );
+	}, [ recordEvent, slug ] );
+
+	const trackProductClick = useCallback( () => {
+		recordEvent( 'jetpack_myjetpack_product_interstitial_add_link_click', { product: slug } );
+	}, [ recordEvent, slug ] );
+
+	return (
+		<div className={ styles.wrapper }>
+			<Container className={ styles.container } horizontalSpacing={ 0 } horizontalGap={ 0 }>
+				<Col sm={ 4 } md={ 4 } lg={ 5 }>
+					<ProductDetail slug={ slug } trackButtonClick={ trackProductClick } />
+				</Col>
+				<Col sm={ 4 } md={ 4 } lg={ 7 } className={ styles.imageContainer }>
+					{ children }
+				</Col>
+			</Container>
+		</div>
+	);
+}
+
+/**
+ * BackupInterstitial component
+ *
+ * @returns {object} BackupInterstitial react component.
+ */
+export function BackupInterstitial() {
+	return (
+		<ProductInterstitial slug="backup">
+			<h2>@todo Popular upgrade here</h2>
+		</ProductInterstitial>
+	);
+}
+
+/**
+ * SearchInterstitial component
+ *
+ * @returns {object} BoostInterstitial react component.
+ */
+export function BoostInterstitial() {
+	return (
+		<ProductInterstitial slug="boost">
+			<img src={ boostImage } alt="Boost" />
+		</ProductInterstitial>
+	);
+}
+
+/**
+ * SearchInterstitial component
+ *
+ * @returns {object} SearchInterstitial react component.
+ */
+export function SearchInterstitial() {
+	return (
+		<ProductInterstitial slug="search">
+			<img src={ searchImage } alt="Search" />
+		</ProductInterstitial>
+	);
+}
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/search.png b/projects/packages/my-jetpack/_inc/components/product-interstitial/search.png
new file mode 100644
index 0000000000000..4ef9cf13a1091
Binary files /dev/null and b/projects/packages/my-jetpack/_inc/components/product-interstitial/search.png differ
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/stories/index.jsx b/projects/packages/my-jetpack/_inc/components/product-interstitial/stories/index.jsx
new file mode 100644
index 0000000000000..c3a5c7f9a707f
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-interstitial/stories/index.jsx
@@ -0,0 +1,41 @@
+/* eslint-disable react/react-in-jsx-scope */
+/**
+ * External dependencies
+ */
+import React from 'react';
+import withMock from 'storybook-addon-mock';
+
+/**
+ * Internal dependencies
+ */
+import ProductInterstitial, {
+	BackupInterstitial,
+	BoostInterstitial,
+	SearchInterstitial,
+} from '../index.jsx';
+
+export default {
+	title: 'Packages/My Jetpack/Product Interstitial',
+	component: ProductInterstitial,
+	decorators: [ withMock ],
+};
+
+const DefaultArgs = {};
+
+const DefaultBackupDetailCard = args => <BackupInterstitial { ...args } />;
+
+export const _default = DefaultBackupDetailCard.bind( {} );
+_default.parameters = {};
+_default.args = DefaultArgs;
+
+const BackupTemplate = args => <BackupInterstitial { ...args } />;
+export const JetpackBackup = BackupTemplate.bind( {} );
+JetpackBackup.parameters = {};
+
+const BoostTemplate = args => <BoostInterstitial { ...args } />;
+export const JetpackBoost = BoostTemplate.bind( {} );
+JetpackBoost.parameters = {};
+
+const SearchTemplate = args => <SearchInterstitial { ...args } />;
+export const JetpackSearch = SearchTemplate.bind( {} );
+JetpackSearch.parameters = {};
diff --git a/projects/packages/my-jetpack/_inc/components/product-interstitial/style.module.scss b/projects/packages/my-jetpack/_inc/components/product-interstitial/style.module.scss
new file mode 100644
index 0000000000000..6cd00d4ba1a03
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/components/product-interstitial/style.module.scss
@@ -0,0 +1,43 @@
+.container {
+	// Card main wrapper
+	--product-card-bg-color: white;
+	--product-card-border-color: #d5d5d5;
+	--product-card-shadow: rgb(0 0 0 / 3%);
+	--product-card-border-radius: 4px;
+	
+	background-color: var(--product-card-bg-color);
+	border: 1px solid var(--product-card-border-color);
+	border-radius: var(--product-card-border-radius);
+	box-shadow: 0 2px 6px var(--product-card-shadow), 0 1px 2px var(--product-card-shadow);
+}
+
+.imageContainer {
+	display: flex;
+	align-items: center;
+
+	img {
+		object-fit: cover;
+		width: 100%;
+	}
+}
+
+// Wrapper
+
+@media (max-width: 768px) {
+	.wrapper {
+		margin-right: 12px;
+	}
+}
+
+@mixin container($width, $margin-right) {
+	@media ( min-width: #{$width} ) {
+		margin-right: $margin-right
+	}
+}
+
+.wrapper {
+	--margin-right-compensation-sm: 10px;
+	--margin-right-compensation-md: 20px;
+	@include container( 0px, var(--margin-right-compensation-sm) );
+	@include container( 782px, var(--margin-right-compensation-md) );
+}
\ No newline at end of file
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-analytics/index.js b/projects/packages/my-jetpack/_inc/hooks/use-analytics/index.js
index 7aa0dfec949d8..e5013017ef2ad 100644
--- a/projects/packages/my-jetpack/_inc/hooks/use-analytics/index.js
+++ b/projects/packages/my-jetpack/_inc/hooks/use-analytics/index.js
@@ -1,29 +1,24 @@
-/* global myJetpackInitialState */
 /**
  * External dependencies
  */
 import { useEffect } from 'react';
 import jetpackAnalytics from '@automattic/jetpack-analytics';
-import { useConnection } from '@automattic/jetpack-connection';
+import useMyJetpackConnection from '../use-my-jetpack-connection';
 
 const useAnalytics = () => {
-	const { apiRoot, apiNonce } = myJetpackInitialState;
+	const { isUserConnected, userConnectionData = {} } = useMyJetpackConnection();
+	const { login, ID } = userConnectionData.currentUser?.wpcomUser || {};
 
-	const { isUserConnected, userConnectionData } = useConnection( {
-		apiRoot,
-		apiNonce,
-	} );
-
-	const { login, ID } = userConnectionData.currentUser.wpcomUser;
 	/**
 	 * Initialize tracks with user data.
 	 * Should run when we have a connected user.
 	 */
 	useEffect( () => {
-		if ( isUserConnected ) {
+		if ( isUserConnected && ID && login ) {
 			jetpackAnalytics.initialize( ID, login );
 		}
-	} );
+	}, [ ID, isUserConnected, login ] );
+
 	const {
 		clearedIdentity,
 		ga,
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-my-jetpack-connection/index.js b/projects/packages/my-jetpack/_inc/hooks/use-my-jetpack-connection/index.js
new file mode 100644
index 0000000000000..f04ad8d947b17
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/hooks/use-my-jetpack-connection/index.js
@@ -0,0 +1,56 @@
+/* global myJetpackInitialState */
+/* global myJetpackRest */
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from 'react';
+import { useConnection } from '@automattic/jetpack-connection';
+
+/**
+ * React custom hook to get the site purchases data.
+ *
+ * @param   {object} options           - Options to pass to the hook.
+ * @param   {boolean} options.reditect - Perform a redirect when no connection is found.
+ * @returns {object} site purchases data
+ */
+export default function useMyJetpackConnection( options = { redirect: false } ) {
+	const { apiRoot, apiNonce } = myJetpackRest;
+	const { topJetpackMenuItemUrl } = myJetpackInitialState;
+	const { redirect } = options;
+	const connectionData = useConnection( { apiRoot, apiNonce } );
+
+	// Alias: https://github.com/Automattic/jetpack/blob/master/projects/packages/connection/src/class-rest-connector.php/#L315
+	const isSiteConnected = connectionData.isRegistered;
+
+	/*
+	 * When the site is not connect,
+	 * and the `redirect` option is set to `true`,
+	 * redirect to the Jetpack dashboard.
+	 */
+	useEffect( () => {
+		// Bail early when topJetpackMenuItemUrl is not defined.
+		if ( ! topJetpackMenuItemUrl ) {
+			return;
+		}
+
+		// Bail early when redirect mode is disabled.
+		if ( ! redirect ) {
+			return;
+		}
+
+		// When site is connected, bail early.
+		if ( isSiteConnected ) {
+			return;
+		}
+
+		window.location = topJetpackMenuItemUrl;
+	}, [ isSiteConnected, redirect, topJetpackMenuItemUrl ] );
+
+	return {
+		apiNonce,
+		apiRoot,
+		...connectionData,
+		isSiteConnected,
+		redirectUrl: topJetpackMenuItemUrl,
+	};
+}
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-notice/Readme.md b/projects/packages/my-jetpack/_inc/hooks/use-notice/Readme.md
new file mode 100644
index 0000000000000..57f1a7c9f6b4a
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/hooks/use-notice/Readme.md
@@ -0,0 +1,20 @@
+# useNotice custom hooks 
+
+## useNoticeWatcher
+
+## useGlobalNotice
+
+```es6
+import { useGlobalNotice } from './hooks/use-notice';
+
+function PlansSection() {
+	const global = useGlobalNotice();
+	if ( ! global ) {
+		return null;
+	}
+
+	return (
+		<Notice>{ global.message }</Notice>;
+	)
+}
+```
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-notice/index.js b/projects/packages/my-jetpack/_inc/hooks/use-notice/index.js
new file mode 100644
index 0000000000000..c6387b7ffdfd4
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/hooks/use-notice/index.js
@@ -0,0 +1,62 @@
+/**
+ * WordPress dependencies
+ */
+import { useEffect } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useNavigate } from 'react-router-dom';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_ID } from '../../state/store';
+import useMyJetpackConnection from '../use-my-jetpack-connection';
+
+/**
+ * React custom hook to get global notices.
+ *
+ * @returns {object} Global notices data
+ */
+export function useGlobalNotice() {
+	const dispatch = useDispatch();
+
+	const { message, options } = useSelect( select => select( STORE_ID ).getGlobalNotice() );
+	return {
+		message,
+		options: options || {},
+		clean: () => dispatch( STORE_ID ).cleanGlobalNotice(),
+	};
+}
+
+/**
+ * React custom hook to watch global events.
+ * For instance, when the user is not connected,
+ * the hook dispatches an action to populate the global notice.
+ */
+export default function useNoticeWatcher() {
+	const dispatch = useDispatch();
+	const { isUserConnected } = useMyJetpackConnection();
+	const navigate = useNavigate();
+
+	useEffect( () => {
+		if ( ! isUserConnected ) {
+			return dispatch( STORE_ID ).setGlobalNotice(
+				__(
+					'Jetpack is currently not connected and some products might not work until the connection is reestablished.',
+					'jetpack-my-jetpack'
+				),
+				{
+					status: 'error',
+					actions: [
+						{
+							label: __( 'Connect Jetpack now.', 'jetpack-my-jetpack' ),
+							onClick: () => navigate( '/connection' ),
+							variant: 'link',
+							noDefaultClasses: true,
+						},
+					],
+				}
+			);
+		}
+	}, [ isUserConnected, dispatch, navigate ] );
+}
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-product/Readme.md b/projects/packages/my-jetpack/_inc/hooks/use-product/Readme.md
index e42b63a9ca089..b6b930b72d0c0 100644
--- a/projects/packages/my-jetpack/_inc/hooks/use-product/Readme.md
+++ b/projects/packages/my-jetpack/_inc/hooks/use-product/Readme.md
@@ -23,8 +23,6 @@ An object with details about the product.
 
 Returns the current products list of My Jetpack.
 
-An array with all products list.
-
 ### activate( <productSlug> )
 A helper function to activate a product.
 
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-product/index.js b/projects/packages/my-jetpack/_inc/hooks/use-product/index.js
index 766e4491d148b..667604daf06a4 100644
--- a/projects/packages/my-jetpack/_inc/hooks/use-product/index.js
+++ b/projects/packages/my-jetpack/_inc/hooks/use-product/index.js
@@ -7,6 +7,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
  * Internal dependencies
  */
 import { STORE_ID } from '../../state/store';
+import { mapObjectKeysToCamel } from '../../utils/to-camel';
 
 /**
  * React custom hook to deal with a My Jetpack product.
@@ -16,7 +17,14 @@ import { STORE_ID } from '../../state/store';
  */
 export function useProduct( productId ) {
 	const { activateProduct, deactivateProduct } = useDispatch( STORE_ID );
-	const detail = useSelect( select => select( STORE_ID ).getProduct( productId ) );
+
+	/*
+	 * Re map object keys to camel case.
+	 * Consider to improve this in the process.
+	 */
+	let detail = useSelect( select => select( STORE_ID ).getProduct( productId ) );
+	detail = mapObjectKeysToCamel( detail, true );
+	detail.pricingForUi = mapObjectKeysToCamel( detail.pricingForUi, true );
 
 	return {
 		activate: () => activateProduct( productId ),
@@ -24,7 +32,7 @@ export function useProduct( productId ) {
 		productsList: useSelect( select => select( STORE_ID ).getProducts() ),
 		detail,
 		isActive: detail.status === 'active',
+		isFetching: useSelect( select => select( STORE_ID ).isFetching( productId ) ),
 		status: detail.status, // shorthand. Consider to remove.
-		isFetching: !! detail.isFetching,
 	};
 }
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-route-blocker/index.js b/projects/packages/my-jetpack/_inc/hooks/use-route-blocker/index.js
new file mode 100644
index 0000000000000..b5e5a9b8deaf7
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/hooks/use-route-blocker/index.js
@@ -0,0 +1,16 @@
+/**
+ * External dependencies
+ */
+import { useEffect } from 'react';
+import { useNavigationType, useNavigate } from 'react-router-dom';
+
+export default () => {
+	const type = useNavigationType();
+	const navigate = useNavigate();
+
+	useEffect( () => {
+		if ( type === 'POP' ) {
+			navigate( '/', { replace: true } );
+		}
+	}, [ type, navigate ] );
+};
diff --git a/projects/packages/my-jetpack/_inc/state/actions.js b/projects/packages/my-jetpack/_inc/state/actions.js
index c01e0676fcb0b..7290195937f4d 100644
--- a/projects/packages/my-jetpack/_inc/state/actions.js
+++ b/projects/packages/my-jetpack/_inc/state/actions.js
@@ -15,12 +15,16 @@ import { REST_API_SITE_PRODUCTS_ENDPOINT } from './constants';
 const SET_PURCHASES_IS_FETCHING = 'SET_PURCHASES_IS_FETCHING';
 const FETCH_PURCHASES = 'FETCH_PURCHASES';
 const SET_PURCHASES = 'SET_PURCHASES';
-const SET_PRODUCT_ACTION_ERROR = 'SET_PRODUCT_ACTION_ERROR';
+const SET_IS_FETCHING_PRODUCT = 'SET_IS_FETCHING_PRODUCT';
+const SET_PRODUCT = 'SET_PRODUCT';
+const SET_PRODUCT_REQUEST_ERROR = 'SET_PRODUCT_REQUEST_ERROR';
 const ACTIVATE_PRODUCT = 'ACTIVATE_PRODUCT';
 const DEACTIVATE_PRODUCT = 'DEACTIVATE_PRODUCT';
-const SET_FETCHING_PRODUCT_STATUS = 'SET_FETCHING_PRODUCT_STATUS';
 const SET_PRODUCT_STATUS = 'SET_PRODUCT_STATUS';
 
+const SET_GLOBAL_NOTICE = 'SET_GLOBAL_NOTICE';
+const CLEAN_GLOBAL_NOTICE = 'CLEAN_GLOBAL_NOTICE';
+
 const setPurchasesIsFetching = isFetching => {
 	return { type: SET_PURCHASES_IS_FETCHING, isFetching };
 };
@@ -33,17 +37,33 @@ const setPurchases = purchases => {
 	return { type: SET_PURCHASES, purchases };
 };
 
+const setProduct = product => ( { type: SET_PRODUCT, product } );
+
+const setRequestProductError = ( productId, error ) => ( {
+	type: SET_PRODUCT_REQUEST_ERROR,
+	productId,
+	error,
+} );
+
 const setProductStatus = ( productId, status ) => {
 	return { type: SET_PRODUCT_STATUS, productId, status };
 };
 
-const setIsFetchingProductStatus = ( productId, isFetching ) => {
-	return { type: SET_FETCHING_PRODUCT_STATUS, productId, isFetching };
-};
-
-const setProductActionError = error => {
-	return { type: SET_PRODUCT_ACTION_ERROR, error };
-};
+/**
+ * Action that set the `isFetching` state of the product,
+ * when the client hits the server.
+ *
+ * @param {string} productId   - My Jetpack product ID.
+ * @param {boolean} isFetching - True if the product is being fetched. Otherwise, False.
+ * @returns {object}           - Redux action.
+ */
+function setIsFetchingProduct( productId, isFetching ) {
+	return {
+		type: SET_IS_FETCHING_PRODUCT,
+		productId,
+		isFetching,
+	};
+}
 
 /**
  * Side effect action which will sync
@@ -61,31 +81,34 @@ function requestProductStatus( productId, data, { select, dispatch } ) {
 		// Check valid product.
 		const isValid = select.isValidProduct( productId );
 		if ( ! isValid ) {
+			dispatch( setProductStatus( productId, 'error' ) );
 			return dispatch(
-				setProductActionError( {
+				setRequestProductError( productId, {
 					code: 'invalid_product',
 					message: __( 'Invalid product name', 'jetpack-my-jetpack' ),
 				} )
 			);
 		}
 
-		dispatch( setIsFetchingProductStatus( productId, true ) );
+		const method = data.activate ? 'POST' : 'DELETE';
+		dispatch( setIsFetchingProduct( productId, true ) );
 
 		// Activate/deactivate product.
 		return apiFetch( {
 			path: `${ REST_API_SITE_PRODUCTS_ENDPOINT }/${ productId }`,
-			method: 'POST',
+			method,
 			data,
 		} )
-			.then( status => {
-				dispatch( setIsFetchingProductStatus( productId, false ) );
-				dispatch( setProductStatus( productId, status ) );
+			.then( freshProduct => {
+				dispatch( setIsFetchingProduct( productId, false ) );
+				dispatch( setProduct( freshProduct ) );
 				resolve( status );
 			} )
 			.catch( error => {
-				dispatch( setProductActionError( error ) );
+				dispatch( setProductStatus( productId, 'error' ) );
+				dispatch( setRequestProductError( productId, error ) );
 				reject( error );
-				dispatch( setIsFetchingProductStatus( productId, false ) );
+				dispatch( setIsFetchingProduct( productId, false ) );
 			} );
 	} );
 }
@@ -113,14 +136,27 @@ const deactivateProduct = productId => async store => {
 };
 
 const productActions = {
+	setProduct,
 	activateProduct,
 	deactivateProduct,
+	setIsFetchingProduct,
+	setRequestProductError,
+};
+
+const noticeActions = {
+	setGlobalNotice: ( message, options ) => ( {
+		type: 'SET_GLOBAL_NOTICE',
+		message,
+		options,
+	} ),
+	cleanGlobalNotice: () => ( { type: 'CLEAN_GLOBAL_NOTICE' } ),
 };
 
 const actions = {
 	setPurchasesIsFetching,
 	fetchPurchases,
 	setPurchases,
+	...noticeActions,
 	...productActions,
 };
 
@@ -128,10 +164,13 @@ export {
 	SET_PURCHASES_IS_FETCHING,
 	FETCH_PURCHASES,
 	SET_PURCHASES,
-	SET_PRODUCT_ACTION_ERROR,
+	SET_PRODUCT,
+	SET_PRODUCT_REQUEST_ERROR,
 	ACTIVATE_PRODUCT,
 	DEACTIVATE_PRODUCT,
-	SET_FETCHING_PRODUCT_STATUS,
+	SET_IS_FETCHING_PRODUCT,
 	SET_PRODUCT_STATUS,
+	SET_GLOBAL_NOTICE,
+	CLEAN_GLOBAL_NOTICE,
 	actions as default,
 };
diff --git a/projects/packages/my-jetpack/_inc/state/reducers.js b/projects/packages/my-jetpack/_inc/state/reducers.js
index 593ffb0fca3d8..0301619589276 100644
--- a/projects/packages/my-jetpack/_inc/state/reducers.js
+++ b/projects/packages/my-jetpack/_inc/state/reducers.js
@@ -9,13 +9,31 @@ import { combineReducers } from '@wordpress/data';
 import {
 	SET_PURCHASES,
 	SET_PURCHASES_IS_FETCHING,
-	SET_PRODUCT_ACTION_ERROR,
+	SET_PRODUCT,
 	SET_PRODUCT_STATUS,
-	SET_FETCHING_PRODUCT_STATUS,
+	SET_IS_FETCHING_PRODUCT,
+	SET_PRODUCT_REQUEST_ERROR,
+	SET_GLOBAL_NOTICE,
+	CLEAN_GLOBAL_NOTICE,
 } from './actions';
 
 const products = ( state = {}, action ) => {
 	switch ( action.type ) {
+		case SET_IS_FETCHING_PRODUCT: {
+			const { productId, isFetching } = action;
+			return {
+				...state,
+				isFetching: {
+					...state.isFetching,
+					[ productId ]: isFetching,
+				},
+				errors: {
+					...state.errors,
+					[ productId ]: isFetching ? undefined : state.errors[ productId ],
+				},
+			};
+		}
+
 		case SET_PRODUCT_STATUS: {
 			const { productId, status } = action;
 			return {
@@ -24,31 +42,32 @@ const products = ( state = {}, action ) => {
 					...state.items,
 					[ productId ]: {
 						...state.items[ productId ],
-						...status,
+						status,
 					},
 				},
-				error: {},
 			};
 		}
 
-		case SET_PRODUCT_ACTION_ERROR:
+		case SET_PRODUCT: {
+			const { product } = action;
+			const { slug: productId } = product;
 			return {
 				...state,
-				error: action.error,
+				items: {
+					...state.items,
+					[ productId ]: product,
+				},
 			};
+		}
 
-		case SET_FETCHING_PRODUCT_STATUS: {
-			const { productId, isFetching } = action;
+		case SET_PRODUCT_REQUEST_ERROR: {
+			const { productId, error } = action;
 			return {
 				...state,
-				items: {
-					...state.items,
-					[ productId ]: {
-						...state.items[ productId ],
-						isFetching,
-					},
+				errors: {
+					...state.errors,
+					[ productId ]: error,
 				},
-				error: isFetching ? {} : state.error,
 			};
 		}
 
@@ -76,9 +95,35 @@ const purchases = ( state = {}, action ) => {
 	}
 };
 
+const notices = ( state = { global: {} }, action ) => {
+	switch ( action.type ) {
+		case SET_GLOBAL_NOTICE: {
+			const { message, options } = action;
+			return {
+				...state,
+				global: {
+					message,
+					options,
+				},
+			};
+		}
+
+		case CLEAN_GLOBAL_NOTICE: {
+			return {
+				...state,
+				global: {},
+			};
+		}
+
+		default:
+			return state;
+	}
+};
+
 const reducers = combineReducers( {
 	products,
 	purchases,
+	notices,
 } );
 
 export default reducers;
diff --git a/projects/packages/my-jetpack/_inc/state/resolvers.js b/projects/packages/my-jetpack/_inc/state/resolvers.js
index 22c828d9cbe29..e80b717012458 100644
--- a/projects/packages/my-jetpack/_inc/state/resolvers.js
+++ b/projects/packages/my-jetpack/_inc/state/resolvers.js
@@ -6,9 +6,26 @@ import apiFetch from '@wordpress/api-fetch';
 /**
  * Internal dependencies
  */
-import { REST_API_SITE_PURCHASES_ENDPOINT } from './constants';
+import { REST_API_SITE_PURCHASES_ENDPOINT, REST_API_SITE_PRODUCTS_ENDPOINT } from './constants';
 
 const myJetpackResolvers = {
+	getProduct: ( productId ) => async ( { dispatch } ) => {
+		try {
+			dispatch.setProduct(
+				await apiFetch( {
+					path: `${ REST_API_SITE_PRODUCTS_ENDPOINT }/${ productId }`,
+				} )
+			);
+		} catch ( error ) {
+			// Pick error from the response body.
+			if ( error?.code && error?.message ) {
+				dispatch.setRequestProductError( productId, error );
+			} else {
+				throw new Error( error );
+			}
+		}
+	},
+
 	getPurchases: () => async ( { dispatch } ) => {
 		dispatch.setPurchasesIsFetching( true );
 
diff --git a/projects/packages/my-jetpack/_inc/state/selectors.js b/projects/packages/my-jetpack/_inc/state/selectors.js
index 8caa5597946d3..6d35a4d3364e9 100644
--- a/projects/packages/my-jetpack/_inc/state/selectors.js
+++ b/projects/packages/my-jetpack/_inc/state/selectors.js
@@ -9,6 +9,7 @@ const productSelectors = {
 	getProductNames,
 	getProduct,
 	isValidProduct,
+	isFetching: ( state, productId ) => state.products?.isFetching?.[ productId ] || false,
 };
 
 const purchasesSelectors = {
@@ -16,9 +17,14 @@ const purchasesSelectors = {
 	isRequestingPurchases: state => state.isRequestingPurchases || false,
 };
 
+const noticeSelectors = {
+	getGlobalNotice: state => state.notices?.global,
+};
+
 const selectors = {
 	...productSelectors,
 	...purchasesSelectors,
+	...noticeSelectors,
 };
 
 export default selectors;
diff --git a/projects/packages/my-jetpack/_inc/style.module.scss b/projects/packages/my-jetpack/_inc/style.module.scss
new file mode 100644
index 0000000000000..94bb3d8604c2e
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/style.module.scss
@@ -0,0 +1,14 @@
+.layout {
+	min-height: calc( 100vh - 100px ); // Thank you for creating with WordPress.Version 5.9
+	position: relative;
+	padding-bottom: 30px;
+}
+
+.footer {
+	position: absolute;
+    bottom: 0px;
+    width: 100%;
+	height: 30px;
+	line-height: 30px;
+    padding-right: 20px;
+}
\ No newline at end of file
diff --git a/projects/packages/my-jetpack/_inc/utils/get-manage-your-plan-url.js b/projects/packages/my-jetpack/_inc/utils/get-manage-your-plan-url.js
index ec5ab784ed8cd..bc1ea11af68be 100644
--- a/projects/packages/my-jetpack/_inc/utils/get-manage-your-plan-url.js
+++ b/projects/packages/my-jetpack/_inc/utils/get-manage-your-plan-url.js
@@ -17,6 +17,6 @@ import { MY_JETPACK_MY_PLANS_MANAGE_SOURCE } from '../constants';
  * @returns {string} the redirect URL
  */
 export default function () {
-	const { siteSuffix: site } = window?.myJetpackInitialState;
+	const site = window?.myJetpackInitialState?.siteSuffix;
 	return getRedirectUrl( MY_JETPACK_MY_PLANS_MANAGE_SOURCE, { site } );
 }
diff --git a/projects/packages/my-jetpack/_inc/utils/to-camel.js b/projects/packages/my-jetpack/_inc/utils/to-camel.js
new file mode 100644
index 0000000000000..986b8015a5149
--- /dev/null
+++ b/projects/packages/my-jetpack/_inc/utils/to-camel.js
@@ -0,0 +1,42 @@
+/**
+ * Convert snake case string to camel case string.
+ *
+ * @param {string} string - String to convert.
+ * @returns {string} 	  - Converted string.
+ */
+export function snakeToCamel( string ) {
+	return string.replace( /([-_][a-z])/gi, $1 => {
+		return $1.toUpperCase().replace( '_', '' );
+	} );
+}
+
+/**
+ * Check is the string has snake shape.
+ *
+ * @param {string} string - String to check.
+ * @returns {boolean}      - True if the string has snake shape.
+ */
+function isSnake( string ) {
+	return string.indexOf( '_' ) !== -1;
+}
+
+/**
+ * Map object keys to camel case, in case they have snake shape.
+ *
+ * @param {object}  object             - Object to be converted.
+ * @param {boolean} deleteOriginalProp - Whether to delete the original property. False by default.
+ * @returns {object}                   - Converted object.
+ */
+export function mapObjectKeysToCamel( object = {}, deleteOriginalProp = false ) {
+	for ( const key in object ) {
+		if ( object.hasOwnProperty( key ) && isSnake( key ) ) {
+			object[ snakeToCamel( key ) ] = object[ key ];
+
+			if ( deleteOriginalProp ) {
+				delete object[ key ];
+			}
+		}
+	}
+
+	return object;
+}
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-data-approach b/projects/packages/my-jetpack/changelog/add-anti-spam-my-jetpack
similarity index 57%
rename from projects/packages/my-jetpack/changelog/update-my-jetpack-data-approach
rename to projects/packages/my-jetpack/changelog/add-anti-spam-my-jetpack
index 9a5a3d6662d69..797fde0a6b358 100644
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-data-approach
+++ b/projects/packages/my-jetpack/changelog/add-anti-spam-my-jetpack
@@ -1,4 +1,4 @@
 Significance: patch
 Type: added
 
-Add first data approach
+anti spam product class
diff --git a/projects/packages/my-jetpack/changelog/add-event-interstitial-my-jetpack b/projects/packages/my-jetpack/changelog/add-event-interstitial-my-jetpack
new file mode 100644
index 0000000000000..059b466161234
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/add-event-interstitial-my-jetpack
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Fire Tracks event when showing the Interstitial page
diff --git a/projects/packages/my-jetpack/changelog/add-fancy-eslint-ignore b/projects/packages/my-jetpack/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/packages/my-jetpack/changelog/add-my-jetpack-product-card b/projects/packages/my-jetpack/changelog/add-my-jetpack-product-card
deleted file mode 100644
index e07b1f0b309a2..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-my-jetpack-product-card
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-My Jetpack: Add Product Card component
diff --git a/projects/packages/my-jetpack/changelog/add-my-jetpack-tracks-event-interstitial-click b/projects/packages/my-jetpack/changelog/add-my-jetpack-tracks-event-interstitial-click
new file mode 100644
index 0000000000000..a13aedaf7087b
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/add-my-jetpack-tracks-event-interstitial-click
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Fire Tracks event when clicking CTA button on product Interstitial page
diff --git a/projects/packages/my-jetpack/changelog/add-my_jetpack_has_plan b/projects/packages/my-jetpack/changelog/add-my_jetpack_has_plan
new file mode 100644
index 0000000000000..14a8adfb86373
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/add-my_jetpack_has_plan
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add has_required_plan to product info and implement method in Search
diff --git a/projects/js-packages/storybook/changelog/2022-01-04-19-50-37-326407 b/projects/packages/my-jetpack/changelog/add-my_jetpack_has_plan#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2022-01-04-19-50-37-326407
rename to projects/packages/my-jetpack/changelog/add-my_jetpack_has_plan#2
diff --git a/projects/packages/my-jetpack/changelog/add-products-section-my-jetpack b/projects/packages/my-jetpack/changelog/add-products-section-my-jetpack
deleted file mode 100644
index a286866458353..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-products-section-my-jetpack
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Adds very basic product cards section component to my jetpack
diff --git a/projects/packages/my-jetpack/changelog/add-record-event-for-on-add b/projects/packages/my-jetpack/changelog/add-record-event-for-on-add
new file mode 100644
index 0000000000000..e3a1920771229
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/add-record-event-for-on-add
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Fire Tracks event when clickn Add link on My Jetpack product card
diff --git a/projects/packages/my-jetpack/changelog/add-scan-and-backup-purchase-check b/projects/packages/my-jetpack/changelog/add-scan-and-backup-purchase-check
new file mode 100644
index 0000000000000..bbe1f452756a9
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/add-scan-and-backup-purchase-check
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Plan verification for Backup and Scan
diff --git a/projects/packages/my-jetpack/changelog/add-visitor-status b/projects/packages/my-jetpack/changelog/add-visitor-status
deleted file mode 100644
index 0b395e9ceee8c..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added Visitor class for status regarding the site visitor.
diff --git a/projects/packages/my-jetpack/changelog/fix-set-product-status-reducer-my-jetpack b/projects/packages/my-jetpack/changelog/fix-set-product-status-reducer-my-jetpack
new file mode 100644
index 0000000000000..85b9b40141658
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/fix-set-product-status-reducer-my-jetpack
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix My Jetpack's reducer for SET_PRODUCT_STATUS
diff --git a/projects/packages/my-jetpack/changelog/fix-svg-attr-my-jetpack-product-card b/projects/packages/my-jetpack/changelog/fix-svg-attr-my-jetpack-product-card
deleted file mode 100644
index f877ecaaf06f0..0000000000000
--- a/projects/packages/my-jetpack/changelog/fix-svg-attr-my-jetpack-product-card
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed svg attribute strokeWidth for Boost Card
diff --git a/projects/packages/my-jetpack/changelog/poc-my-jetpac-product-class b/projects/packages/my-jetpack/changelog/poc-my-jetpac-product-class
deleted file mode 100644
index 94d53f63b453c..0000000000000
--- a/projects/packages/my-jetpack/changelog/poc-my-jetpac-product-class
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-add API endpoints to manipulate products
diff --git a/projects/packages/my-jetpack/changelog/remove-plans-endpoints-my-jetpack b/projects/packages/my-jetpack/changelog/remove-plans-endpoints-my-jetpack
deleted file mode 100644
index 494f1463fb811..0000000000000
--- a/projects/packages/my-jetpack/changelog/remove-plans-endpoints-my-jetpack
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Removed endpoint plans superseded by purchases
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#2 b/projects/packages/my-jetpack/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo#2
rename to projects/packages/my-jetpack/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2022-01-11-19-07-56-905220 b/projects/packages/my-jetpack/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2022-01-11-19-07-56-905220
rename to projects/packages/my-jetpack/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/packages/my-jetpack/changelog/update-connection-enforce-initial-state b/projects/packages/my-jetpack/changelog/update-connection-enforce-initial-state
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-connection-enforce-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/my-jetpack/changelog/update-css-module-plans-section b/projects/packages/my-jetpack/changelog/update-css-module-plans-section
deleted file mode 100644
index 85861596aba92..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-css-module-plans-section
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Added css module for My Jetpack Plans Section
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-pricing-harcoded-product-data b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-pricing-harcoded-product-data
new file mode 100644
index 0000000000000..d6a890c2d7b86
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-pricing-harcoded-product-data
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add Product princign harcoded data
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-boost-interstitial b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-boost-interstitial
new file mode 100644
index 0000000000000..946482fd9acb9
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-boost-interstitial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add Boost interstitial cmp.
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-interstitial-cmp b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-interstitial-cmp
new file mode 100644
index 0000000000000..4adad2e01ed71
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-product-interstitial-cmp
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Introduce ProductDetailCard component
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-products-endpoint b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-products-endpoint
deleted file mode 100644
index c0ec3dccade6f..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-products-endpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Add Products and REST_Products basic classes
diff --git a/projects/packages/connection-ui/changelog/update-enforce-connection-initial-state b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-search-product-data
similarity index 56%
rename from projects/packages/connection-ui/changelog/update-enforce-connection-initial-state
rename to projects/packages/my-jetpack/changelog/update-my-jetpack-add-search-product-data
index c9a80df46cbc6..98561ef639652 100644
--- a/projects/packages/connection-ui/changelog/update-enforce-connection-initial-state
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-search-product-data
@@ -1,4 +1,4 @@
 Significance: patch
 Type: added
 
-connection initial state
+Add search product data
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-add-title-and-features-to-products-data b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-title-and-features-to-products-data
new file mode 100644
index 0000000000000..15e7180c0d3e4
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-add-title-and-features-to-products-data
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add title and features to products data
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-clean-unused-hook b/projects/packages/my-jetpack/changelog/update-my-jetpack-clean-unused-hook
deleted file mode 100644
index 3978d3f9d8702..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-clean-unused-hook
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Remove unused usePlans() custom react hook
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-redirect b/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-redirect
new file mode 100644
index 0000000000000..26fdd23674bdf
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-redirect
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+My Jetpack: Update notice style and implements redirect for connection route
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-screen b/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-screen
new file mode 100644
index 0000000000000..324f508c87934
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-connection-screen
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+My Jetpack: Add Connection screen
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-connections-section b/projects/packages/my-jetpack/changelog/update-my-jetpack-connections-section
deleted file mode 100644
index b522b73954f77..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-connections-section
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Add Connections Section wrapping the Connection Status Card to My Jetpack
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-do-not-ship-raw-files b/projects/packages/my-jetpack/changelog/update-my-jetpack-do-not-ship-raw-files
deleted file mode 100644
index 8afa612f711b0..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-do-not-ship-raw-files
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Build: do not ship raw files in production bundle.
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-fix-tracking-events-handler b/projects/packages/my-jetpack/changelog/update-my-jetpack-fix-tracking-events-handler
new file mode 100644
index 0000000000000..63463e190d3e5
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-fix-tracking-events-handler
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+useCallback for functions that are bound to onEvents
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-handle-search-product-from-ui b/projects/packages/my-jetpack/changelog/update-my-jetpack-handle-search-product-from-ui
new file mode 100644
index 0000000000000..801eded873ab6
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-handle-search-product-from-ui
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Implement Search product interstitial
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-open-boost-interstitial b/projects/packages/my-jetpack/changelog/update-my-jetpack-open-boost-interstitial
new file mode 100644
index 0000000000000..c1cea97a4d763
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-open-boost-interstitial
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Connect Boost card with the interstitial page via /add-boost root
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-re-organize-layout b/projects/packages/my-jetpack/changelog/update-my-jetpack-re-organize-layout
new file mode 100644
index 0000000000000..92983c3c0bae1
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-re-organize-layout
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Introduce basic Layout component. Add GoBackLink component
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-reduxify-products b/projects/packages/my-jetpack/changelog/update-my-jetpack-reduxify-products
deleted file mode 100644
index 1cc4b8bd62b93..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-my-jetpack-reduxify-products
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-My Jetpack: Implement data handling for enable/disable products
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-restore-get-product-resolver b/projects/packages/my-jetpack/changelog/update-my-jetpack-restore-get-product-resolver
new file mode 100644
index 0000000000000..36331f47cce81
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-restore-get-product-resolver
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Restore getProduct() resolver
diff --git a/projects/packages/my-jetpack/changelog/update-my-jetpack-use-pricing-data b/projects/packages/my-jetpack/changelog/update-my-jetpack-use-pricing-data
new file mode 100644
index 0000000000000..e129473a2969c
--- /dev/null
+++ b/projects/packages/my-jetpack/changelog/update-my-jetpack-use-pricing-data
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Implement Free price for Boost product
diff --git a/projects/packages/my-jetpack/changelog/update-project-scripts-no-install b/projects/packages/my-jetpack/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/my-jetpack/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
index 3a485c4120fdf..3e7a28f67789f 100644
--- a/projects/packages/my-jetpack/composer.json
+++ b/projects/packages/my-jetpack/composer.json
@@ -5,14 +5,17 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-admin-ui": "^0.2",
-		"automattic/jetpack-assets": "^1.16",
+		"automattic/jetpack-assets": "^1.17",
 		"automattic/jetpack-connection": "^1.36",
+		"automattic/jetpack-plugins-installer": "^0.1",
 		"automattic/jetpack-terms-of-service": "^1.9",
 		"automattic/jetpack-tracking": "^1.14"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.0.3",
 		"automattic/jetpack-changelogger": "^3.0",
+		"automattic/jetpack-options": "^1.14",
+		"automattic/jetpack-search": "^0.7",
 		"automattic/wordbless": "@dev"
 	},
 	"autoload": {
@@ -70,7 +73,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
 		},
 		"branch-alias": {
-			"dev-master": "0.4.x-dev"
+			"dev-master": "0.5.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/my-jetpack/jest.setup.js b/projects/packages/my-jetpack/jest.setup.js
index 01caebccf3e3c..06b97b04e86b9 100644
--- a/projects/packages/my-jetpack/jest.setup.js
+++ b/projects/packages/my-jetpack/jest.setup.js
@@ -2,3 +2,12 @@
  * External dependencies
  */
 import '@testing-library/jest-dom';
+window.JP_CONNECTION_INITIAL_STATE = {
+	userConnectionData: {
+		currentUser: {
+			wpcomUser: { Id: 99999, login: 'bobsacramento', display_name: 'Bob Sacrmaneto' },
+		},
+	},
+};
+window.myJetpackInitialState = {};
+window.myJetpackRest = {};
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index b57cf8f5d5eed..d1b0019c61347 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "0.4.0-alpha",
+	"version": "0.5.1-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://jetpack.com",
 	"bugs": {
@@ -21,22 +21,26 @@
 		"test": "js-test-runner jest --passWithNoTests --setupFilesAfterEnv ./jest.setup.js"
 	},
 	"dependencies": {
-		"@automattic/jetpack-analytics": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@automattic/jetpack-connection": "workspace:^0.14.0-alpha",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/i18n": "4.2.4",
+		"@automattic/format-currency": "1.0.0-alpha.0",
+		"@automattic/jetpack-analytics": "workspace:^0.1.7",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.15.1-alpha",
+		"@wordpress/api-fetch": "6.0.0",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/i18n": "4.3.0",
+		"@wordpress/icons": "6.2.0",
 		"classnames": "2.3.1",
-		"prop-types": "15.8.1"
+		"prop-types": "15.8.1",
+		"react-router-dom": "6"
 	},
 	"sideEffects": [
 		"*.css",
 		"*.scss"
 	],
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-env": "7.16.4",
 		"@babel/register": "7.16.0",
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
index 0365057c71175..af0c83b6084f8 100644
--- a/projects/packages/my-jetpack/src/class-initializer.php
+++ b/projects/packages/my-jetpack/src/class-initializer.php
@@ -28,12 +28,7 @@ class Initializer {
 	 * @return void
 	 */
 	public static function init() {
-		if ( did_action( 'my_jetpack_init' ) ) {
-			return;
-		}
-
-		// Feature flag while we are developing it.
-		if ( ! defined( 'JETPACK_ENABLE_MY_JETPACK' ) || ! JETPACK_ENABLE_MY_JETPACK ) {
+		if ( ! self::should_initialize() ) {
 			return;
 		}
 
@@ -102,8 +97,6 @@ public static function enqueue_scripts() {
 			'my_jetpack_main_app',
 			'myJetpackInitialState',
 			array(
-				'apiRoot'               => esc_url_raw( rest_url() ),
-				'apiNonce'              => wp_create_nonce( 'wp_rest' ),
 				'products'              => array(
 					'items' => Products::get_products(),
 				),
@@ -116,6 +109,15 @@ public static function enqueue_scripts() {
 			)
 		);
 
+		wp_localize_script(
+			'my_jetpack_main_app',
+			'myJetpackRest',
+			array(
+				'apiRoot'  => esc_url_raw( rest_url() ),
+				'apiNonce' => wp_create_nonce( 'wp_rest' ),
+			)
+		);
+
 		// Connection Initial State.
 		wp_add_inline_script( 'my_jetpack_main_app', Connection_Initial_State::render(), 'before' );
 
@@ -166,6 +168,36 @@ public static function permissions_callback() {
 		return current_user_can( 'manage_options' );
 	}
 
+	/**
+	 * Return true if we should initialize the My Jetpack
+	 */
+	public static function should_initialize() {
+		if ( did_action( 'my_jetpack_init' ) ) {
+			return false;
+		}
+
+		/**
+		 * Allows filtering whether My Jetpack should be initialized
+		 *
+		 * @since 0.5.0-alpha
+		 *
+		 * @param bool $shoud_initialize Should we initialize My Jetpack?
+		 */
+		$should = apply_filters( 'jetpack_my_jetpack_should_initialize', true );
+
+		// Feature flag while we are developing it.
+		if ( ! defined( 'JETPACK_ENABLE_MY_JETPACK' ) || ! JETPACK_ENABLE_MY_JETPACK ) {
+			return false;
+		}
+
+		// Do not initialize My Jetpack if site is not connected.
+		if ( ! ( new Connection_Manager() )->is_connected() ) {
+			return false;
+		}
+
+		return $should;
+	}
+
 	/**
 	 * Site full-data endpoint.
 	 *
diff --git a/projects/packages/my-jetpack/src/class-products.php b/projects/packages/my-jetpack/src/class-products.php
index 2dfae5cfc0e42..36e8c75f74d0e 100644
--- a/projects/packages/my-jetpack/src/class-products.php
+++ b/projects/packages/my-jetpack/src/class-products.php
@@ -108,39 +108,7 @@ public static function get_product_data_schema() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_anti_spam_data() {
-		return array(
-			'slug'        => 'anti-spam',
-			'description' => __( 'Stop comment and form spam', 'jetpack-my-jetpack' ),
-			'name'        => __( 'Anti-spam', 'jetpack-my-jetpack' ),
-			'status'      => 'inactive',
-		);
-	}
-
-	/**
-	 * Activate Backup product
-	 */
-	public static function activate_backup_product() {
-		/*
-		 * @todo: implement
-		 * suggestion: when it enables, return an success array:
-		 * array( 'status' => 'activated' );
-		 * Otherwise, an WP_Error instance will be nice.
-		 */
-		return array(
-			'status' => 'active',
-		);
-	}
-
-	/**
-	 * Deactivate Backup product
-	 */
-	public static function deactivate_backup_product() {
-		/*
-		 * @todo: implement
-		 */
-		return array(
-			'status' => 'inactive',
-		);
+		return Products\Anti_Spam::get_info();
 	}
 
 	/**
@@ -149,12 +117,7 @@ public static function deactivate_backup_product() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_backup_data() {
-		return array(
-			'slug'        => 'backup',
-			'description' => __( 'Save every change', 'jetpack-my-jetpack' ),
-			'name'        => __( 'Backup', 'jetpack-my-jetpack' ),
-			'status'      => 'active',
-		);
+		return Products\Backup::get_info();
 	}
 
 	/**
@@ -172,12 +135,7 @@ public static function get_boost_data() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_crm_data() {
-		return array(
-			'slug'        => 'crm',
-			'description' => __( 'Connect with your people', 'jetpack-my-jetpack' ),
-			'name'        => __( 'CRM', 'jetpack-my-jetpack' ),
-			'status'      => 'plugin_absent',
-		);
+		return Products\Crm::get_info();
 	}
 
 	/**
@@ -200,12 +158,7 @@ public static function get_extras_data() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_scan_data() {
-		return array(
-			'slug'        => 'scan',
-			'description' => __( 'Stay one step ahead of threats', 'jetpack-my-jetpack' ),
-			'name'        => __( 'Scan', 'jetpack-my-jetpack' ),
-			'status'      => 'plugin_absent',
-		);
+		return Products\Scan::get_info();
 	}
 
 	/**
@@ -214,12 +167,7 @@ public static function get_scan_data() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_search_data() {
-		return array(
-			'slug'        => 'search',
-			'description' => __( 'Help them find what they need', 'jetpack-my-jetpack' ),
-			'name'        => __( 'Search', 'jetpack-my-jetpack' ),
-			'status'      => 'plugin_absent',
-		);
+		return Products\Search::get_info();
 	}
 
 	/**
@@ -228,11 +176,6 @@ public static function get_search_data() {
 	 * @return array Object with infromation about the product.
 	 */
 	public static function get_videopress_data() {
-		return array(
-			'slug'        => 'videopress',
-			'description' => __( 'High quality, ad-free video', 'jetpack-my-jetpack' ),
-			'name'        => __( 'VideoPress', 'jetpack-my-jetpack' ),
-			'status'      => 'active',
-		);
+		return Products\Videopress::get_info();
 	}
 }
diff --git a/projects/packages/my-jetpack/src/class-rest-products.php b/projects/packages/my-jetpack/src/class-rest-products.php
index 3f638f993bc09..debd291ffa096 100644
--- a/projects/packages/my-jetpack/src/class-rest-products.php
+++ b/projects/packages/my-jetpack/src/class-rest-products.php
@@ -32,7 +32,7 @@ public function __construct() {
 			'description'       => __( 'Product slug', 'jetpack-my-jetpack' ),
 			'type'              => 'string',
 			'enum'              => Products::get_product_names(),
-			'required'          => false,
+			'required'          => true,
 			'validate_callback' => __CLASS__ . '::check_product_argument',
 		);
 
@@ -68,6 +68,20 @@ public function __construct() {
 		);
 	}
 
+	/**
+	 * Get the schema for the products endpoint
+	 *
+	 * @return array
+	 */
+	public function get_products_schema() {
+		return array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'products',
+			'type'       => 'object',
+			'properties' => Products::get_product_data_schema(),
+		);
+	}
+
 	/**
 	 * Check user capability to access the endpoint.
 	 *
@@ -107,9 +121,7 @@ public static function check_product_argument( $value ) {
 	 * @return array of site products list.
 	 */
 	public static function get_products() {
-		$response = array(
-			'products' => Products::get_products(),
-		);
+		$response = Products::get_products();
 		return rest_ensure_response( $response, 200 );
 	}
 
@@ -121,10 +133,7 @@ public static function get_products() {
 	 */
 	public static function get_product( $request ) {
 		$product_slug = $request->get_param( 'product' );
-		$response     = array(
-			'products' => array( Products::get_product( $product_slug ) ),
-		);
-		return rest_ensure_response( $response, 200 );
+		return rest_ensure_response( Products::get_product( $product_slug ), 200 );
 	}
 
 	/**
@@ -152,30 +161,20 @@ public static function activate_product( $request ) {
 		$product_slug = $request->get_param( 'product' );
 		$product      = Products::get_product( $product_slug );
 		if ( ! isset( $product['class'] ) ) {
-			return new \WP_REST_Response(
-				array(
-					'error_message' => 'not_implemented',
-				),
-				400
+			return new \WP_Error(
+				'not_implemented',
+				esc_html__( 'The product class handler is not implemented', 'jetpack-my-jetpack' ),
+				array( 'status' => 501 )
 			);
 		}
 
-		$success       = call_user_func( array( $product['class'], 'activate' ) );
-		$error_code    = '';
-		$error_message = '';
-		if ( is_wp_error( $success ) ) {
-			$error_code    = $success->get_error_code();
-			$error_message = $success->get_error_message();
-			$success       = false;
+		$activate_product_result = call_user_func( array( $product['class'], 'activate' ) );
+		if ( is_wp_error( $activate_product_result ) ) {
+			$activate_product_result->add_data( array( 'status' => 400 ) );
+			return $activate_product_result;
 		}
-		$response = array(
-			'success'       => $success,
-			'products'      => array( Products::get_product( $product_slug ) ),
-			'error_code'    => $error_code,
-			'error_message' => $error_message,
-		);
-		return rest_ensure_response( $response, 200 );
 
+		return rest_ensure_response( Products::get_product( $product_slug ), 200 );
 	}
 
 	/**
@@ -188,37 +187,20 @@ public static function deactivate_product( $request ) {
 		$product_slug = $request->get_param( 'product' );
 		$product      = Products::get_product( $product_slug );
 		if ( ! isset( $product['class'] ) ) {
-			return new \WP_REST_Response(
-				array(
-					'error_message' => 'not_implemented',
-				),
-				400
+			return new \WP_Error(
+				'not_implemented',
+				esc_html__( 'The product class handler is not implemented', 'jetpack-my-jetpack' ),
+				array( 'status' => 501 )
 			);
 		}
 
-		$success  = call_user_func( array( $product['class'], 'deactivate' ) );
-		$response = array(
-			'success'  => $success,
-			'products' => array( Products::get_product( $product_slug ) ),
-		);
-		return rest_ensure_response( $response, 200 );
-
-	}
-
-	/**
-	 * Set site product state.
-	 *
-	 * @param \WP_REST_Request $request The request object.
-	 * @return array of site products list.
-	 */
-	public static function set_product_state( $request ) {
-		$product_slug = $request->get_param( 'product' );
-		$activate     = $request->get_param( 'activate' );
-
-		if ( $activate ) {
-			return Products::activate_backup_product( $product_slug );
+		$deactivate_product_result = call_user_func( array( $product['class'], 'deactivate' ) );
+		if ( is_wp_error( $deactivate_product_result ) ) {
+			$deactivate_product_result->add_data( array( 'status' => 400 ) );
+			return $deactivate_product_result;
 		}
 
-		return Products::deactivate_backup_product( $product_slug );
+		return rest_ensure_response( Products::get_product( $product_slug ), 200 );
 	}
+
 }
diff --git a/projects/packages/my-jetpack/src/class-rest-purchases.php b/projects/packages/my-jetpack/src/class-rest-purchases.php
index 3439c4f8da78d..e01089e45238e 100644
--- a/projects/packages/my-jetpack/src/class-rest-purchases.php
+++ b/projects/packages/my-jetpack/src/class-rest-purchases.php
@@ -8,6 +8,7 @@
 namespace Automattic\Jetpack\My_Jetpack;
 
 use Automattic\Jetpack\Connection\Client as Client;
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 
 /**
  * Registers the REST routes for Purchases.
@@ -37,6 +38,19 @@ public function __construct() {
 	 * @return true|WP_Error
 	 */
 	public static function permissions_callback() {
+		$connection        = new Connection_Manager();
+		$is_user_connected = $connection->is_connected();
+
+		if ( ! $is_user_connected ) {
+			return new \WP_Error(
+				'not_connected',
+				__( 'You are not connected to Jetpack.', 'jetpack-my-jetpack' ),
+				array(
+					'status' => 400,
+				)
+			);
+		}
+
 		return current_user_can( 'manage_options' );
 	}
 
diff --git a/projects/packages/my-jetpack/src/products/class-anti-spam.php b/projects/packages/my-jetpack/src/products/class-anti-spam.php
new file mode 100644
index 0000000000000..e30d2b395b065
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-anti-spam.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Anti_Spam product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\My_Jetpack\Product;
+
+/**
+ * Class responsible for handling the Anti_Spam product
+ */
+class Anti_Spam extends Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'anti-spam';
+
+	/**
+	 * The filename (id) of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_filename = 'akismet/akismet.php';
+
+	/**
+	 * The slug of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_slug = 'akismet';
+
+	/**
+	 * Whether this product requires a user connection
+	 *
+	 * @var string
+	 */
+	public static $requires_user_connection = false;
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'Anti-Spam', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return ''; // @todo title
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Stop comment and form spam', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return ''; // @todo Add long description
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Boost features list
+	 */
+	public static function get_features() {
+		return array();
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available'            => true,
+			'currency_code'        => 'EUR',
+			'full_price'           => '9',
+			'promotion_percentage' => '50',
+		);
+	}
+}
diff --git a/projects/packages/my-jetpack/src/products/class-backup.php b/projects/packages/my-jetpack/src/products/class-backup.php
new file mode 100644
index 0000000000000..605e3addc3151
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-backup.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Boost product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\My_Jetpack\Hybrid_Product;
+use Jetpack_Options;
+use WP_Error;
+
+/**
+ * Class responsible for handling the CRM product
+ */
+class Backup extends Hybrid_Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'backup';
+
+	/**
+	 * The filename (id) of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_filename = 'jetpack-backup/jetpack-backup.php';
+
+	/**
+	 * The slug of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_slug = 'jetpack-backup';
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'Backup', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return __( 'Jetpack Backup', 'jetpack-my-jetpack' );
+
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Save every change', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return __( 'Real-time backups save every change and one-click restores get you back online quickly.', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Backup features list
+	 */
+	public static function get_features() {
+		return array(
+			_x( 'Real-time cloud backups', 'Backup Product Feature', 'jetpack-my-jetpack' ),
+			_x( '10GB of backup storage', 'Backup Product Feature', 'jetpack-my-jetpack' ),
+			_x( '30-day archive & activity log', 'Backup Product Feature', 'jetpack-my-jetpack' ),
+			_x( 'One-click restores', 'Backup Product Feature', 'jetpack-my-jetpack' ),
+		);
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available'            => true,
+			'currency_code'        => 'EUR',
+			'full_price'           => '9',
+			'promotion_percentage' => '50',
+		);
+	}
+
+	/**
+	 * Hits the wpcom api to check rewind status.
+	 *
+	 * @todo Maybe add caching.
+	 *
+	 * @return Object|WP_Error
+	 */
+	private static function get_state_from_wpcom() {
+		static $status = null;
+
+		if ( ! is_null( $status ) ) {
+			return $status;
+		}
+
+		$site_id = Jetpack_Options::get_option( 'id' );
+
+		$response = Client::wpcom_json_api_request_as_blog( sprintf( '/sites/%d/rewind', $site_id ) . '?force=wpcom', '2', array(), null, 'wpcom' );
+
+		if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+			return new WP_Error( 'rewind_state_fetch_failed' );
+		}
+
+		$body   = wp_remote_retrieve_body( $response );
+		$status = json_decode( $body );
+		return $status;
+	}
+
+	/**
+	 * Checks whether the current plan (or purchases) of the site already supports the product
+	 *
+	 * @return boolean
+	 */
+	public static function has_required_plan() {
+		$rewind_data = static::get_state_from_wpcom();
+		if ( is_wp_error( $rewind_data ) ) {
+			return false;
+		}
+		return is_object( $rewind_data ) && isset( $rewind_data->state ) && 'unavailable' !== $rewind_data->state;
+	}
+
+}
diff --git a/projects/packages/my-jetpack/src/products/class-boost.php b/projects/packages/my-jetpack/src/products/class-boost.php
index 5ce5a93f32c0a..633591392fac3 100644
--- a/projects/packages/my-jetpack/src/products/class-boost.php
+++ b/projects/packages/my-jetpack/src/products/class-boost.php
@@ -7,84 +7,99 @@
 
 namespace Automattic\Jetpack\My_Jetpack\Products;
 
+use Automattic\Jetpack\My_Jetpack\Product;
+
 /**
  * Class responsible for handling the Boost product
  */
-class Boost {
+class Boost extends Product {
 
-	const PLUGIN_FILENAME = 'boost/jetpack-boost.php';
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'boost';
 
 	/**
-	 * Get the Product info for the API
+	 * The filename (id) of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
 	 *
-	 * @return array
+	 * @var string
 	 */
-	public static function get_info() {
-		if ( self::is_active() ) {
-			$status = 'active';
-		} elseif ( ! self::is_plugin_installed() ) {
-			$status = 'plugin_absent';
-		} else {
-			$status = 'inactive';
-		}
-		return array(
-			'slug'        => 'boost',
-			'description' => __( 'Instant speed and SEO', 'jetpack-my-jetpack' ),
-			'name'        => __( 'Boost', 'jetpack-my-jetpack' ),
-			'status'      => $status,
-			'class'       => __CLASS__,
-		);
+	public static $plugin_filename = 'boost/jetpack-boost.php';
+
+	/**
+	 * The slug of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_slug = 'jetpack-boost';
+
+	/**
+	 * Whether this product requires a user connection
+	 *
+	 * @var string
+	 */
+	public static $requires_user_connection = false;
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'Boost', 'jetpack-my-jetpack' );
 	}
 
 	/**
-	 * Checks whether the Product is active
+	 * Get the internationalized product title
 	 *
-	 * @return boolean
+	 * @return string
 	 */
-	public static function is_active() {
-		return self::is_plugin_active();
+	public static function get_title() {
+		return __( 'Jetpack Boost', 'jetpack-my-jetpack' );
 	}
 
 	/**
-	 * Checks whether the plugin is installed
+	 * Get the internationalized product description
 	 *
-	 * @return boolean
+	 * @return string
 	 */
-	public static function is_plugin_installed() {
-		$all_plugins = get_plugins();
-		return array_key_exists( self::PLUGIN_FILENAME, $all_plugins );
+	public static function get_description() {
+		return __( 'Instant speed and SEO', 'jetpack-my-jetpack' );
 	}
 
 	/**
-	 * Checks whether the plugin is active
+	 * Get the internationalized product long description
 	 *
-	 * @return boolean
+	 * @return string
 	 */
-	public static function is_plugin_active() {
-		return is_plugin_active( self::PLUGIN_FILENAME );
+	public static function get_long_description() {
+		return __( 'Jetpack Boost gives your site the same performance advantages as the world’s leading websites, no developer required.', 'jetpack-my-jetpack' );
 	}
 
 	/**
-	 * Activates the plugin (in the future also intall the plugin if needed)
+	 * Get the internationalized features list
 	 *
-	 * @return boolean|\WP_Error
+	 * @return array Boost features list
 	 */
-	public static function activate() {
-		// TODO - extract lib/plugins.php from Jetpack in order to install. For now this will only activate the already installed plugin.
-		$result = activate_plugin( self::PLUGIN_FILENAME );
-		if ( is_wp_error( $result ) ) {
-			return $result;
-		}
-		return is_null( $result );
+	public static function get_features() {
+		return array(
+			__( 'Check your site performance', 'jetpack-my-jetpack' ),
+			__( 'Enable improvements in one click', 'jetpack-my-jetpack' ),
+			__( 'Standalone free plugin for those focused on speed', 'jetpack-my-jetpack' ),
+		);
 	}
 
 	/**
-	 * Deactivate the plugin
+	 * Get the product princing details
 	 *
-	 * @return boolean
+	 * @return array Pricing details
 	 */
-	public static function deactivate() {
-		deactivate_plugins( self::PLUGIN_FILENAME );
-		return true;
+	public static function get_pricing_for_ui() {
+		return array(
+			'available' => true,
+			'is_free'   => true,
+		);
 	}
 }
diff --git a/projects/packages/my-jetpack/src/products/class-crm.php b/projects/packages/my-jetpack/src/products/class-crm.php
new file mode 100644
index 0000000000000..4535ebfd59804
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-crm.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Boost product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\My_Jetpack\Product;
+
+/**
+ * Class responsible for handling the CRM product
+ */
+class Crm extends Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'crm';
+
+	/**
+	 * The filename (id) of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_filename = 'zero-bs-crm/ZeroBSCRM.php';
+
+	/**
+	 * The slug of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_slug = 'zero-bs-crm';
+
+	/**
+	 * Whether this product requires a user connection
+	 *
+	 * @var string
+	 */
+	public static $requires_user_connection = false;
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'CRM', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return ''; // @todo title
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Connect with your people', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return ''; // @todo Add long description
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array CRM features list
+	 */
+	public static function get_features() {
+		return array();
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available' => true,
+			'is_free'   => true,
+		);
+	}
+}
diff --git a/projects/packages/my-jetpack/src/products/class-hybrid-product.php b/projects/packages/my-jetpack/src/products/class-hybrid-product.php
new file mode 100644
index 0000000000000..2a1b55391cc88
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-hybrid-product.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Base product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+/**
+ * Class responsible for handling the hybrid products
+ *
+ * Hybrid products are those that may work both as a stand-alone plugin or with the Jetpack plugin.
+ *
+ * In case Jetpack plugin is active, it will not attempt to install its stand-alone plugin.
+ *
+ * But if Jetpack plugin is not active, then it will prompt to install and activate its stand-alone plugin.
+ */
+abstract class Hybrid_Product extends Product {
+
+	/**
+	 * Checks whether the Product is active
+	 *
+	 * @return boolean
+	 */
+	public static function is_active() {
+		return static::is_plugin_active() || static::is_jetpack_plugin_active();
+	}
+
+}
diff --git a/projects/packages/my-jetpack/src/products/class-module-product.php b/projects/packages/my-jetpack/src/products/class-module-product.php
new file mode 100644
index 0000000000000..131136262afd6
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-module-product.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Base Module product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+use Jetpack;
+use WP_Error;
+
+/**
+ * Class responsible for handling the Module products
+ *
+ * Module products are those that are a Jetpack module behind the scenes.
+ *
+ * They require Jetpack plugin and will then activate/deactivate a module.
+ */
+abstract class Module_Product extends Product {
+
+	/**
+	 * The Jetpack module name associated with this product
+	 *
+	 * @var string|null
+	 */
+	public static $module_name = null;
+
+	/**
+	 * Get the plugin slug - ovewrite it ans return Jetpack's
+	 *
+	 * @return ?string
+	 */
+	public static function get_plugin_slug() {
+		return self::JETPACK_PLUGIN_SLUG;
+	}
+
+	/**
+	 * Get the plugin filename - ovewrite it ans return Jetpack's
+	 *
+	 * @return ?string
+	 */
+	public static function get_plugin_filename() {
+		return self::JETPACK_PLUGIN_FILENAME;
+	}
+
+	/**
+	 * Ensure that child classes define $module_name attribute
+	 *
+	 * @throws \Exception If required attribute is not declared in the child class.
+	 * @return void
+	 */
+	private static function check_for_module_name() {
+		if ( empty( static::$module_name ) ) {
+			throw new \Exception( 'Module Product classes must declare the $module_name attribute.' );
+		}
+	}
+
+	/**
+	 * Checks whether the Product is active
+	 *
+	 * @return boolean
+	 */
+	public static function is_active() {
+		return static::is_jetpack_plugin_active() && static::is_module_active();
+	}
+
+	/**
+	 * Checks whether the Jetpack module is active
+	 *
+	 * @return bool
+	 */
+	public static function is_module_active() {
+		self::check_for_module_name();
+		if ( ! class_exists( 'Jetpack' ) ) {
+			return false;
+		}
+
+		return Jetpack::is_module_active( static::$module_name );
+	}
+
+	/**
+	 * Gets the current status of the product
+	 *
+	 * @return string
+	 */
+	public static function get_status() {
+		$status = parent::get_status();
+		if ( 'active' === $status && ! self::is_module_active() ) {
+			$status = 'module_disabled';
+		}
+		return $status;
+	}
+
+	/**
+	 * Activates the product by installing and activating its plugin
+	 *
+	 * @return boolean|\WP_Error
+	 */
+	public static function activate() {
+		self::check_for_module_name();
+
+		$plugin_activation = parent::activate();
+
+		if ( is_wp_error( $plugin_activation ) ) {
+			return $plugin_activation;
+		}
+
+		if ( ! class_exists( 'Jetpack' ) ) {
+			return new WP_Error( 'plugin_activation_failed', __( 'Error activating Jetpack plugin', 'jetpack-my-jetpack' ) );
+		}
+
+		$module_activation = Jetpack::activate_module( static::$module_name, false, false );
+
+		if ( ! $module_activation ) {
+			return new WP_Error( 'module_activation_failed', __( 'Error activating Jetpack module', 'jetpack-my-jetpack' ) );
+		}
+
+		return $module_activation;
+
+	}
+
+	/**
+	 * Deactivate the module
+	 *
+	 * @return boolean
+	 */
+	public static function deactivate() {
+		self::check_for_module_name();
+		if ( ! class_exists( 'Jetpack' ) ) {
+			return true;
+		}
+		return Jetpack::deactivate_module( static::$module_name );
+	}
+
+}
diff --git a/projects/packages/my-jetpack/src/products/class-product.php b/projects/packages/my-jetpack/src/products/class-product.php
new file mode 100644
index 0000000000000..2df766e91767f
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-product.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Base product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+use Automattic\Jetpack\Plugins_Installer;
+use WP_Error;
+
+/**
+ * Class responsible for handling the products
+ */
+abstract class Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = null;
+
+	/**
+	 * The filename (id) of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_filename = null;
+
+	/**
+	 * The slug of the plugin associated with this product. If not defined, it will default to the Jetpack plugin
+	 *
+	 * @var string
+	 */
+	public static $plugin_slug = null;
+
+	/**
+	 * The Jetpack plugin slug
+	 *
+	 * @var string
+	 */
+	const JETPACK_PLUGIN_SLUG = 'jetpack';
+
+	/**
+	 * The Jetpack plugin filename
+	 *
+	 * @var string
+	 */
+	const JETPACK_PLUGIN_FILENAME = 'jetpack/jetpack.php';
+
+	/**
+	 * Whether this product requires a user connection
+	 *
+	 * @var string
+	 */
+	public static $requires_user_connection = true;
+
+	/**
+	 * Get the plugin slug
+	 *
+	 * @return ?string
+	 */
+	public static function get_plugin_slug() {
+		return static::$plugin_slug;
+	}
+
+	/**
+	 * Get the plugin filename
+	 *
+	 * @return ?string
+	 */
+	public static function get_plugin_filename() {
+		return static::$plugin_filename;
+	}
+
+	/**
+	 * Get the Product info for the API
+	 *
+	 * @throws \Exception If required attribute is not declared in the child class.
+	 * @return array
+	 */
+	public static function get_info() {
+		if ( is_null( static::$slug ) ) {
+			throw new \Exception( 'Product classes must declare the $slug attribute.' );
+		}
+		return array(
+			'slug'                     => static::$slug,
+			'name'                     => static::get_name(),
+			'title'                    => static::get_title(),
+			'description'              => static::get_description(),
+			'long_description'         => static::get_long_description(),
+			'features'                 => static::get_features(),
+			'status'                   => static::get_status(),
+			'pricing_for_ui'           => static::get_pricing_for_ui(),
+			'requires_user_connection' => static::$requires_user_connection,
+			'has_required_plan'        => static::has_required_plan(),
+			'class'                    => get_called_class(),
+		);
+	}
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	abstract public static function get_name();
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	abstract public static function get_title();
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	abstract public static function get_description();
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	abstract public static function get_long_description();
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array
+	 */
+	abstract public static function get_features();
+
+	/**
+	 * Get the product pricing
+	 *
+	 * @return array
+	 */
+	abstract public static function get_pricing_for_ui();
+
+	/**
+	 * Checks whether the current plan (or purchases) of the site already supports the product
+	 *
+	 * Returns true if it supports. Return false if a purchase is still required.
+	 *
+	 * Free products will always return true.
+	 *
+	 * @return boolean
+	 */
+	public static function has_required_plan() {
+		return true;
+	}
+
+	/**
+	 * Undocumented function
+	 *
+	 * @return string
+	 */
+	public static function get_status() {
+		if ( ! static::has_required_plan() ) {
+			$status = 'needs_purchase';
+		} elseif ( static::is_active() ) {
+			$status = 'active';
+		} elseif ( ! self::is_plugin_installed() ) {
+			$status = 'plugin_absent';
+		} else {
+			$status = 'inactive';
+		}
+		return $status;
+	}
+
+	/**
+	 * Checks whether the Product is active
+	 *
+	 * @return boolean
+	 */
+	public static function is_active() {
+		return static::is_plugin_active();
+	}
+
+	/**
+	 * Checks whether the plugin is installed
+	 *
+	 * @return boolean
+	 */
+	public static function is_plugin_installed() {
+		$all_plugins = Plugins_Installer::get_plugins();
+		return array_key_exists( static::get_plugin_filename(), $all_plugins );
+	}
+
+	/**
+	 * Checks whether the plugin is active
+	 *
+	 * @return boolean
+	 */
+	public static function is_plugin_active() {
+		return Plugins_Installer::is_plugin_active( static::get_plugin_filename() );
+	}
+
+	/**
+	 * Checks whether the Jetpack plugin is installed
+	 *
+	 * @return boolean
+	 */
+	public static function is_jetpack_plugin_installed() {
+		$all_plugins = Plugins_Installer::get_plugins();
+		return array_key_exists( self::JETPACK_PLUGIN_FILENAME, $all_plugins );
+	}
+
+	/**
+	 * Checks whether the Jetpack plugin is active
+	 *
+	 * @return boolean
+	 */
+	public static function is_jetpack_plugin_active() {
+		return Plugins_Installer::is_plugin_active( self::JETPACK_PLUGIN_FILENAME );
+	}
+
+	/**
+	 * Activates the product by installing and activating its plugin
+	 *
+	 * @return boolean|WP_Error
+	 */
+	public static function activate() {
+		if ( static::is_active() ) {
+			return true;
+		}
+
+		if ( ! static::is_plugin_installed() ) {
+			$installed = Plugins_Installer::install_plugin( static::get_plugin_slug() );
+			if ( is_wp_error( $installed ) ) {
+				return $installed;
+			}
+		}
+
+		if ( ! current_user_can( 'activate_plugins' ) ) {
+			return new WP_Error( 'not_allowed', __( 'You are not allowed to activate plugins on this site.', 'jetpack-my-jetpack' ) );
+		}
+
+		$result = activate_plugin( static::get_plugin_filename() );
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+		return is_null( $result );
+	}
+
+	/**
+	 * Deactivate the product
+	 *
+	 * @return boolean
+	 */
+	public static function deactivate() {
+		deactivate_plugins( static::get_plugin_filename() );
+		return true;
+	}
+}
diff --git a/projects/packages/my-jetpack/src/products/class-scan.php b/projects/packages/my-jetpack/src/products/class-scan.php
new file mode 100644
index 0000000000000..cc90e315fe992
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-scan.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Scan product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\My_Jetpack\Module_Product;
+use Jetpack_Options;
+use WP_Error;
+
+/**
+ * Class responsible for handling the Scan product
+ */
+class Scan extends Module_Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'scan';
+
+	/**
+	 * The Jetpack module name
+	 *
+	 * @var string
+	 */
+	public static $module_name = 'scan';
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'Scan', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return ''; // @todo title
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Stay one step ahead of threats', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return ''; // @todo Add long description
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Boost features list
+	 */
+	public static function get_features() {
+		return array();
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available' => true,
+			'is_free'   => true,
+		);
+	}
+
+	/**
+	 * Hits the wpcom api to check scan status.
+	 *
+	 * @todo Maybe add caching.
+	 *
+	 * @return Object|WP_Error
+	 */
+	private static function get_state_from_wpcom() {
+		static $status = null;
+
+		if ( ! is_null( $status ) ) {
+			return $status;
+		}
+
+		$site_id = Jetpack_Options::get_option( 'id' );
+
+		$response = Client::wpcom_json_api_request_as_blog( sprintf( '/sites/%d/scan', $site_id ) . '?force=wpcom', '2', array(), null, 'wpcom' );
+
+		if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+			return new WP_Error( 'scan_state_fetch_failed' );
+		}
+
+		$body   = wp_remote_retrieve_body( $response );
+		$status = json_decode( $body );
+		return $status;
+	}
+
+	/**
+	 * Checks whether the current plan (or purchases) of the site already supports the product
+	 *
+	 * @return boolean
+	 */
+	public static function has_required_plan() {
+		$scan_data = static::get_state_from_wpcom();
+		if ( is_wp_error( $scan_data ) ) {
+			return false;
+		}
+		return is_object( $scan_data ) && isset( $scan_data->state ) && 'unavailable' !== $scan_data->state;
+	}
+
+}
diff --git a/projects/packages/my-jetpack/src/products/class-search.php b/projects/packages/my-jetpack/src/products/class-search.php
new file mode 100644
index 0000000000000..008290b2bf882
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-search.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Search product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\My_Jetpack\Module_Product;
+use Automattic\Jetpack\Search\Plan as Search_Plan;
+
+/**
+ * Class responsible for handling the Search product
+ */
+class Search extends Module_Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'search';
+
+	/**
+	 * The Jetpack module name
+	 *
+	 * @var string
+	 */
+	public static $module_name = 'search';
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'Search', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return __( 'Jetpack Site Search', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Help them find what they need', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return __( 'Help your site visitors find answers instantly so they keep reading and buying. Great for sites with a lot of content.', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Boost features list
+	 */
+	public static function get_features() {
+		return array(
+			__( 'Instant search and indexing', 'jetpack-my-jetpack' ),
+			__( 'Powerful filtering', 'jetpack-my-jetpack' ),
+			__( 'Supports 29 languages', 'jetpack-my-jetpack' ),
+			__( 'Spelling correction', 'jetpack-my-jetpack' ),
+		);
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available'            => true,
+			'currency_code'        => 'EUR',
+			'full_price'           => '4.50',
+			'promotion_percentage' => '50',
+		);
+	}
+
+	/**
+	 * Checks whether the current plan of the site already supports the product
+	 *
+	 * Returns true if it supports. Return false if a purchase is still required.
+	 *
+	 * Free products will always return true.
+	 *
+	 * @return boolean
+	 */
+	public static function has_required_plan() {
+		return ( new Search_PLan() )->supports_search();
+	}
+}
diff --git a/projects/packages/my-jetpack/src/products/class-videopress.php b/projects/packages/my-jetpack/src/products/class-videopress.php
new file mode 100644
index 0000000000000..abff0f858ade7
--- /dev/null
+++ b/projects/packages/my-jetpack/src/products/class-videopress.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * VideoPress product
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack\Products;
+
+use Automattic\Jetpack\My_Jetpack\Module_Product;
+
+/**
+ * Class responsible for handling the VideoPress product
+ */
+class Videopress extends Module_Product {
+
+	/**
+	 * The product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'videopress';
+
+	/**
+	 * The Jetpack module name
+	 *
+	 * @var string
+	 */
+	public static $module_name = 'videopress';
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'VideoPress', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return ''; // @todo title
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'High quality, ad-free video', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return ''; // @todo Add long description
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Boost features list
+	 */
+	public static function get_features() {
+		return array();
+	}
+
+	/**
+	 * Get the product princing details
+	 *
+	 * @return array Pricing details
+	 */
+	public static function get_pricing_for_ui() {
+		return array(
+			'available'            => true,
+			'currency_code'        => 'EUR',
+			'full_price'           => '9',
+			'promotion_percentage' => '50',
+		);
+	}
+}
diff --git a/projects/packages/my-jetpack/tests/php/assets/backup-mock-plugin.txt b/projects/packages/my-jetpack/tests/php/assets/backup-mock-plugin.txt
new file mode 100644
index 0000000000000..62371573b2ebe
--- /dev/null
+++ b/projects/packages/my-jetpack/tests/php/assets/backup-mock-plugin.txt
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Jetpack Backup Plugin
+ *
+ * Plugin Name:       Backup
+ * Description:       Jetpack Backup mock
+ * Author:            Automattic
+ * Author URI:        https://automattic.com
+ * License:           GPL-2.0+
+ * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
+ */
diff --git a/projects/packages/my-jetpack/tests/php/assets/jetpack-mock-plugin.txt b/projects/packages/my-jetpack/tests/php/assets/jetpack-mock-plugin.txt
new file mode 100644
index 0000000000000..1c1f94c5400bd
--- /dev/null
+++ b/projects/packages/my-jetpack/tests/php/assets/jetpack-mock-plugin.txt
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Jetpack Plugin
+ *
+ * Plugin Name:       Jetpack
+ * Description:       Jetpack mock
+ * Author:            Automattic
+ * Author URI:        https://automattic.com
+ * License:           GPL-2.0+
+ * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
+ */
+
+class Jetpack {
+
+	static $active_modules = array();
+
+	static $return_false = false; // Force return false in action methods.
+
+	public static function is_module_active( $module_name ) {
+		return in_array( $module_name, self::$active_modules );
+	}
+
+	public static function activate_module( $module_name, $exit = true, $redirect = true ) {
+		if ( self::$return_false ) {
+			return false;
+		}
+		if ( ! self::is_module_active( $module_name ) ) {
+			self::$active_modules[] = $module_name;
+		}
+		return true;
+	}
+
+	public static function deactivate_module( $module_name ) {
+		if ( self::$return_false ) {
+			return false;
+		}
+		$new = array_filter( array_diff( self::$active_modules, (array) $module_name ) );
+		self::$active_modules = $new;
+		return true;
+	}
+}
diff --git a/projects/packages/my-jetpack/tests/php/class-broken-product.php b/projects/packages/my-jetpack/tests/php/class-broken-product.php
new file mode 100644
index 0000000000000..7f7457db9ebd0
--- /dev/null
+++ b/projects/packages/my-jetpack/tests/php/class-broken-product.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Testing class
+ *
+ * @package my-jetpack
+ */
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+/**
+ * Broken product for testing
+ */
+class Broken_Product extends Module_Product {
+	/**
+	 * Product slug
+	 *
+	 * @var string
+	 */
+	public static $slug = 'broken';
+
+	/**
+	 * Get the internationalized product name
+	 *
+	 * @return string
+	 */
+	public static function get_name() {
+		return __( 'CRM', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product title
+	 *
+	 * @return string
+	 */
+	public static function get_title() {
+		return __( 'Jetpack CRM', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product description
+	 *
+	 * @return string
+	 */
+	public static function get_description() {
+		return __( 'Connect with your people', 'jetpack-my-jetpack' );
+	}
+
+	/**
+	 * Get the internationalized product long description
+	 *
+	 * @return string
+	 */
+	public static function get_long_description() {
+		return ''; // @todo Add long description
+	}
+
+	/**
+	 * Get the internationalized features list
+	 *
+	 * @return array Boost features list
+	 */
+	public static function get_features() {
+		return array();
+	}
+
+	/**
+	 * Get the product pricing
+	 *
+	 * @return array
+	 */
+	public static function get_pricing_for_ui() {
+		return array();
+	}
+
+}
diff --git a/projects/packages/my-jetpack/tests/php/test-hybrid-product.php b/projects/packages/my-jetpack/tests/php/test-hybrid-product.php
new file mode 100644
index 0000000000000..277fb4abff2df
--- /dev/null
+++ b/projects/packages/my-jetpack/tests/php/test-hybrid-product.php
@@ -0,0 +1,101 @@
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+use Automattic\Jetpack\My_Jetpack\Products\Backup;
+use PHPUnit\Framework\TestCase;
+use WorDBless\Options as WorDBless_Options;
+
+/**
+ * Unit tests for the REST API endpoints.
+ *
+ * @package automattic/my-jetpack
+ * @see \Automattic\Jetpack\My_Jetpack\Rest_Products
+ */
+class Test_Hybrid_Product extends TestCase {
+
+	/**
+	 * The current user id.
+	 *
+	 * @var int
+	 */
+	private static $user_id;
+
+	/**
+	 * The secondary user id.
+	 *
+	 * @var int
+	 */
+	private static $secondary_user_id;
+
+	/**
+	 * Setting up the test.
+	 *
+	 * @before
+	 */
+	public function set_up() {
+
+		if ( version_compare( phpversion(), '5.7', '<=' ) ) {
+			$this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' );
+		}
+
+		$this->install_mock_plugins();
+		wp_cache_delete( 'plugins', 'plugins' );
+
+	}
+
+	/**
+	 * Installs the mock plugin present in the test assets folder as if it was the Boost plugin
+	 *
+	 * @return void
+	 */
+	public function install_mock_plugins() {
+		$plugin_dir = WP_PLUGIN_DIR . '/' . Backup::$plugin_slug;
+		if ( ! file_exists( $plugin_dir ) ) {
+			mkdir( $plugin_dir, 0777, true );
+		}
+		if ( ! file_exists( WP_PLUGIN_DIR . '/jetpack' ) ) {
+			mkdir( WP_PLUGIN_DIR . '/jetpack', 0777, true );
+		}
+		copy( __DIR__ . '/assets/backup-mock-plugin.txt', WP_PLUGIN_DIR . '/' . Backup::$plugin_filename );
+		copy( __DIR__ . '/assets/jetpack-mock-plugin.txt', WP_PLUGIN_DIR . '/jetpack/jetpack.php' );
+	}
+
+	/**
+	 * Returning the environment into its initial state.
+	 *
+	 * @after
+	 */
+	public function tear_down() {
+
+		WorDBless_Options::init()->clear_options();
+
+	}
+
+	/**
+	 * Tests with Jetpack active
+	 */
+	public function test_if_jetpack_active_return_true() {
+		activate_plugin( 'jetpack/jetpack.php' );
+		$this->assertTrue( Backup::is_active() );
+	}
+
+	/**
+	 * Tests with Backup active
+	 */
+	public function test_if_jetpack_inactive_and_backup_active_return_true() {
+		deactivate_plugins( 'jetpack/jetpack.php' );
+		activate_plugins( Backup::$plugin_filename );
+		$this->assertTrue( Backup::is_active() );
+	}
+
+	/**
+	 * Tests with both inactive
+	 */
+	public function test_if_jetpack_inactive_and_backup_inactive_return_false() {
+		deactivate_plugins( 'jetpack/jetpack.php' );
+		deactivate_plugins( Backup::$plugin_filename );
+		$this->assertFalse( Backup::is_active() );
+	}
+
+}
diff --git a/projects/packages/my-jetpack/tests/php/test-module-product.php b/projects/packages/my-jetpack/tests/php/test-module-product.php
new file mode 100644
index 0000000000000..642925cfe3745
--- /dev/null
+++ b/projects/packages/my-jetpack/tests/php/test-module-product.php
@@ -0,0 +1,131 @@
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+
+namespace Automattic\Jetpack\My_Jetpack;
+
+use Automattic\Jetpack\Connection\Tokens;
+use Automattic\Jetpack\My_Jetpack\Products\Videopress;
+use Jetpack_Options;
+use PHPUnit\Framework\TestCase;
+use WorDBless\Options as WorDBless_Options;
+use WorDBless\Users as WorDBless_Users;
+
+/**
+ * Unit tests for the REST API endpoints.
+ *
+ * @package automattic/my-jetpack
+ * @see \Automattic\Jetpack\My_Jetpack\Rest_Products
+ */
+class Test_Module_Product extends TestCase {
+
+	/**
+	 * The current user id.
+	 *
+	 * @var int
+	 */
+	private static $user_id;
+
+	/**
+	 * The secondary user id.
+	 *
+	 * @var int
+	 */
+	private static $secondary_user_id;
+
+	/**
+	 * Setting up the test.
+	 *
+	 * @before
+	 */
+	public function set_up() {
+
+		if ( version_compare( phpversion(), '5.7', '<=' ) ) {
+			$this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' );
+		}
+
+		$this->install_mock_plugins();
+		wp_cache_delete( 'plugins', 'plugins' );
+
+		// Mock site connection.
+		( new Tokens() )->update_blog_token( 'test.test.1' );
+		Jetpack_Options::update_option( 'id', 123 );
+
+		Initializer::init();
+
+		self::$user_id = wp_insert_user(
+			array(
+				'user_login' => 'test_admin',
+				'user_pass'  => '123',
+				'role'       => 'administrator',
+			)
+		);
+		wp_set_current_user( self::$user_id );
+
+	}
+
+	/**
+	 * Installs the mock plugin present in the test assets folder as if it was the Boost plugin
+	 *
+	 * @return void
+	 */
+	public function install_mock_plugins() {
+		if ( ! file_exists( WP_PLUGIN_DIR . '/jetpack' ) ) {
+			mkdir( WP_PLUGIN_DIR . '/jetpack', 0777, true );
+		}
+		copy( __DIR__ . '/assets/jetpack-mock-plugin.txt', WP_PLUGIN_DIR . '/jetpack/jetpack.php' );
+	}
+
+	/**
+	 * Returning the environment into its initial state.
+	 *
+	 * @after
+	 */
+	public function tear_down() {
+
+		WorDBless_Options::init()->clear_options();
+		WorDBless_Users::init()->clear_all_users();
+
+	}
+
+	/**
+	 * Tests exception module name missing
+	 */
+	public function test_throws_if_module_name_is_missing() {
+		$this->expectException( \Exception::class );
+		require_once __DIR__ . '/class-broken-product.php';
+		Broken_Product::is_module_active();
+	}
+
+	/**
+	 * Test plugin slug and filename are overriden
+	 */
+	public function test_plugin_slug_and_filename() {
+		$this->assertSame( Videopress::JETPACK_PLUGIN_SLUG, Videopress::get_plugin_slug() );
+		$this->assertSame( Videopress::JETPACK_PLUGIN_FILENAME, Videopress::get_plugin_filename() );
+	}
+
+	/**
+	 * Tests activating/deactivating and checking active
+	 */
+	public function test_activate_and_check() {
+		$this->assertFalse( Videopress::is_active() );
+		$this->assertTrue( Videopress::activate() );
+		$this->assertTrue( Videopress::is_active() );
+		$this->assertTrue( Videopress::deactivate() );
+		$this->assertFalse( Videopress::is_active() );
+		$this->assertFalse( Videopress::is_module_active() );
+		$this->assertTrue( Videopress::is_plugin_active() );
+	}
+
+	/**
+	 * Assert WP Error is returned if Jetpack fails to activate the module
+	 */
+	public function test_return_error_on_activation_failure() {
+		activate_plugins( 'jetpack/jetpack.php' );
+		\Jetpack::$return_false = true;
+		$this->assertTrue( is_wp_error( Videopress::activate() ) );
+
+		// also check deactivate returns false.
+		$this->assertFalse( Videopress::deactivate() );
+	}
+
+}
diff --git a/projects/packages/my-jetpack/tests/php/test-products-rest.php b/projects/packages/my-jetpack/tests/php/test-products-rest.php
index 2a599d3c3a841..e3620db23695f 100644
--- a/projects/packages/my-jetpack/tests/php/test-products-rest.php
+++ b/projects/packages/my-jetpack/tests/php/test-products-rest.php
@@ -2,6 +2,8 @@
 
 namespace Automattic\Jetpack\My_Jetpack;
 
+use Automattic\Jetpack\Connection\Tokens;
+use Jetpack_Options;
 use PHPUnit\Framework\TestCase;
 use WorDBless\Options as WorDBless_Options;
 use WorDBless\Users as WorDBless_Users;
@@ -58,7 +60,16 @@ class Test_Products_Rest extends TestCase {
 	 */
 	public function set_up() {
 
+		if ( version_compare( phpversion(), '5.7', '<=' ) ) {
+			$this->markTestSkipped( 'avoid bug in PHP 5.6 that throws strict mode warnings for abstract static methods.' );
+		}
+
 		$this->install_mock_plugin();
+		wp_cache_delete( 'plugins', 'plugins' );
+
+		// Mock site connection.
+		( new Tokens() )->update_blog_token( 'test.test.1' );
+		Jetpack_Options::update_option( 'id', 123 );
 
 		global $wp_rest_server;
 
@@ -128,7 +139,7 @@ public function test_get_products() {
 		$data     = $response->get_data();
 
 		$this->assertEquals( 200, $response->get_status() );
-		$this->assertEquals( $products, $data['products'] );
+		$this->assertEquals( $products, $data );
 	}
 
 	/**
@@ -169,7 +180,7 @@ public function test_get_product() {
 		$data     = $response->get_data();
 
 		$this->assertEquals( 200, $response->get_status() );
-		$this->assertEquals( $product, $data['products'][0] );
+		$this->assertEquals( $product, $data );
 	}
 
 	/**
@@ -196,7 +207,8 @@ public function test_activate_boost() {
 		$response = $this->server->dispatch( $this->request );
 		$data     = $response->get_data();
 
-		$this->assertEquals( 'active', $data['products'][0]['status'] );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 'active', $data['status'] );
 		$this->assertTrue( is_plugin_active( $this->boost_mock_filename ) );
 	}
 
@@ -214,7 +226,8 @@ public function test_deactivate_boost() {
 		$response = $this->server->dispatch( $this->request );
 		$data     = $response->get_data();
 
-		$this->assertEquals( 'inactive', $data['products'][0]['status'] );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( 'inactive', $data['status'] );
 		$this->assertFalse( is_plugin_active( $this->boost_mock_filename ) );
 	}
 
@@ -233,9 +246,8 @@ public function test_activate_uninstallable() {
 		$response = $this->server->dispatch( $this->request );
 		$data     = $response->get_data();
 
-		$this->assertEquals( 'inactive', $data['products'][0]['status'] );
-		$this->assertEquals( 'plugin_php_incompatible', $data['error_code'] );
-		$this->assertFalse( $data['success'] );
+		$this->assertEquals( 400, $response->get_status() );
+		$this->assertEquals( 'plugin_php_incompatible', $data['code'] );
 		$this->assertFalse( is_plugin_active( $this->boost_mock_filename ) );
 	}
 
diff --git a/projects/packages/partner/CHANGELOG.md b/projects/packages/partner/CHANGELOG.md
index 47591032d7dc0..7a9682bad3c90 100644
--- a/projects/packages/partner/CHANGELOG.md
+++ b/projects/packages/partner/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.4] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.6.3] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -112,6 +116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add partner subsidiary id to upgrade URLs.
 
+[1.6.4]: https://github.com/Automattic/jetpack-partner/compare/v1.6.3...v1.6.4
 [1.6.3]: https://github.com/Automattic/jetpack-partner/compare/v1.6.2...v1.6.3
 [1.6.2]: https://github.com/Automattic/jetpack-partner/compare/v1.6.1...v1.6.2
 [1.6.1]: https://github.com/Automattic/jetpack-partner/compare/v1.6.0...v1.6.1
diff --git a/projects/packages/partner/changelog/update-project-scripts-no-install b/projects/packages/partner/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/partner/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/password-checker/CHANGELOG.md b/projects/packages/password-checker/CHANGELOG.md
index 8ecd21434f877..371ad3435909e 100644
--- a/projects/packages/password-checker/CHANGELOG.md
+++ b/projects/packages/password-checker/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.2] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [0.2.1] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -56,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Use `composer update` rather than `install` in scripts, as composer.lock isn't checked in.
 
+[0.2.2]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/Automattic/jetpack-password-checker/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/Automattic/jetpack-password-checker/compare/v0.1.8...v0.2.0
 [0.1.8]: https://github.com/Automattic/jetpack-password-checker/compare/v0.1.7...v0.1.8
diff --git a/projects/packages/password-checker/changelog/update-project-scripts-no-install b/projects/packages/password-checker/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/password-checker/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/plans/.gitattributes b/projects/packages/plans/.gitattributes
new file mode 100644
index 0000000000000..dd08c5ac8f82f
--- /dev/null
+++ b/projects/packages/plans/.gitattributes
@@ -0,0 +1,15 @@
+# Files not needed to be distributed in the package.
+.gitattributes    export-ignore
+.github/          export-ignore
+package.json      export-ignore
+
+# Files to include in the mirror repo, but excluded via gitignore
+# Remember to end all directories with `/**` to properly tag every file.
+# /src/js/example.min.js  production-include
+
+# Files to exclude from the mirror repo, but included in the monorepo.
+# Remember to end all directories with `/**` to properly tag every file.
+.gitignore        production-exclude
+changelog/**      production-exclude
+phpunit.xml.dist  production-exclude
+tests/**          production-exclude
diff --git a/projects/packages/plans/.gitignore b/projects/packages/plans/.gitignore
new file mode 100644
index 0000000000000..32d2a35ceea33
--- /dev/null
+++ b/projects/packages/plans/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+node_modules/
+wordpress
diff --git a/projects/packages/plans/CHANGELOG.md b/projects/packages/plans/CHANGELOG.md
new file mode 100644
index 0000000000000..721294abd00ad
--- /dev/null
+++ b/projects/packages/plans/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
diff --git a/projects/packages/plans/README.md b/projects/packages/plans/README.md
new file mode 100644
index 0000000000000..61fc69d944839
--- /dev/null
+++ b/projects/packages/plans/README.md
@@ -0,0 +1,20 @@
+# plans
+
+Fetch information about Jetpack Plans from wpcom
+
+## How to install plans
+
+### Installation From Git Repo
+
+## Contribute
+
+## Get Help
+
+## Security
+
+Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic).
+
+## License
+
+plans is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt)
+
diff --git a/projects/packages/plans/changelog/.gitkeep b/projects/packages/plans/changelog/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/packages/plans/changelog/extract-jetpack-plans b/projects/packages/plans/changelog/extract-jetpack-plans
new file mode 100644
index 0000000000000..65c54db985465
--- /dev/null
+++ b/projects/packages/plans/changelog/extract-jetpack-plans
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Package created
diff --git a/projects/packages/plans/changelog/update-plans-mirror-repo b/projects/packages/plans/changelog/update-plans-mirror-repo
new file mode 100644
index 0000000000000..d7a7b73a40586
--- /dev/null
+++ b/projects/packages/plans/changelog/update-plans-mirror-repo
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Core: update composer info to support mirror repo.
diff --git a/projects/packages/plans/composer.json b/projects/packages/plans/composer.json
new file mode 100644
index 0000000000000..74f0368b39d43
--- /dev/null
+++ b/projects/packages/plans/composer.json
@@ -0,0 +1,61 @@
+{
+	"name": "automattic/jetpack-plans",
+	"description": "Fetch information about Jetpack Plans from wpcom",
+	"type": "library",
+	"license": "GPL-2.0-or-later",
+	"require": {
+		"automattic/jetpack-connection": "^1.36"
+	},
+	"require-dev": {
+		"yoast/phpunit-polyfills": "1.0.3",
+		"automattic/jetpack-changelogger": "^3.0",
+		"automattic/jetpack-options": "^1.14",
+		"automattic/jetpack-status": "^1.10",
+		"automattic/wordbless": "@dev"
+	},
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	},
+	"scripts": {
+		"phpunit": [
+			"./vendor/phpunit/phpunit/phpunit --colors=always"
+		],
+		"test-coverage": [
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+		],
+		"test-php": [
+			"@composer phpunit"
+		],
+		"post-update-cmd": "php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\"",
+		"build-production": "echo 'Add your build step to composer.json, please!'",
+		"build-development": "echo 'Add your build step to composer.json, please!'"
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../packages/*",
+			"options": {
+				"monorepo": true
+			}
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"extra": {
+		"autotagger": true,
+		"mirror-repo": "Automattic/jetpack-plans",
+		"changelogger": {
+			"link-template": "https://github.com/Automattic/jetpack-plans/compare/v${old}...v${new}"
+		},
+		"branch-alias": {
+			"dev-master": "0.1.x-dev"
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"roots/wordpress-core-installer": true
+		}
+	}
+}
diff --git a/projects/packages/plans/package.json b/projects/packages/plans/package.json
new file mode 100644
index 0000000000000..f0aefec8c45cb
--- /dev/null
+++ b/projects/packages/plans/package.json
@@ -0,0 +1,29 @@
+{
+	"private": true,
+	"name": "@automattic/jetpack-plans",
+	"version": "0.1.0-alpha",
+	"description": "Fetch information about Jetpack Plans from wpcom",
+	"homepage": "https://jetpack.com",
+	"bugs": {
+		"url": "https://github.com/Automattic/jetpack/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/Automattic/jetpack.git"
+	},
+	"license": "GPL-2.0-or-later",
+	"author": "Automattic",
+	"scripts": {
+		"build": "echo 'Not implemented.",
+		"build-js": "echo 'Not implemented.",
+		"build-production": "echo 'Not implemented.",
+		"build-production-js": "echo 'Not implemented.",
+		"clean": "true"
+	},
+	"devDependencies": {},
+	"engines": {
+		"node": "^14.18.3 || ^16.13.2",
+		"pnpm": "^6.23.6",
+		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
+	}
+}
diff --git a/projects/packages/plans/phpunit.xml.dist b/projects/packages/plans/phpunit.xml.dist
new file mode 100644
index 0000000000000..3223c32458db2
--- /dev/null
+++ b/projects/packages/plans/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" convertDeprecationsToExceptions="true">
+	<testsuites>
+		<testsuite name="main">
+			<directory prefix="test" suffix=".php">tests/php</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="false">
+			<!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
+			<!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/projects/packages/plans/src/class-current-plan.php b/projects/packages/plans/src/class-current-plan.php
new file mode 100644
index 0000000000000..10f71cc109bd8
--- /dev/null
+++ b/projects/packages/plans/src/class-current-plan.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * Handles fetching of the site's plan and products from WordPress.com and caching values locally.
+ *
+ * This file was copied and adapted from the Jetpack plugin on Jan 2022
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack;
+
+use Automattic\Jetpack\Connection\Client;
+use Jetpack_Options;
+
+/**
+ * Provides methods methods for fetching the site's plan and products from WordPress.com.
+ */
+class Current_Plan {
+	/**
+	 * A cache variable to hold the active plan for the current request.
+	 *
+	 * @var array
+	 */
+	private static $active_plan_cache;
+
+	/**
+	 * The name of the option that will store the site's plan.
+	 *
+	 * @var string
+	 */
+	const PLAN_OPTION = 'jetpack_active_plan';
+
+	/**
+	 * The name of the option that will store the site's products.
+	 *
+	 * @var string
+	 */
+	const SITE_PRODUCTS_OPTION = 'jetpack_site_products';
+
+	const PLAN_DATA = array(
+		'free'     => array(
+			'plans'    => array(
+				'jetpack_free',
+			),
+			'supports' => array(
+				'opentable',
+				'calendly',
+				'send-a-message',
+				'whatsapp-button',
+				'social-previews',
+				'videopress',
+
+				'core/video',
+				'core/cover',
+				'core/audio',
+			),
+		),
+		'personal' => array(
+			'plans'    => array(
+				'jetpack_personal',
+				'jetpack_personal_monthly',
+				'personal-bundle',
+				'personal-bundle-monthly',
+				'personal-bundle-2y',
+			),
+			'supports' => array(
+				'akismet',
+				'recurring-payments',
+				'premium-content/container',
+				'videopress',
+			),
+		),
+		'premium'  => array(
+			'plans'    => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'value_bundle',
+				'value_bundle-monthly',
+				'value_bundle-2y',
+			),
+			'supports' => array(
+				'donations',
+				'simple-payments',
+				'vaultpress',
+				'videopress',
+				'republicize',
+			),
+		),
+		'security' => array(
+			'plans'    => array(
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'supports' => array(),
+		),
+		'business' => array(
+			'plans'    => array(
+				'jetpack_business',
+				'jetpack_business_monthly',
+				'business-bundle',
+				'business-bundle-monthly',
+				'business-bundle-2y',
+				'ecommerce-bundle',
+				'ecommerce-bundle-monthly',
+				'ecommerce-bundle-2y',
+			),
+			'supports' => array(),
+		),
+
+		'complete' => array(
+			'plans'    => array(
+				'jetpack_complete',
+				'jetpack_complete_monthly',
+				'vip',
+			),
+			'supports' => array(),
+		),
+	);
+
+	/**
+	 * Given a response to the `/sites/%d` endpoint, will parse the response and attempt to set the
+	 * site's plan and products from the response.
+	 *
+	 * @param array $response The response from `/sites/%d`.
+	 * @return bool Was the plan successfully updated?
+	 */
+	public static function update_from_sites_response( $response ) {
+		// Bail if there was an error or malformed response.
+		if ( is_wp_error( $response ) || ! is_array( $response ) || ! isset( $response['body'] ) ) {
+			return false;
+		}
+
+		$body = wp_remote_retrieve_body( $response );
+		if ( is_wp_error( $body ) ) {
+			return false;
+		}
+
+		// Decode the results.
+		$results = json_decode( $body, true );
+
+		if ( ! is_array( $results ) ) {
+			return false;
+		}
+
+		if ( isset( $results['products'] ) ) {
+			// Store the site's products in an option and return true if updated.
+			self::store_data_in_option( self::SITE_PRODUCTS_OPTION, $results['products'] );
+		}
+
+		if ( ! isset( $results['plan'] ) ) {
+			return false;
+		}
+
+		$current_plan = get_option( self::PLAN_OPTION, array() );
+
+		if ( ! empty( $current_plan ) && $current_plan === $results['plan'] ) {
+			// Bail if the plans array hasn't changed.
+			return false;
+		}
+
+		// Store the new plan in an option and return true if updated.
+		$result = self::store_data_in_option( self::PLAN_OPTION, $results['plan'] );
+
+		if ( $result ) {
+			// Reset the cache since we've just updated the plan.
+			self::$active_plan_cache = null;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Store data in an option.
+	 *
+	 * @param string $option The name of the option that will store the data.
+	 * @param array  $data Data to be store in an option.
+	 * @return bool Were the subscriptions successfully updated?
+	 */
+	private static function store_data_in_option( $option, $data ) {
+		$result = update_option( $option, $data, true );
+
+		// If something goes wrong with the update, so delete the current option and then update it.
+		if ( ! $result ) {
+			delete_option( $option );
+			$result = update_option( $option, $data, true );
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Make an API call to WordPress.com for plan status
+	 *
+	 * @uses Jetpack_Options::get_option()
+	 * @uses Client::wpcom_json_api_request_as_blog()
+	 * @uses update_option()
+	 *
+	 * @access public
+	 * @static
+	 *
+	 * @return bool True if plan is updated, false if no update
+	 */
+	public static function refresh_from_wpcom() {
+		// Make the API request.
+		$request  = sprintf( '/sites/%d', Jetpack_Options::get_option( 'id' ) );
+		$response = Client::wpcom_json_api_request_as_blog( $request, '1.1' );
+
+		return self::update_from_sites_response( $response );
+	}
+
+	/**
+	 * Get the plan that this Jetpack site is currently using.
+	 *
+	 * @uses get_option()
+	 *
+	 * @access public
+	 * @static
+	 *
+	 * @return array Active Jetpack plan details
+	 */
+	public static function get() {
+		// this can be expensive to compute so we cache for the duration of a request.
+		if ( is_array( self::$active_plan_cache ) && ! empty( self::$active_plan_cache ) ) {
+			return self::$active_plan_cache;
+		}
+
+		$plan = get_option( self::PLAN_OPTION, array() );
+
+		// Set the default options.
+		$plan = wp_parse_args(
+			$plan,
+			array(
+				'product_slug' => 'jetpack_free',
+				'class'        => 'free',
+				'features'     => array(
+					'active' => array(),
+				),
+			)
+		);
+
+		list( $plan['class'], $supports ) = self::get_class_and_features( $plan['product_slug'] );
+
+		// get available features if Jetpack is active.
+		if ( class_exists( 'Jetpack' ) ) {
+			foreach ( Jetpack::get_available_modules() as $module_slug ) {
+				$module = Jetpack::get_module( $module_slug );
+				if ( ! isset( $module ) || ! is_array( $module ) ) {
+					continue;
+				}
+				if ( in_array( 'free', $module['plan_classes'], true ) || in_array( $plan['class'], $module['plan_classes'], true ) ) {
+					$supports[] = $module_slug;
+				}
+			}
+		}
+
+		$plan['supports'] = $supports;
+
+		self::$active_plan_cache = $plan;
+
+		return $plan;
+	}
+
+	/**
+	 * Get the site's products.
+	 *
+	 * @uses get_option()
+	 *
+	 * @access public
+	 * @static
+	 *
+	 * @return array Active Jetpack products
+	 */
+	public static function get_products() {
+		return get_option( self::SITE_PRODUCTS_OPTION, array() );
+	}
+
+	/**
+	 * Get the class of plan and a list of features it supports
+	 *
+	 * @param string $plan_slug The plan that we're interested in.
+	 * @return array Two item array, the plan class and the an array of features.
+	 */
+	private static function get_class_and_features( $plan_slug ) {
+		$features = array();
+		foreach ( self::PLAN_DATA as $class => $details ) {
+			$features = array_merge( $features, $details['supports'] );
+			if ( in_array( $plan_slug, $details['plans'], true ) ) {
+				return array( $class, $features );
+			}
+		}
+		return array( 'free', self::PLAN_DATA['free']['supports'] );
+	}
+
+	/**
+	 * Gets the minimum plan slug that supports the given feature
+	 *
+	 * @param string $feature The name of the feature.
+	 * @return string|bool The slug for the minimum plan that supports.
+	 *  the feature or false if not found
+	 */
+	public static function get_minimum_plan_for_feature( $feature ) {
+		foreach ( self::PLAN_DATA as $details ) {
+			if ( in_array( $feature, $details['supports'], true ) ) {
+				return $details['plans'][0];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Determine whether the active plan supports a particular feature
+	 *
+	 * @uses Jetpack_Plan::get()
+	 *
+	 * @access public
+	 * @static
+	 *
+	 * @param string $feature The module or feature to check.
+	 *
+	 * @return bool True if plan supports feature, false if not
+	 */
+	public static function supports( $feature ) {
+		// Search product bypasses plan feature check.
+		if ( 'search' === $feature && (bool) get_option( 'has_jetpack_search_product' ) ) {
+			return true;
+		}
+
+		// As of Q3 2021 - a videopress free tier is available to all plans.
+		if ( 'videopress' === $feature ) {
+			return true;
+		}
+
+		$plan = self::get();
+
+		// Manually mapping WordPress.com features to Jetpack module slugs.
+		foreach ( $plan['features']['active'] as $wpcom_feature ) {
+			switch ( $wpcom_feature ) {
+				case 'wordads-jetpack':
+					// WordAds are supported for this site.
+					if ( 'wordads' === $feature ) {
+						return true;
+					}
+					break;
+			}
+		}
+
+		if (
+			in_array( $feature, $plan['supports'], true )
+			|| in_array( $feature, $plan['features']['active'], true )
+		) {
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/plans/src/class-plans.php b/projects/packages/plans/src/class-plans.php
new file mode 100644
index 0000000000000..b96ffdb4dcdbd
--- /dev/null
+++ b/projects/packages/plans/src/class-plans.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Plans Library
+ *
+ * Fetch plans data from WordPress.com.
+ *
+ * This file was copied and adapted from the Jetpack plugin on Jan 2022.
+ *
+ * @package automattic/jetpack-plans
+ */
+
+namespace Automattic\Jetpack;
+
+/**
+ * Fetch data about available Plans from WordPress.com
+ */
+class Plans {
+	/**
+	 * Get a list of all available plans from WordPress.com
+	 *
+	 * @since-jetpack 7.7.0
+	 *
+	 * @return array The plans list
+	 */
+	public static function get_plans() {
+		if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
+			if ( ! class_exists( 'Store_Product_List' ) ) {
+				require WP_CONTENT_DIR . '/admin-plugins/wpcom-billing/store-product-list.php';
+			}
+
+			return Store_Product_List::api_only_get_active_plans_v1_4();
+		}
+
+		// We're on Jetpack, so it's safe to use this namespace.
+		$request = Automattic\Jetpack\Connection\Client::wpcom_json_api_request_as_user(
+			'/plans?_locale=' . get_user_locale(),
+			// We're using version 1.5 of the endpoint rather than the default version 2
+			// since the latter only returns Jetpack Plans, but we're also interested in
+			// WordPress.com plans, for consumers of this method that run on WP.com.
+			'1.5',
+			array(
+				'method'  => 'GET',
+				'headers' => array(
+					'X-Forwarded-For' => ( new Automattic\Jetpack\Status\Visitor() )->get_ip( true ),
+				),
+			),
+			null,
+			'rest'
+		);
+
+		$body = wp_remote_retrieve_body( $request );
+		if ( 200 === wp_remote_retrieve_response_code( $request ) ) {
+			return json_decode( $body );
+		} else {
+			return $body;
+		}
+	}
+
+	/**
+	 * Get plan information for a plan given its slug
+	 *
+	 * @since-jetpack 7.7.0
+	 *
+	 * @param string $plan_slug Plan slug.
+	 *
+	 * @return object The plan object
+	 */
+	public static function get_plan( $plan_slug ) {
+		$plans = self::get_plans();
+		if ( ! is_array( $plans ) ) {
+			return;
+		}
+
+		foreach ( $plans as $plan ) {
+			if ( $plan_slug === $plan->product_slug ) {
+				return $plan;
+			}
+		}
+	}
+}
diff --git a/projects/packages/plans/src/example.php b/projects/packages/plans/src/example.php
new file mode 100644
index 0000000000000..a788a63305dc4
--- /dev/null
+++ b/projects/packages/plans/src/example.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Put your classes in this `src` folder!
+ *
+ * @package automattic/PACKAGE-NAME
+ */
+
+// Start your code here!
diff --git a/projects/packages/plans/tests/php/bootstrap.php b/projects/packages/plans/tests/php/bootstrap.php
new file mode 100644
index 0000000000000..1a493698d1ebd
--- /dev/null
+++ b/projects/packages/plans/tests/php/bootstrap.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Bootstrap.
+ *
+ * @package automattic/
+ */
+
+/**
+ * Include the composer autoloader.
+ */
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+define( 'WP_DEBUG', true );
+
+\WorDBless\Load::load();
diff --git a/projects/packages/plans/tests/php/test-current-plan.php b/projects/packages/plans/tests/php/test-current-plan.php
new file mode 100644
index 0000000000000..0cd8503aa4de8
--- /dev/null
+++ b/projects/packages/plans/tests/php/test-current-plan.php
@@ -0,0 +1,307 @@
+<?php //phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+/**
+ * This file was copied and adapted from the Jetpack plugin on Jan 2022
+ */
+// phpcs:disable Squiz.Commenting, Generic.Commenting  -- Tests should be self documenting
+
+namespace Automattic\Jetpack;
+
+use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
+use Jetpack_Options;
+use PHPUnit\Framework\TestCase;
+use WP_Error;
+
+/**
+ * Contains the tests for the Jetpack_Plan class.
+ */
+class WP_Test_Jetpack_Plan extends TestCase {
+
+	/**
+	 * Setting up the test.
+	 *
+	 * @before
+	 */
+	public function set_up() {
+		delete_option( 'jetpack_active_plan' );
+	}
+
+	public function test_update_from_sites_response_failure_to_update() {
+		update_option( 'jetpack_active_plan', $this->get_free_plan(), true );
+
+		$option = get_option( 'jetpack_active_plan' );
+		$this->assertSame( 'jetpack_free', $option['product_slug'] );
+
+		// Set up an issue where the value in cache does not match the DB, so the DB update fails.
+		Jetpack_Options::update_raw_option( 'jetpack_active_plan', $this->get_personal_plan(), true );
+
+		$this->assertTrue( Jetpack_Plan::update_from_sites_response( $this->get_response_personal_plan() ) );
+	}
+
+	/**
+	 * @dataProvider get_update_from_sites_response_data
+	 */
+	public function test_update_from_sites_response( $response, $expected_plan_slug_after, $expected_return, $initial_option = null ) {
+
+		if ( ! is_null( $initial_option ) ) {
+			update_option( 'jetpack_active_plan', $initial_option, true );
+		}
+
+		$this->assertSame( $expected_return, Jetpack_Plan::update_from_sites_response( $response ) );
+
+		$plan = Jetpack_Plan::get();
+		$this->assertSame( $expected_plan_slug_after, $plan['product_slug'] );
+	}
+
+	public function get_update_from_sites_response_data() {
+		return array(
+			'is_errored_response'                    => array(
+				$this->get_errored_sites_response(),
+				'jetpack_free',
+				false,
+			),
+			'response_is_empty'                      => array(
+				$this->get_mocked_response( 200, '' ),
+				'jetpack_free',
+				false,
+			),
+			'response_does_not_have_body'            => array(
+				array( 'code' => 400 ),
+				'jetpack_free',
+				false,
+			),
+			'response_does_not_have_plan'            => array(
+				array(
+					'code' => 200,
+					array(),
+				),
+				'jetpack_free',
+				false,
+			),
+			'initially_empty_option_to_free'         => array(
+				$this->get_response_free_plan(),
+				'jetpack_free',
+				true,
+			),
+			'initially_empty_to_personal'            => array(
+				$this->get_response_personal_plan(),
+				'jetpack_personal',
+				true,
+			),
+			'initially_free_to_personal'             => array(
+				$this->get_response_personal_plan(),
+				'jetpack_personal',
+				true,
+				$this->get_free_plan(),
+			),
+			'initially_personal_to_free'             => array(
+				$this->get_response_free_plan(),
+				'jetpack_free',
+				true,
+				$this->get_personal_plan(),
+			),
+			'initially_free_no_change'               => array(
+				$this->get_response_free_plan(),
+				'jetpack_free',
+				false,
+				$this->get_free_plan(),
+			),
+			'initially_personal_to_changed_personal' => array(
+				$this->get_response_changed_personal_plan(),
+				'jetpack_personal',
+				true,
+				$this->get_response_personal_plan(),
+			),
+		);
+	}
+
+	private function get_response_free_plan() {
+		return $this->get_successful_plan_response( $this->get_free_plan() );
+	}
+
+	private function get_response_personal_plan() {
+		return $this->get_successful_plan_response( $this->get_personal_plan() );
+	}
+
+	private function get_response_changed_personal_plan() {
+		return $this->get_successful_plan_response( $this->get_changed_personal_plan() );
+	}
+
+	private function get_successful_plan_response( $plan_response ) {
+		$body = wp_json_encode(
+			array(
+				'plan' => $plan_response,
+			)
+		);
+		return $this->get_mocked_response( 200, $body );
+	}
+
+	private function get_errored_sites_response() {
+		return $this->get_mocked_response( 400, new WP_Error() );
+	}
+
+	private function get_mocked_response( $code, $body ) {
+		return array(
+			'code' => $code,
+			'body' => $body,
+		);
+	}
+
+	private function get_free_plan() {
+		return array(
+			'product_id'         => 2002,
+			'product_slug'       => 'jetpack_free',
+			'product_name_short' => 'Free',
+			'expired'            => false,
+			'user_is_owner'      => false,
+			'is_free'            => true,
+			'features'           => array(
+				'active'    => array(
+					'akismet',
+					'support',
+				),
+				'available' => array(
+					'akismet'                       => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-backups'            => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-backup-archive'     => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-storage-space'      => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-automated-restores' => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'simple-payments'               => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'support'                       => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_personal',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+						'jetpack_personal_monthly',
+					),
+					'premium-themes'                => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-security-scanning'  => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+					'polldaddy'                     => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+				),
+			),
+		);
+	}
+
+	private function get_changed_personal_plan() {
+		$changed_personal_plan = $this->get_personal_plan();
+
+		$changed_personal_plan['features']['available']['test_feature'] = array( 'jetpack_free' );
+		return $changed_personal_plan;
+	}
+
+	private function get_personal_plan() {
+		return array(
+			'product_id'         => 2005,
+			'product_slug'       => 'jetpack_personal',
+			'product_name_short' => 'Personal',
+			'expired'            => false,
+			'user_is_owner'      => false,
+			'is_free'            => false,
+			'features'           => array(
+				'active'    => array(
+					'support',
+				),
+				'available' => array(
+					'akismet'                       => array(
+						'jetpack_free',
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'support'                       => array(
+						'jetpack_free',
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+						'jetpack_personal_monthly',
+					),
+					'vaultpress-backups'            => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-backup-archive'     => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-storage-space'      => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-automated-restores' => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'simple-payments'               => array(
+						'jetpack_premium',
+						'jetpack_business',
+						'jetpack_premium_monthly',
+						'jetpack_business_monthly',
+					),
+					'premium-themes'                => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+					'vaultpress-security-scanning'  => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+					'polldaddy'                     => array(
+						'jetpack_business',
+						'jetpack_business_monthly',
+					),
+				),
+			),
+		);
+	}
+}
+
+// phpcs:enable
diff --git a/projects/packages/plugins-installer/.gitattributes b/projects/packages/plugins-installer/.gitattributes
new file mode 100644
index 0000000000000..dd08c5ac8f82f
--- /dev/null
+++ b/projects/packages/plugins-installer/.gitattributes
@@ -0,0 +1,15 @@
+# Files not needed to be distributed in the package.
+.gitattributes    export-ignore
+.github/          export-ignore
+package.json      export-ignore
+
+# Files to include in the mirror repo, but excluded via gitignore
+# Remember to end all directories with `/**` to properly tag every file.
+# /src/js/example.min.js  production-include
+
+# Files to exclude from the mirror repo, but included in the monorepo.
+# Remember to end all directories with `/**` to properly tag every file.
+.gitignore        production-exclude
+changelog/**      production-exclude
+phpunit.xml.dist  production-exclude
+tests/**          production-exclude
diff --git a/projects/packages/plugins-installer/.gitignore b/projects/packages/plugins-installer/.gitignore
new file mode 100644
index 0000000000000..140fd587d2d52
--- /dev/null
+++ b/projects/packages/plugins-installer/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+node_modules/
diff --git a/projects/packages/plugins-installer/.phpcs.dir.xml b/projects/packages/plugins-installer/.phpcs.dir.xml
new file mode 100644
index 0000000000000..fd41c865e8f25
--- /dev/null
+++ b/projects/packages/plugins-installer/.phpcs.dir.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset>
+
+	<rule ref="WordPress.WP.I18n">
+		<properties>
+			<property name="text_domain" type="array">
+				<element value="jetpack-plugins-installer" />
+			</property>
+		</properties>
+	</rule>
+	<rule ref="Jetpack.Functions.I18n">
+		<properties>
+			<property name="text_domain" value="jetpack-plugins-installer" />
+		</properties>
+	</rule>
+
+	<rule ref="WordPress.Utils.I18nTextDomainFixer">
+		<properties>
+			<property name="old_text_domain" type="array" />
+			<property name="new_text_domain" value="jetpack-plugins-installer" />
+		</properties>
+	</rule>
+
+</ruleset>
diff --git a/projects/packages/plugins-installer/CHANGELOG.md b/projects/packages/plugins-installer/CHANGELOG.md
new file mode 100644
index 0000000000000..3f2733da86b48
--- /dev/null
+++ b/projects/packages/plugins-installer/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.1.0 - 2022-02-02
+### Added
+- First version
+- New functions to safely check plugin statuses
+
+### Changed
+- Build: add missing mirror repo details, so package can be deployed.
+
+### Fixed
+- Fix method logic
diff --git a/projects/packages/plugins-installer/README.md b/projects/packages/plugins-installer/README.md
new file mode 100644
index 0000000000000..b766b09457636
--- /dev/null
+++ b/projects/packages/plugins-installer/README.md
@@ -0,0 +1,20 @@
+# plugins-installer
+
+Handle installation of plugins from WP.org
+
+## How to install plugins-installer
+
+### Installation From Git Repo
+
+## Contribute
+
+## Get Help
+
+## Security
+
+Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic).
+
+## License
+
+plugins-installer is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt)
+
diff --git a/projects/packages/plugins-installer/changelog/.gitkeep b/projects/packages/plugins-installer/changelog/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/packages/plugins-installer/composer.json b/projects/packages/plugins-installer/composer.json
new file mode 100644
index 0000000000000..dd16fd5c3ae33
--- /dev/null
+++ b/projects/packages/plugins-installer/composer.json
@@ -0,0 +1,51 @@
+{
+	"name": "automattic/jetpack-plugins-installer",
+	"description": "Handle installation of plugins from WP.org",
+	"type": "library",
+	"license": "GPL-2.0-or-later",
+	"require": {
+		"automattic/jetpack-a8c-mc-stats": "^1.4"
+	},
+	"require-dev": {
+		"yoast/phpunit-polyfills": "1.0.3",
+		"automattic/jetpack-changelogger": "^3.0"
+	},
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	},
+	"scripts": {
+		"phpunit": [
+			"./vendor/phpunit/phpunit/phpunit --colors=always"
+		],
+		"test-coverage": [
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+		],
+		"test-php": [
+			"@composer phpunit"
+		]
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../packages/*",
+			"options": {
+				"monorepo": true
+			}
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"extra": {
+		"branch-alias": {
+			"dev-master": "0.1.x-dev"
+		},
+		"mirror-repo": "Automattic/jetpack-plugins-installer",
+		"changelogger": {
+			"link-template": "https://github.com/Automattic/jetpack-plugins-installer/compare/v${old}...v${new}"
+		},
+		"autotagger": true,
+		"textdomain": "jetpack-plugins-installer"
+	}
+}
diff --git a/projects/packages/plugins-installer/phpunit.xml.dist b/projects/packages/plugins-installer/phpunit.xml.dist
new file mode 100644
index 0000000000000..3223c32458db2
--- /dev/null
+++ b/projects/packages/plugins-installer/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" convertDeprecationsToExceptions="true">
+	<testsuites>
+		<testsuite name="main">
+			<directory prefix="test" suffix=".php">tests/php</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="false">
+			<!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
+			<!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/projects/packages/plugins-installer/src/class-automatic-install-skin.php b/projects/packages/plugins-installer/src/class-automatic-install-skin.php
new file mode 100644
index 0000000000000..ae129c5975b32
--- /dev/null
+++ b/projects/packages/plugins-installer/src/class-automatic-install-skin.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Automatic_Upgrader_Skin extension for Jetpack
+ *
+ * @package jetpack-plugins-installer
+ */
+
+namespace Automattic\Jetpack;
+
+use Automatic_Upgrader_Skin;
+
+/**
+ * Include required files from wp-admin.
+ */
+require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+require_once ABSPATH . 'wp-admin/includes/file.php';
+
+/**
+ * Allows us to capture that the site doesn't have proper file system access.
+ * In order to update the plugin.
+ */
+class Automatic_Install_Skin extends Automatic_Upgrader_Skin {
+	/**
+	 * Stores the last error key;
+	 *
+	 * @var string
+	 **/
+	protected $main_error_code = 'install_error';
+
+	/**
+	 * Stores the last error message.
+	 *
+	 * @var string
+	 **/
+	protected $main_error_message = 'An unknown error occurred during installation';
+
+	/**
+	 * Overwrites the set_upgrader to be able to tell if we e ven have the ability to write to the files.
+	 *
+	 * @param WP_Upgrader $upgrader The upgrader object.
+	 */
+	public function set_upgrader( &$upgrader ) {
+		parent::set_upgrader( $upgrader );
+
+		// Check if we even have permission to.
+		$result = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
+		if ( ! $result ) {
+			// set the string here since they are not available just yet.
+			$upgrader->generic_strings();
+			$this->feedback( 'fs_unavailable' );
+		}
+	}
+
+	/**
+	 * Overwrites the error function
+	 *
+	 * @param \WP_Error|mixed $error The error object.
+	 */
+	public function error( $error ) {
+		if ( is_wp_error( $error ) ) {
+			$this->feedback( $error );
+		}
+	}
+
+	/**
+	 * Set the main error code.
+	 *
+	 * Don't set the process_failed as code since it is not that helpful unless we don't have one already set
+	 *
+	 * @param string $code The error code.
+	 * @return void
+	 */
+	private function set_main_error_code( $code ) {
+		$this->main_error_code = ( 'process_failed' === $code && $this->main_error_code ? $this->main_error_code : $code );
+	}
+
+	/**
+	 * Set the main error message.
+	 *
+	 * Don't set the process_failed as message since it is not that helpful unless we don't have one already set
+	 *
+	 * @param string $message The error message.
+	 * @param string $code The error code.
+	 * @return void
+	 */
+	private function set_main_error_message( $message, $code ) {
+		$this->main_error_message = ( 'process_failed' === $code && $this->main_error_message ? $this->main_error_message : $message );
+	}
+
+	/**
+	 * Get the main error code
+	 *
+	 * @return string
+	 */
+	public function get_main_error_code() {
+		return $this->main_error_code;
+	}
+
+	/**
+	 * Get the main error message
+	 *
+	 * @return string
+	 */
+	public function get_main_error_message() {
+		return $this->main_error_message;
+	}
+
+	/**
+	 * Overwrites the feedback function
+	 *
+	 * @param string|array|WP_Error $data    Data.
+	 * @param mixed                 ...$args Optional text replacements.
+	 */
+	public function feedback( $data, ...$args ) {
+
+		$current_error = null;
+		if ( is_wp_error( $data ) ) {
+			$this->set_main_error_code( $data->get_error_code() );
+			$string = $data->get_error_message();
+		} elseif ( is_array( $data ) ) {
+			return;
+		} else {
+			$string = $data;
+		}
+
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
+			$this->set_main_error_code( $string );
+
+			$current_error = $string;
+			$string        = $this->upgrader->strings[ $string ];
+		}
+
+		if ( strpos( $string, '%' ) !== false ) {
+			if ( ! empty( $args ) ) {
+				$string = vsprintf( $string, $args );
+			}
+		}
+
+		$string = trim( $string );
+		$string = wp_kses(
+			$string,
+			array(
+				'a'      => array(
+					'href' => true,
+				),
+				'br'     => true,
+				'em'     => true,
+				'strong' => true,
+			)
+		);
+
+		$this->set_main_error_message( $string, $current_error );
+		$this->messages[] = $string;
+	}
+}
diff --git a/projects/packages/plugins-installer/src/class-plugins-installer.php b/projects/packages/plugins-installer/src/class-plugins-installer.php
new file mode 100644
index 0000000000000..bae23baa0a249
--- /dev/null
+++ b/projects/packages/plugins-installer/src/class-plugins-installer.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Plugins Library
+ *
+ * Helper functions for installing and activating plugins.
+ *
+ * Used by the REST API
+ *
+ * @package jetpack-plugins-installer
+ */
+
+namespace Automattic\Jetpack;
+
+use Plugin_Upgrader;
+use WP_Error;
+
+/**
+ * Plugins management tools.
+ */
+class Plugins_Installer {
+
+	/**
+	 * Ensures that plugins functions are loaded, as they are only loaded in admin context by default.
+	 */
+	private static function ensure_plugin_functions_are_loaded() {
+		if ( ! function_exists( 'get_plugins' ) ) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+	}
+	/**
+	 * Install and activate a plugin.
+	 *
+	 * @since-jetpack 5.8.0
+	 *
+	 * @param string $slug Plugin slug.
+	 *
+	 * @return bool|WP_Error True if installation succeeded, error object otherwise.
+	 */
+	public static function install_and_activate_plugin( $slug ) {
+		$plugin_id = self::get_plugin_id_by_slug( $slug );
+
+		if ( ! $plugin_id ) {
+			$installed = self::install_plugin( $slug );
+			if ( is_wp_error( $installed ) ) {
+				return $installed;
+			}
+			$plugin_id = self::get_plugin_id_by_slug( $slug );
+		} elseif ( self::is_plugin_active( $plugin_id ) ) {
+			return true; // Already installed and active.
+		}
+
+		if ( ! current_user_can( 'activate_plugins' ) ) {
+			return new WP_Error( 'not_allowed', __( 'You are not allowed to activate plugins on this site.', 'jetpack-plugins-installer' ) );
+		}
+		$activated = activate_plugin( $plugin_id );
+		if ( is_wp_error( $activated ) ) {
+			return $activated;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Install a plugin.
+	 *
+	 * @since-jetpack 5.8.0
+	 *
+	 * @param string $slug Plugin slug.
+	 *
+	 * @return bool|WP_Error True if installation succeeded, error object otherwise.
+	 */
+	public static function install_plugin( $slug ) {
+		if ( is_multisite() && ! current_user_can( 'manage_network' ) ) {
+			return new WP_Error( 'not_allowed', __( 'You are not allowed to install plugins on this site.', 'jetpack-plugins-installer' ) );
+		}
+
+		$skin     = new Automatic_Install_Skin();
+		$upgrader = new Plugin_Upgrader( $skin );
+		$zip_url  = self::generate_wordpress_org_plugin_download_link( $slug );
+		$mc_stats = new A8c_Mc_Stats();
+
+		$result = $upgrader->install( $zip_url );
+
+		if ( is_wp_error( $result ) ) {
+			$mc_stats->add( 'install-plugin', "fail-$slug" );
+			return $result;
+		}
+
+		$plugin     = self::get_plugin_id_by_slug( $slug );
+		$error_code = 'install_error';
+		if ( ! $plugin ) {
+			$error = __( 'There was an error installing your plugin', 'jetpack-plugins-installer' );
+		}
+
+		if ( ! $result ) {
+			$error_code = $upgrader->skin->get_main_error_code();
+			$message    = $upgrader->skin->get_main_error_message();
+			$error      = $message ? $message : __( 'An unknown error occurred during installation', 'jetpack-plugins-installer' );
+		}
+
+		if ( ! empty( $error ) ) {
+			if ( 'download_failed' === $error_code ) {
+				// For backwards compatibility: versions prior to 3.9 would return no_package instead of download_failed.
+				$error_code = 'no_package';
+			}
+
+			$mc_stats->add( 'install-plugin', "fail-$slug" );
+			return new WP_Error( $error_code, $error, 400 );
+		}
+
+		$mc_stats->add( 'install-plugin', "success-$slug" );
+		return (array) $upgrader->skin->get_upgrade_messages();
+	}
+
+	/**
+	 * Get WordPress.org zip download link from a plugin slug
+	 *
+	 * @param string $plugin_slug Plugin slug.
+	 */
+	protected static function generate_wordpress_org_plugin_download_link( $plugin_slug ) {
+		return "https://downloads.wordpress.org/plugin/$plugin_slug.latest-stable.zip";
+	}
+
+	/**
+	 * Get the plugin ID (composed of the plugin slug and the name of the main plugin file) from a plugin slug.
+	 *
+	 * @param string $slug Plugin slug.
+	 */
+	public static function get_plugin_id_by_slug( $slug ) {
+		// Check if get_plugins() function exists. This is required on the front end of the
+		// site, since it is in a file that is normally only loaded in the admin.
+		if ( ! function_exists( 'get_plugins' ) ) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+
+		/** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
+		$plugins = apply_filters( 'all_plugins', get_plugins() );
+		if ( ! is_array( $plugins ) ) {
+			return false;
+		}
+
+		foreach ( $plugins as $plugin_file => $plugin_data ) {
+			if ( self::get_slug_from_file_path( $plugin_file ) === $slug ) {
+				return $plugin_file;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the plugin slug from the plugin ID (composed of the plugin slug and the name of the main plugin file)
+	 *
+	 * @param string $plugin_file Plugin file (ID -- e.g. hello-dolly/hello.php).
+	 */
+	protected static function get_slug_from_file_path( $plugin_file ) {
+		// Similar to get_plugin_slug() method.
+		$slug = dirname( $plugin_file );
+		if ( '.' === $slug ) {
+			$slug = preg_replace( '/(.+)\.php$/', '$1', $plugin_file );
+		}
+
+		return $slug;
+	}
+
+	/**
+	 * Get the activation status for a plugin.
+	 *
+	 * @since-jetpack 8.9.0
+	 *
+	 * @param string $plugin_file The plugin file to check.
+	 * @return string Either 'network-active', 'active' or 'inactive'.
+	 */
+	public static function get_plugin_status( $plugin_file ) {
+		if ( self::is_plugin_active_for_network( $plugin_file ) ) {
+			return 'network-active';
+		}
+
+		if ( self::is_plugin_active( $plugin_file ) ) {
+			return 'active';
+		}
+
+		return 'inactive';
+	}
+
+	/**
+	 * Safely checks if the plugin is active
+	 *
+	 * @since $next-version$
+	 *
+	 * @param string $plugin_file The plugin file to check.
+	 * @return bool
+	 */
+	public static function is_plugin_active( $plugin_file ) {
+		self::ensure_plugin_functions_are_loaded();
+		return is_plugin_active( $plugin_file );
+	}
+
+	/**
+	 * Safely checks if the plugin is active for network
+	 *
+	 * @since $next-version$
+	 *
+	 * @param string $plugin_file The plugin file to check.
+	 * @return bool
+	 */
+	public static function is_plugin_active_for_network( $plugin_file ) {
+		self::ensure_plugin_functions_are_loaded();
+		return is_plugin_active_for_network( $plugin_file );
+	}
+
+	/**
+	 * Returns a list of all plugins in the site.
+	 *
+	 * @since-jetpack 8.9.0
+	 * @uses get_plugins()
+	 *
+	 * @return array
+	 */
+	public static function get_plugins() {
+		self::ensure_plugin_functions_are_loaded();
+		/** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
+		$plugins = apply_filters( 'all_plugins', get_plugins() );
+
+		if ( is_array( $plugins ) && ! empty( $plugins ) ) {
+			foreach ( $plugins as $plugin_slug => $plugin_data ) {
+				$plugins[ $plugin_slug ]['active'] = in_array(
+					self::get_plugin_status( $plugin_slug ),
+					array( 'active', 'network-active' ),
+					true
+				);
+			}
+			return $plugins;
+		}
+
+		return array();
+	}
+}
diff --git a/projects/packages/plugins-installer/tests/php/bootstrap.php b/projects/packages/plugins-installer/tests/php/bootstrap.php
new file mode 100644
index 0000000000000..46763b04a2cdb
--- /dev/null
+++ b/projects/packages/plugins-installer/tests/php/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Bootstrap.
+ *
+ * @package automattic/
+ */
+
+/**
+ * Include the composer autoloader.
+ */
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/projects/packages/post-list/.gitattributes b/projects/packages/post-list/.gitattributes
index aa7a3dc0b8739..ce049221eed22 100644
--- a/projects/packages/post-list/.gitattributes
+++ b/projects/packages/post-list/.gitattributes
@@ -4,6 +4,7 @@
 package.json      export-ignore
 webpack.config.js export-ignore
 gulpfile.babel.js export-ignore
+phpunit.xml.dist  export-ignore
 .babelrc          export-ignore
 
 # Files to include in the mirror repo
diff --git a/projects/packages/post-list/CHANGELOG.md b/projects/packages/post-list/CHANGELOG.md
index 3ddec6edc7515..423fa9bc81234 100644
--- a/projects/packages/post-list/CHANGELOG.md
+++ b/projects/packages/post-list/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2022-02-01
+### Changed
+- Build: remove unneeded files from production build.
+- Switch to pcov for code coverage.
+- Updated package dependencies.
+- Updated package textdomain from `jetpack` to `jetpack-post-list`.
+
 ## [0.2.4] - 2021-11-19
 ### Fixed
 - Fixed the stretched thumbnails when using a non-square image.
@@ -44,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated the default columns displayed on the post and page list screens
 - Refactored thumbnail preview to function server side. All javascript removed.
 
+[0.3.0]: https://github.com/automattic/jetpack-post-list/compare/v0.2.4...v0.3.0
 [0.2.4]: https://github.com/automattic/jetpack-post-list/compare/v0.2.3...v0.2.4
 [0.2.3]: https://github.com/automattic/jetpack-post-list/compare/v0.2.2...v0.2.3
 [0.2.2]: https://github.com/automattic/jetpack-post-list/compare/v0.2.1...v0.2.2
diff --git a/projects/packages/post-list/changelog/add-assets-support-for-i18n-loader b/projects/packages/post-list/changelog/add-assets-support-for-i18n-loader
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/post-list/changelog/add-assets-support-for-i18n-loader
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/post-list/changelog/add-assets-textdomain-aliasing b/projects/packages/post-list/changelog/add-assets-textdomain-aliasing
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/post-list/changelog/add-assets-textdomain-aliasing
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/post-list/changelog/add-phpcs-per-director-config#2 b/projects/packages/post-list/changelog/add-phpcs-per-director-config#2
deleted file mode 100644
index 8442e07b8d239..0000000000000
--- a/projects/packages/post-list/changelog/add-phpcs-per-director-config#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Added project-specific phpcs configuration (for i18n textdomain).
-
-
diff --git a/projects/packages/post-list/changelog/add-phpcs-sniff-for-assets-register_script-textdomain b/projects/packages/post-list/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
deleted file mode 100644
index a9a10b1f78b52..0000000000000
--- a/projects/packages/post-list/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Configure Jetpack.Functions.I18n
-
-
diff --git a/projects/packages/post-list/changelog/add-register_script-textdomain b/projects/packages/post-list/changelog/add-register_script-textdomain
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/post-list/changelog/add-register_script-textdomain
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/post-list/changelog/fix-phpcs-textdomain-config b/projects/packages/post-list/changelog/fix-phpcs-textdomain-config
deleted file mode 100644
index d2eddd8126925..0000000000000
--- a/projects/packages/post-list/changelog/fix-phpcs-textdomain-config
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fixed incorrect syntax for specifying textdomain for WordPress.WP.I18n.
-
-
diff --git a/projects/packages/post-list/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/packages/post-list/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/packages/post-list/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/packages/post-list/changelog/try-pcov b/projects/packages/post-list/changelog/try-pcov
deleted file mode 100644
index bbcd26b6ce57e..0000000000000
--- a/projects/packages/post-list/changelog/try-pcov
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Switch to pcov for code coverage.
diff --git a/projects/packages/post-list/changelog/update-composer b/projects/packages/post-list/changelog/update-composer
deleted file mode 100644
index 9d476b2308bac..0000000000000
--- a/projects/packages/post-list/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Tooling update: Use composer 2.2.
-
-
diff --git a/projects/packages/post-list/changelog/update-composer_package_types b/projects/packages/post-list/changelog/update-composer_package_types
deleted file mode 100644
index c9b415b0b8dab..0000000000000
--- a/projects/packages/post-list/changelog/update-composer_package_types
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Change package type to jetpack-library
-
-
diff --git a/projects/packages/post-list/changelog/update-package-textdomains b/projects/packages/post-list/changelog/update-package-textdomains
deleted file mode 100644
index 7c569538a926f..0000000000000
--- a/projects/packages/post-list/changelog/update-package-textdomains
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Updated package textdomain from `jetpack` to `jetpack-post-list`.
diff --git a/projects/packages/post-list/changelog/update-project-scripts-no-install b/projects/packages/post-list/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/post-list/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/post-list/composer.json b/projects/packages/post-list/composer.json
index 2747b8c729e7e..59d3c65b2c676 100644
--- a/projects/packages/post-list/composer.json
+++ b/projects/packages/post-list/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-assets": "^1.16"
+		"automattic/jetpack-assets": "^1.17"
 	},
 	"require-dev": {
 		"automattic/wordbless": "@dev",
diff --git a/projects/packages/post-list/src/class-post-list.php b/projects/packages/post-list/src/class-post-list.php
index d15f6e3807f2e..cacf326fc57da 100644
--- a/projects/packages/post-list/src/class-post-list.php
+++ b/projects/packages/post-list/src/class-post-list.php
@@ -12,7 +12,7 @@
  */
 class Post_List {
 
-	const PACKAGE_VERSION = '0.3.0-alpha';
+	const PACKAGE_VERSION = '0.3.0';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
diff --git a/projects/packages/publicize/.gitattributes b/projects/packages/publicize/.gitattributes
new file mode 100644
index 0000000000000..9f76af3f06e7e
--- /dev/null
+++ b/projects/packages/publicize/.gitattributes
@@ -0,0 +1,16 @@
+# Files not needed to be distributed in the package.
+.gitattributes    export-ignore
+.github/          export-ignore
+package.json      export-ignore
+
+# Files to include in the mirror repo, but excluded via gitignore
+# Remember to end all directories with `/**` to properly tag every file.
+# /src/js/example.min.js  production-include
+
+# Files to exclude from the mirror repo, but included in the monorepo.
+# Remember to end all directories with `/**` to properly tag every file.
+.gitignore        production-exclude
+changelog/**      production-exclude
+phpunit.xml.dist  production-exclude
+.phpcs.dir.xml    production-exclude
+tests/**          production-exclude
diff --git a/projects/packages/publicize/.gitignore b/projects/packages/publicize/.gitignore
new file mode 100644
index 0000000000000..140fd587d2d52
--- /dev/null
+++ b/projects/packages/publicize/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+node_modules/
diff --git a/projects/packages/publicize/.phpcs.dir.xml b/projects/packages/publicize/.phpcs.dir.xml
new file mode 100644
index 0000000000000..2f726af7ea808
--- /dev/null
+++ b/projects/packages/publicize/.phpcs.dir.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset>
+
+	<rule ref="WordPress.WP.I18n">
+		<properties>
+			<property name="text_domain" type="array">
+				<element value="jetpack-publicize-pkg" />
+			</property>
+		</properties>
+	</rule>
+	<rule ref="Jetpack.Functions.I18n">
+		<properties>
+			<property name="text_domain" value="jetpack-publicize-pkg" />
+		</properties>
+	</rule>
+
+	<rule ref="WordPress.Utils.I18nTextDomainFixer">
+		<properties>
+			<property name="old_text_domain" type="array" />
+			<property name="new_text_domain" value="jetpack-publicize-pkg" />
+		</properties>
+	</rule>
+
+</ruleset>
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
new file mode 100644
index 0000000000000..721294abd00ad
--- /dev/null
+++ b/projects/packages/publicize/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
diff --git a/projects/packages/publicize/README.md b/projects/packages/publicize/README.md
new file mode 100644
index 0000000000000..f2da9fce18e02
--- /dev/null
+++ b/projects/packages/publicize/README.md
@@ -0,0 +1,3 @@
+# Publicize
+
+Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.
diff --git a/projects/packages/publicize/changelog/.gitkeep b/projects/packages/publicize/changelog/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/packages/publicize/changelog/add-publicize-composer-package b/projects/packages/publicize/changelog/add-publicize-composer-package
new file mode 100644
index 0000000000000..c12b9edd39cf9
--- /dev/null
+++ b/projects/packages/publicize/changelog/add-publicize-composer-package
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added an empty shell package
diff --git a/projects/packages/publicize/composer.json b/projects/packages/publicize/composer.json
new file mode 100644
index 0000000000000..253cb81cd2d95
--- /dev/null
+++ b/projects/packages/publicize/composer.json
@@ -0,0 +1,51 @@
+{
+	"name": "automattic/jetpack-publicize",
+	"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
+	"type": "library",
+	"license": "GPL-2.0-or-later",
+	"require": {},
+	"require-dev": {
+		"yoast/phpunit-polyfills": "1.0.3",
+		"automattic/jetpack-changelogger": "^3.0"
+	},
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	},
+	"scripts": {
+		"phpunit": [
+			"./vendor/phpunit/phpunit/phpunit --colors=always"
+		],
+		"test-coverage": [
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+		],
+		"test-php": [
+			"@composer phpunit"
+		],
+		"build-production": "echo 'Add your build step to composer.json, please!'",
+		"build-development": "echo 'Add your build step to composer.json, please!'"
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../packages/*",
+			"options": {
+				"monorepo": true
+			}
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"extra": {
+		"autotagger": true,
+		"mirror-repo": "Automattic/jetpack-publicize",
+		"textdomain": "jetpack-publicize-pkg",
+		"changelogger": {
+			"link-template": "https://github.com/Automattic/jetpack-publicize/compare/v${old}...v${new}"
+		},
+		"branch-alias": {
+			"dev-master": "0.1.x-dev"
+		}
+	}
+}
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
new file mode 100644
index 0000000000000..e14b3b8349666
--- /dev/null
+++ b/projects/packages/publicize/package.json
@@ -0,0 +1,29 @@
+{
+	"private": true,
+	"name": "@automattic/jetpack-publicize",
+	"version": "0.1.0-alpha",
+	"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
+	"homepage": "https://jetpack.com",
+	"bugs": {
+		"url": "https://github.com/Automattic/jetpack/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/Automattic/jetpack.git"
+	},
+	"license": "GPL-2.0-or-later",
+	"author": "Automattic",
+	"scripts": {
+		"build": "echo 'Not implemented.",
+		"build-js": "echo 'Not implemented.",
+		"build-production": "echo 'Not implemented.",
+		"build-production-js": "echo 'Not implemented.",
+		"clean": "true"
+	},
+	"devDependencies": {},
+	"engines": {
+		"node": "^14.18.3 || ^16.13.2",
+		"pnpm": "^6.23.6",
+		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
+	}
+}
diff --git a/projects/packages/publicize/phpunit.xml.dist b/projects/packages/publicize/phpunit.xml.dist
new file mode 100644
index 0000000000000..3223c32458db2
--- /dev/null
+++ b/projects/packages/publicize/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" convertDeprecationsToExceptions="true">
+	<testsuites>
+		<testsuite name="main">
+			<directory prefix="test" suffix=".php">tests/php</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="false">
+			<!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
+			<!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/projects/packages/publicize/src/example.php b/projects/packages/publicize/src/example.php
new file mode 100644
index 0000000000000..b3715119facc5
--- /dev/null
+++ b/projects/packages/publicize/src/example.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Put your classes in this `src` folder!
+ *
+ * @package automattic/jetpack-publicize
+ */
+
+// Start your code here!
diff --git a/projects/packages/publicize/tests/php/bootstrap.php b/projects/packages/publicize/tests/php/bootstrap.php
new file mode 100644
index 0000000000000..7ca2ff1aaf4b5
--- /dev/null
+++ b/projects/packages/publicize/tests/php/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Bootstrap.
+ *
+ * @package automattic/jetpack-publicize
+ */
+
+/**
+ * Include the composer autoloader.
+ */
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/projects/packages/redirect/CHANGELOG.md b/projects/packages/redirect/CHANGELOG.md
index 5af72f2d865f3..b41c44f35b696 100644
--- a/projects/packages/redirect/CHANGELOG.md
+++ b/projects/packages/redirect/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.10] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.7.9] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -118,6 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Create Jetpack Redirect package
 
+[1.7.10]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.9...v1.7.10
 [1.7.9]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.8...v1.7.9
 [1.7.8]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.7...v1.7.8
 [1.7.7]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.6...v1.7.7
diff --git a/projects/packages/redirect/changelog/add-visitor-status b/projects/packages/redirect/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/redirect/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/redirect/changelog/update-project-scripts-no-install b/projects/packages/redirect/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/redirect/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/roles/CHANGELOG.md b/projects/packages/roles/CHANGELOG.md
index 86d4e90e166af..e194bed7f8e68 100644
--- a/projects/packages/roles/CHANGELOG.md
+++ b/projects/packages/roles/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.14] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.4.13] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -107,6 +111,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Jetpack DNA: Introduce a Roles package
 
+[1.4.14]: https://github.com/Automattic/jetpack-roles/compare/v1.4.13...v1.4.14
 [1.4.13]: https://github.com/Automattic/jetpack-roles/compare/v1.4.12...v1.4.13
 [1.4.12]: https://github.com/Automattic/jetpack-roles/compare/v1.4.11...v1.4.12
 [1.4.11]: https://github.com/Automattic/jetpack-roles/compare/v1.4.10...v1.4.11
diff --git a/projects/packages/roles/changelog/update-project-scripts-no-install b/projects/packages/roles/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/roles/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/search/.eslintignore b/projects/packages/search/.eslintignore
index 71b654d0655e5..d44a8f5129c90 100644
--- a/projects/packages/search/.eslintignore
+++ b/projects/packages/search/.eslintignore
@@ -1 +1,4 @@
 **/external/*.js
+/build
+/src/widgets/js/search-widget-admin.js
+/src/widgets/js/search-widget.js
diff --git a/projects/packages/search/.gitattributes b/projects/packages/search/.gitattributes
index 16aad79ba0cd9..c0ff5ae6871b1 100644
--- a/projects/packages/search/.gitattributes
+++ b/projects/packages/search/.gitattributes
@@ -10,6 +10,8 @@ package.json                                             export-ignore
 /changelog/**                                            production-exclude
 /.gitignore                                              production-exclude
 /.eslintrc.js                                            production-exclude
+/.eslintignore                                           production-exclude
+/.size-limit.js                                          production-exclude
 /babel.config*                                           production-exclude
 /jest.config.js                                          production-exclude
 /postcss.config.js                                       production-exclude
@@ -19,5 +21,7 @@ package.json                                             export-ignore
 /src/**/test/**                                          production-exclude
 /src/**/*.scss                                           production-exclude
 # JS scripts to integrate with customizer and wigets might need to be explicitly included.
-/src/**/*.[jt]s?(x)                                      production-exclude
+/src/**/*.js                                             production-exclude
+/src/**/*.jsx                                            production-exclude
+/src/**/*.ts                                             production-exclude
 .phpcs.dir.xml                                           production-exclude
diff --git a/projects/packages/search/CHANGELOG.md b/projects/packages/search/CHANGELOG.md
index df78fda6b419f..585d508a72c41 100644
--- a/projects/packages/search/CHANGELOG.md
+++ b/projects/packages/search/CHANGELOG.md
@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.0] - 2022-02-02
+### Added
+- Add `@use "sass:math"` in base styles scss for upcoming `@wordpress/block-editor` 8.1.0 requirement.
+- Search package: added package version number and others
+
+### Changed
+- Build: remove unneeded files from production build.
+- Instant Search: add image alt text from API
+- Updated package dependencies.
+
+## [0.5.4] - 2022-01-31
+### Fixed
+- Search: Fetch plan info as blog, not as user, to allow nonconnected admins to use dashboard
+
+## [0.5.3] - 2022-01-27
+### Fixed
+- Search package: fixed compatibility issue with plan activation
+
+## [0.5.2] - 2022-01-25
+### Added
+- Added a watch command for building assets
+- Search E2E: added class names for some form components for easier E2E tests
+
+### Changed
+- Search: Improve accessibility via headings hierarchy and aria roles
+- Updated package dependencies.
+
+### Fixed
+- Search widget: changed fetching search result to just before rendering jp search widget
+
 ## [0.5.1] - 2022-01-18
 ### Changed
 - General: update required node version to v16.13.2
@@ -58,6 +88,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies.
 - Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't.
 
+[0.6.0]: https://github.com/Automattic/jetpack-search/compare/v0.5.4...v0.6.0
+[0.5.4]: https://github.com/Automattic/jetpack-search/compare/v0.5.3...v0.5.4
+[0.5.3]: https://github.com/Automattic/jetpack-search/compare/v0.5.2...v0.5.3
+[0.5.2]: https://github.com/Automattic/jetpack-search/compare/v0.5.1...v0.5.2
 [0.5.1]: https://github.com/Automattic/jetpack-search/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Automattic/jetpack-search/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/Automattic/jetpack-search/compare/v0.3.0...v0.4.0
diff --git a/projects/packages/search/changelog/add-fancy-eslint-ignore b/projects/packages/search/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/search/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/packages/search/changelog/add-record-meter-scaffolding b/projects/packages/search/changelog/add-record-meter-scaffolding
new file mode 100644
index 0000000000000..d93ab87befa46
--- /dev/null
+++ b/projects/packages/search/changelog/add-record-meter-scaffolding
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Search Dashboard: add scaffolding for new record meter
diff --git a/projects/packages/search/changelog/add-search-customberg-e2e b/projects/packages/search/changelog/add-search-customberg-e2e
deleted file mode 100644
index 22177ccef9a15..0000000000000
--- a/projects/packages/search/changelog/add-search-customberg-e2e
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Search E2E: added class names for some form components for easier E2E tests
diff --git a/projects/packages/search/changelog/add-visitor-status b/projects/packages/search/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/search/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/search/changelog/fix-remove-unecessary-search-request b/projects/packages/search/changelog/fix-remove-unecessary-search-request
deleted file mode 100644
index 1fd1a965364a0..0000000000000
--- a/projects/packages/search/changelog/fix-remove-unecessary-search-request
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Search widget: changed fetching search result to just before rendering jp search widget
diff --git a/projects/packages/search/changelog/fix-search-e2e-block-themes b/projects/packages/search/changelog/fix-search-e2e-block-themes
new file mode 100644
index 0000000000000..f0f805626dd85
--- /dev/null
+++ b/projects/packages/search/changelog/fix-search-e2e-block-themes
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Search package: added auto config CLI
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#3 b/projects/packages/search/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo#3
rename to projects/packages/search/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/2022-01-18-09-57-37-701551 b/projects/packages/search/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/2022-01-18-09-57-37-701551
rename to projects/packages/search/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/packages/search/changelog/search-move-widget-to-package b/projects/packages/search/changelog/search-move-widget-to-package
new file mode 100644
index 0000000000000..bdda1545d9c0c
--- /dev/null
+++ b/projects/packages/search/changelog/search-move-widget-to-package
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Search: move search widgets to package
diff --git a/projects/packages/search/changelog/update-instant-search-a11y-aria-and-headings b/projects/packages/search/changelog/update-instant-search-a11y-aria-and-headings
deleted file mode 100644
index 7acc6b22a91e3..0000000000000
--- a/projects/packages/search/changelog/update-instant-search-a11y-aria-and-headings
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Search: Improve accessibility via headings hierarchy and aria roles
diff --git a/projects/packages/search/changelog/update-project-scripts-no-install b/projects/packages/search/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/search/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/search/composer.json b/projects/packages/search/composer.json
index 95fce06f3d992..0493e0cf7f609 100644
--- a/projects/packages/search/composer.json
+++ b/projects/packages/search/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-connection": "^1.36",
-		"automattic/jetpack-assets": "^1.16",
+		"automattic/jetpack-assets": "^1.17",
 		"automattic/jetpack-constants": "^1.6",
 		"automattic/jetpack-tracking": "^1.14",
 		"automattic/jetpack-options": "^1.14",
@@ -17,6 +17,9 @@
 		"automattic/wordbless": "0.3.1"
 	},
 	"autoload": {
+		"files": [
+			"search.php"
+		],
 		"classmap": [
 			"src/"
 		]
@@ -44,7 +47,11 @@
 		"test-php": [
 			"@composer phpunit"
 		],
-		"post-update-cmd": "php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\""
+		"post-update-cmd": "php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\"",
+		"watch": [
+			"Composer\\Config::disableProcessTimeout",
+			"pnpm run watch"
+		]
 	},
 	"repositories": [
 		{
@@ -65,7 +72,10 @@
 			"link-template": "https://github.com/Automattic/jetpack-search/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "0.5.x-dev"
+			"dev-master": "0.7.x-dev"
+		},
+		"version-constants": {
+			"JETPACK_SEARCH_PKG__VERSION": "search.php"
 		}
 	},
 	"config": {
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index 3ec3e2e079cd9..0c00ef6575300 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-search",
-	"version": "0.5.2-alpha",
+	"version": "0.7.0-alpha",
 	"description": "Package for Jetpack Search products",
 	"main": "main.js",
 	"directories": {
@@ -17,7 +17,8 @@
 		"test": "pnpx concurrently 'pnpm:test-scripts' 'pnpm:test-size'",
 		"test-scripts": "jest --passWithNoTests",
 		"test-size": "NODE_ENV=production BABEL_ENV=production pnpm run build-instant && size-limit",
-		"validate": "pnpm exec validate-es --no-error-on-unmatched-pattern build/"
+		"validate": "pnpm exec validate-es --no-error-on-unmatched-pattern build/",
+		"watch": "pnpx concurrently 'pnpm:build-instant -- --watch' 'pnpm:build-customberg -- --watch' 'pnpm:build-dashboard -- --watch'"
 	},
 	"repository": {
 		"type": "git",
@@ -37,15 +38,15 @@
 	"dependencies": {
 		"@automattic/calypso-color-schemes": "2.1.1",
 		"@automattic/color-studio": "2.5.0",
-		"@automattic/jetpack-analytics": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@wordpress/base-styles": "4.0.4",
-		"@wordpress/block-editor": "8.0.12",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/element": "4.0.4",
-		"@wordpress/i18n": "4.2.4",
-		"@wordpress/icons": "6.1.1",
+		"@automattic/jetpack-analytics": "workspace:^0.1.7",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@wordpress/base-styles": "4.1.0",
+		"@wordpress/block-editor": "8.1.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/element": "4.1.0",
+		"@wordpress/i18n": "4.3.0",
+		"@wordpress/icons": "6.2.0",
 		"classnames": "2.3.1",
 		"fast-json-stable-stringify": "2.1.0",
 		"gridicons": "3.3.1",
@@ -64,7 +65,7 @@
 		"tiny-lru": "7.0.6"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/plugin-proposal-nullish-coalescing-operator": "7.16.0",
 		"@babel/preset-env": "7.16.4",
@@ -74,7 +75,7 @@
 		"@testing-library/jest-dom": "5.14.1",
 		"@testing-library/preact": "2.0.1",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
+		"@wordpress/dependency-extraction-webpack-plugin": "3.3.0",
 		"concurrently": "6.4.0",
 		"jest": "27.3.1",
 		"jest-environment-jsdom": "27.3.1",
diff --git a/projects/packages/search/search.php b/projects/packages/search/search.php
new file mode 100644
index 0000000000000..88b7a9f8cd774
--- /dev/null
+++ b/projects/packages/search/search.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Search global definitions and operations.
+ *
+ * @package automattic/jetpack-search
+ */
+
+namespace Automattic\Jetpack\Search;
+
+define( 'JETPACK_SEARCH_PKG__VERSION', '0.7.0-alpha' );
+define( 'JETPACK_SEARCH_PKG__DIR', __DIR__ . '/' );
+define( 'JETPACK_SEARCH_PKG__SLUG', 'search' );
+
+// If WordPress's plugin API is available already, use it. If not,
+// drop data into `$wp_filter` for `WP_Hook::build_preinitialized_hooks()`.
+if ( function_exists( 'add_filter' ) ) {
+	$add_filter = 'add_filter';
+	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	$add_action = 'add_action';
+} else {
+	$add_filter = function ( $name, $cb, $priority = 10, $accepted_args = 1 ) {
+		global $wp_filter;
+		// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		$wp_filter[ $name ][ $priority ][] = array(
+			'accepted_args' => $accepted_args,
+			'function'      => $cb,
+		);
+	};
+	// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	$add_action = $add_filter;
+}
+
+/**
+ * Adds the package slug and version to the package version tracker's data.
+ *
+ * @param array $package_versions The package version array.
+ *
+ * @return array The packge version array.
+ */
+function send_version_to_tracker( $package_versions ) {
+	$package_versions[ JETPACK_SEARCH_PKG__SLUG ] = JETPACK_SEARCH_PKG__VERSION;
+	return $package_versions;
+}
+
+/**
+ * Whether Jetpack Search Package's version maps to a public release, or a development version.
+ */
+function is_development_version() {
+	return (bool) apply_filters(
+		'jetpack_search_pkg_version',
+		! preg_match( '/^\d+(\.\d+)+$/', JETPACK_SEARCH_PKG__VERSION )
+	);
+}
+
+// Set up package version hook.
+$add_filter( 'jetpack_package_versions', __NAMESPACE__ . '\send_version_to_tracker' );
+
+if ( defined( 'WP_CLI' ) && \WP_CLI ) {
+	\WP_CLI::add_command( 'jetpack-search', __NAMESPACE__ . '\CLI' );
+}
diff --git a/projects/packages/search/src/class-cli.php b/projects/packages/search/src/class-cli.php
new file mode 100644
index 0000000000000..1f121f9a46a5e
--- /dev/null
+++ b/projects/packages/search/src/class-cli.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * CLI class exposed by WPCLI
+ *
+ * @package    automattic/jetpack-search
+ */
+
+namespace Automattic\Jetpack\Search;
+
+use \Jetpack_Options;
+use \WP_CLI;
+use \WP_CLI_Command;
+
+/**
+ * Provide functionality by WPCLI.
+ */
+class CLI extends WP_CLI_Command {
+	/**
+	 * Auto config instant search, including set result format, set up overlay widgets and add a search input to the home page thru widgets or blocks.
+	 *
+	 * ## EXAMPLES
+	 *
+	 * wp jetpack-search auto_config
+	 */
+	public function auto_config() {
+		try {
+			$blog_id = ( defined( 'IS_WPCOM' ) && constant( 'IS_WPCOM' ) ) ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );
+			Instant_Search::initialize( $blog_id );
+			Instant_Search::instance()->auto_config_search();
+			WP_CLI::line( 'Jetpack Search: auto config success!' );
+		} catch ( \Exception $e ) {
+			WP_CLI::error( $e->getMessage() );
+		}
+	}
+}
diff --git a/projects/packages/search/src/class-helper.php b/projects/packages/search/src/class-helper.php
index 3e2829a37e6c6..fd82e91265901 100644
--- a/projects/packages/search/src/class-helper.php
+++ b/projects/packages/search/src/class-helper.php
@@ -712,11 +712,9 @@ public static function is_valid_locale( $locale ) {
 	 * @return string $script_version Version number.
 	 */
 	public static function get_asset_version( $file ) {
-		// TODO: Replace Jetpack:: invocation.
-		// TODO: Replace JETPACK__PLUGIN_DIR and JETPACK__VERSION.
-		return Jetpack::is_development_version() && file_exists( JETPACK__PLUGIN_DIR . $file )
-			? filemtime( JETPACK__PLUGIN_DIR . $file )
-			: JETPACK__VERSION;
+		return is_development_version() && file_exists( JETPACK_SEARCH_PKG__DIR . $file )
+			? filemtime( JETPACK_SEARCH_PKG__DIR . $file )
+			: JETPACK_SEARCH_PKG__VERSION;
 	}
 
 	/**
diff --git a/projects/packages/search/src/class-plan.php b/projects/packages/search/src/class-plan.php
index 49e54f082fe52..4748653058879 100644
--- a/projects/packages/search/src/class-plan.php
+++ b/projects/packages/search/src/class-plan.php
@@ -43,9 +43,12 @@ public function init_hooks() {
 	 */
 	public function get_plan_info_from_wpcom() {
 		$blog_id  = Jetpack_Options::get_option( 'id' );
-		$response = Client::wpcom_json_api_request_as_user(
+		$response = Client::wpcom_json_api_request_as_blog(
 			'/sites/' . $blog_id . '/jetpack-search/plan',
-			'2'
+			'2',
+			array(),
+			null,
+			'wpcom'
 		);
 
 		// store plan in options.
@@ -84,7 +87,7 @@ public function has_jetpack_search_product() {
 	 */
 	public function supports_instant_search() {
 		$plan_info = $this->get_plan_info();
-		return isset( $plan_info['supports_instant_search'] ) && $plan_info['supports_instant_search'];
+		return ( isset( $plan_info['supports_instant_search'] ) && $plan_info['supports_instant_search'] ) || $this->has_jetpack_search_product();
 	}
 
 	/**
@@ -92,7 +95,7 @@ public function supports_instant_search() {
 	 */
 	public function supports_search() {
 		$plan_info = $this->get_plan_info();
-		return isset( $plan_info['supports_search'] ) && $plan_info['supports_search'];
+		return ( isset( $plan_info['supports_search'] ) && $plan_info['supports_search'] ) || $this->has_jetpack_search_product();
 	}
 
 	/**
diff --git a/projects/packages/search/src/customberg/class-customberg2.php b/projects/packages/search/src/customberg/class-customberg2.php
index 4acee2f7a15b4..60d91dcc2eb20 100644
--- a/projects/packages/search/src/customberg/class-customberg2.php
+++ b/projects/packages/search/src/customberg/class-customberg2.php
@@ -98,11 +98,7 @@ public function jetpack_search_admin_page() {
 	 * Loads assets for the customization experience.
 	 */
 	public function load_assets() {
-		if ( defined( 'JETPACK_SEARCH_PACKAGE_DIRECTORY' ) ) {
-			$this->load_assets_with_parameters(
-				constant( 'JETPACK_SEARCH_PACKAGE_DIRECTORY' )
-			);
-		}
+			$this->load_assets_with_parameters( constant( 'JETPACK_SEARCH_PKG__DIR' ) );
 	}
 
 	/**
diff --git a/projects/packages/search/src/customberg/lib/_base-styles.scss b/projects/packages/search/src/customberg/lib/_base-styles.scss
index f7e9e505161bf..008884d6c98f0 100644
--- a/projects/packages/search/src/customberg/lib/_base-styles.scss
+++ b/projects/packages/search/src/customberg/lib/_base-styles.scss
@@ -1,3 +1,4 @@
+@use "sass:math";
 @import '@wordpress/base-styles/z-index';
 
 // Fill in missing z-layer values from a more recent @wordpress/base-styles version.
diff --git a/projects/packages/search/src/dashboard/class-dashboard.php b/projects/packages/search/src/dashboard/class-dashboard.php
index d8bb144484027..86935a20d749a 100644
--- a/projects/packages/search/src/dashboard/class-dashboard.php
+++ b/projects/packages/search/src/dashboard/class-dashboard.php
@@ -47,7 +47,8 @@ class Dashboard {
 	 * @param Automattic\Jetpack\Search\Module_Control $module_control - Module_Control instance.
 	 */
 	public function __construct( $plan = null, $connection_manager = null, $module_control = null ) {
-		$this->plan               = $plan ? $plan : new Plan();
+		$this->plan = $plan ? $plan : new Plan();
+		// TODO: 'jetpack-search' better to be the current plugin where the package is running.
 		$this->connection_manager = $connection_manager ? $connection_manager : new Connection_Manager( 'jetpack-search' );
 		$this->module_control     = $module_control ? $module_control : new Module_Control( $this->plan );
 		$this->plan->init_hooks();
diff --git a/projects/packages/search/src/dashboard/class-initial-state.php b/projects/packages/search/src/dashboard/class-initial-state.php
index 25d16b582f17d..32622c0b76f2c 100644
--- a/projects/packages/search/src/dashboard/class-initial-state.php
+++ b/projects/packages/search/src/dashboard/class-initial-state.php
@@ -23,7 +23,7 @@ class Initial_State {
 	protected $connection_manager;
 
 	/**
-	 * Search Moduel Control
+	 * Search Module Control
 	 *
 	 * @var Module_Control
 	 */
@@ -36,6 +36,7 @@ class Initial_State {
 	 * @param Module_Control     $module_control - Module control instance.
 	 */
 	public function __construct( $connection_manager = null, $module_control = null ) {
+		// TODO: 'jetpack-search' better to be the current plugin where the package is running.
 		$this->connection_manager = $connection_manager ? $connection_manager : new Connection_Manager( 'jetpack-search' );
 		$this->module_control     = $module_control ? $module_control : new Module_Control();
 	}
@@ -80,6 +81,8 @@ public function get_initial_state() {
 				'search'                 => $this->module_control->is_active(),
 				'instant_search_enabled' => $this->module_control->is_instant_search_enabled(),
 			),
+			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			'features'        => array_map( 'sanitize_text_field', explode( ',', $_GET['features'] ) ),
 		);
 	}
 
diff --git a/projects/packages/search/src/dashboard/components/dashboard/index.jsx b/projects/packages/search/src/dashboard/components/dashboard/index.jsx
index 20dafb6411409..a577fde1b4536 100644
--- a/projects/packages/search/src/dashboard/components/dashboard/index.jsx
+++ b/projects/packages/search/src/dashboard/components/dashboard/index.jsx
@@ -19,6 +19,7 @@ import ModuleControl from 'components/module-control';
 import MockedSearch from 'components/mocked-search';
 import { STORE_ID } from 'store';
 import NoticesList from 'components/global-notices';
+import RecordMeter from 'components/record-meter';
 
 import 'scss/rna-styles.scss';
 import './style.scss';
@@ -169,6 +170,10 @@ export default function SearchDashboard() {
 		);
 	};
 
+	const isRecordMeterEnabled = useSelect( select =>
+		select( STORE_ID ).isFeatureEnabled( 'record-meter' )
+	);
+
 	return (
 		<div className="jp-search-dashboard-page">
 			{ isLoading && (
@@ -179,6 +184,7 @@ export default function SearchDashboard() {
 					{ renderHeader() }
 					{ renderMockedSearchInterface() }
 					{ renderModuleControl() }
+					{ isRecordMeterEnabled && <RecordMeter /> }
 					{ renderFooter() }
 				</Fragment>
 			) }
diff --git a/projects/packages/search/src/dashboard/components/record-meter/index.jsx b/projects/packages/search/src/dashboard/components/record-meter/index.jsx
new file mode 100644
index 0000000000000..3aad19b2091b4
--- /dev/null
+++ b/projects/packages/search/src/dashboard/components/record-meter/index.jsx
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+
+/**
+ * Generate Record Meter showing how many records the user has indexed
+ *
+ * @returns {React.Component} RecordMeter React component
+ */
+export default function RecordMeter() {
+	return (
+		<div className="jp-search-record-meter jp-search-dashboard-wrap">
+			<div className="jp-search-dashboard-row">
+				<div className="jp-search-record-meter__title lg-col-span-8 md-col-span-6 sm-col-span-4">
+					<h2>{ __( 'Your search records', 'jetpack-search-pkg' ) }</h2>
+				</div>
+				<div className="lg-col-span-2 md-col-span-1 sm-col-span-0"></div>
+			</div>
+		</div>
+	);
+}
diff --git a/projects/packages/search/src/dashboard/components/record-meter/style.scss b/projects/packages/search/src/dashboard/components/record-meter/style.scss
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/packages/search/src/dashboard/store/reducer/feature.js b/projects/packages/search/src/dashboard/store/reducer/feature.js
new file mode 100644
index 0000000000000..f48b1801d45e9
--- /dev/null
+++ b/projects/packages/search/src/dashboard/store/reducer/feature.js
@@ -0,0 +1,5 @@
+const features = ( state = [] ) => {
+	return state;
+};
+
+export default features;
diff --git a/projects/packages/search/src/dashboard/store/reducer/index.js b/projects/packages/search/src/dashboard/store/reducer/index.js
index cf7340059e8f3..8b739110d9c3a 100644
--- a/projects/packages/search/src/dashboard/store/reducer/index.js
+++ b/projects/packages/search/src/dashboard/store/reducer/index.js
@@ -10,6 +10,7 @@ import siteData from './site-data';
 import userData from './user-data';
 import jetpackSettings from './jetpack-settings';
 import sitePlan from './site-plan';
+import features from './feature';
 import notices from 'components/global-notices/store/reducer';
 
 const reducer = combineReducers( {
@@ -17,6 +18,7 @@ const reducer = combineReducers( {
 	jetpackSettings,
 	sitePlan,
 	userData,
+	features,
 	notices,
 } );
 
diff --git a/projects/packages/search/src/dashboard/store/selectors/feature.js b/projects/packages/search/src/dashboard/store/selectors/feature.js
new file mode 100644
index 0000000000000..b9beed07d12ce
--- /dev/null
+++ b/projects/packages/search/src/dashboard/store/selectors/feature.js
@@ -0,0 +1,7 @@
+const featureSelectors = {
+	isFeatureEnabled: ( state, feature ) => {
+		return Array.isArray( state.features ) && state.features.includes( feature );
+	},
+};
+
+export default featureSelectors;
diff --git a/projects/packages/search/src/dashboard/store/selectors/index.js b/projects/packages/search/src/dashboard/store/selectors/index.js
index 8020ea192ae9a..73306f156503c 100644
--- a/projects/packages/search/src/dashboard/store/selectors/index.js
+++ b/projects/packages/search/src/dashboard/store/selectors/index.js
@@ -6,6 +6,7 @@ import jetpackSettingSelectors from './jetpack-settings';
 import sitePlanSelectors from './site-plan';
 import userDataSelectors from './user-data';
 import noticeSelectors from 'components/global-notices/store/selectors';
+import featureSelectors from './feature';
 
 const selectors = {
 	...siteDataSelectors,
@@ -13,6 +14,7 @@ const selectors = {
 	...sitePlanSelectors,
 	...userDataSelectors,
 	...noticeSelectors,
+	...featureSelectors,
 };
 
 export default selectors;
diff --git a/projects/packages/search/src/initializers/class-jetpack-initializer.php b/projects/packages/search/src/initializers/class-jetpack-initializer.php
index 28a087b88f39d..3a70c6b0e1451 100644
--- a/projects/packages/search/src/initializers/class-jetpack-initializer.php
+++ b/projects/packages/search/src/initializers/class-jetpack-initializer.php
@@ -7,6 +7,8 @@
 
 namespace Automattic\Jetpack\Search;
 
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
+
 /**
  * Initializer for the main Jetpack plugin. Instantiate to enable Jetpack Search functionality.
  */
@@ -34,13 +36,8 @@ public static function initialize() {
 			return;
 		}
 
-		// TODO: Port the search widget to package for milestone 2.
-		require_once JETPACK__PLUGIN_DIR . 'modules/widgets/search.php';
-
-		/**
-		 * Location of built Jetpack Search assets, does not include trailing slash.
-		 */
-		define( 'JETPACK_SEARCH_PACKAGE_DIRECTORY', dirname( dirname( __DIR__ ) ) );
+		// registers Jetpack Search widget.
+		add_action( 'widgets_init', array( 'Automattic\Jetpack\Search\Jetpack_Initializer', 'jetpack_search_widget_init' ) );
 
 		if ( Options::is_instant_enabled() ) {
 			// Enable the instant search experience.
@@ -68,7 +65,8 @@ public static function initialize() {
 	 * Check if site has been connected.
 	 */
 	public static function is_connected() {
-		return \Jetpack::is_connection_ready();
+		// TODO: 'jetpack-search' better to be the current plugin where the package is running.
+		return ( new Connection_Manager( 'jetpack-search' ) )->is_connected();
 	}
 
 	/**
@@ -77,4 +75,21 @@ public static function is_connected() {
 	public static function is_search_supported() {
 		return ( new Plan() )->supports_search();
 	}
+
+	/**
+	 * Register the widget if Jetpack Search is available and enabled.
+	 */
+	public static function jetpack_search_widget_init() {
+		if (
+		! self::is_connected()
+		|| ! self::is_search_supported()
+		|| ! ( new Module_Control() )->is_active()
+		) {
+			return;
+		}
+
+		// There won't be multiple widgets registered when Search stand alone plugin registers it again.
+		// Because the function tests the hash of the class, if they are the same, just register again.
+		register_widget( 'Automattic\Jetpack\Search\Search_Widget' );
+	}
 }
diff --git a/projects/packages/search/src/instant-search/class-instant-search.php b/projects/packages/search/src/instant-search/class-instant-search.php
index cf832d000b744..ae1cdf3b7b0d7 100644
--- a/projects/packages/search/src/instant-search/class-instant-search.php
+++ b/projects/packages/search/src/instant-search/class-instant-search.php
@@ -70,11 +70,7 @@ public function init_hooks() {
 	 * Loads assets for Jetpack Instant Search Prototype featuring Search As You Type experience.
 	 */
 	public function load_assets() {
-		if ( defined( 'JETPACK_SEARCH_PACKAGE_DIRECTORY' ) ) {
-			$this->load_assets_with_parameters(
-				constant( 'JETPACK_SEARCH_PACKAGE_DIRECTORY' )
-			);
-		}
+			$this->load_assets_with_parameters( constant( 'JETPACK_SEARCH_PKG__DIR' ) );
 	}
 
 	/**
@@ -217,7 +213,7 @@ public function instant_api( array $args ) {
 
 		$request_args = array(
 			'timeout'    => 10,
-			'user-agent' => "WordPress/{$wp_version} | Jetpack/" . constant( 'JETPACK__VERSION' ),
+			'user-agent' => "WordPress/{$wp_version} | Jetpack-Search/" . constant( 'JETPACK_SEARCH_PKG__VERSION' ),
 		);
 
 		$request  = wp_remote_get( esc_url_raw( $service_url ), $request_args );
@@ -313,10 +309,6 @@ public function get_search_aggregations_results() {
 	 * @since  8.3.0
 	 */
 	public function auto_config_search() {
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return;
-		}
-
 		// Set default result format to "expanded".
 		update_option( Options::OPTION_PREFIX . 'result_format', Options::RESULT_FORMAT_EXPANDED );
 
@@ -367,6 +359,7 @@ public function auto_config_overlay_sidebar_widgets() {
 		$widget_opt_name = Helper::get_widget_option_name();
 		$widget_options  = get_option( $widget_opt_name, array() );
 		foreach ( $widget_options as $id => $w ) {
+			$id = intval( $id );
 			if ( $id >= $next_id ) {
 				$next_id = $id + 1;
 			}
diff --git a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
index d23c99005ce04..fcbdddb48a2af 100644
--- a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
@@ -77,7 +77,7 @@ export default function SearchResultExpanded( props ) {
 					<div className="jetpack-instant-search__search-result-expanded__image-container">
 						{ firstImage ? (
 							<PhotonImage
-								alt={ fields[ 'title.default' ] }
+								alt={ fields[ 'image.alt_text' ] }
 								className="jetpack-instant-search__search-result-expanded__image"
 								isPhotonEnabled={ props.isPhotonEnabled }
 								src={ `//${ firstImage }` }
diff --git a/projects/packages/search/src/instant-search/components/search-result-product.jsx b/projects/packages/search/src/instant-search/components/search-result-product.jsx
index 4b57e3a6379f7..1af746dc14dc6 100644
--- a/projects/packages/search/src/instant-search/components/search-result-product.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-product.jsx
@@ -59,7 +59,7 @@ class SearchResultProduct extends Component {
 					>
 						{ firstImage ? (
 							<PhotonImage
-								alt={ fields[ 'title.default' ] }
+								alt={ fields[ 'image.alt_text' ] }
 								className="jetpack-instant-search__search-result-product-img"
 								isPhotonEnabled={ this.props.isPhotonEnabled }
 								src={ `//${ firstImage }` }
diff --git a/projects/packages/search/src/instant-search/lib/api.js b/projects/packages/search/src/instant-search/lib/api.js
index 04589a793165c..44ae4795c0006 100644
--- a/projects/packages/search/src/instant-search/lib/api.js
+++ b/projects/packages/search/src/instant-search/lib/api.js
@@ -13,6 +13,7 @@ import { getFilterKeys } from './filters';
 import {
 	MINUTE_IN_MILLISECONDS,
 	MULTISITE_NO_GROUP_VALUE,
+	RESULT_FORMAT_MINIMAL,
 	RESULT_FORMAT_PRODUCT,
 	SERVER_OBJECT_NAME,
 } from './constants';
@@ -97,7 +98,7 @@ function generateAggregation( filter ) {
 
 const DATE_REGEX = /(\d{4})-(\d{2})-(\d{2})/;
 /**
- * Generates a ElasticSerach date range filter.
+ * Generates a ElasticSearch date range filter.
  *
  * @param {string} fieldName - Name of the field (created, modified, etc).
  * @param {string} input - Filter value.
@@ -177,7 +178,7 @@ function buildStaticFilters( staticFilters ) {
 }
 
 /**
- * Build an ElasticSerach filter object.
+ * Build an ElasticSearch filter object.
  *
  * @param {object} filterQuery - Filter query value object.
  * @param {object} adminQueryFilter - Manual ElasticSearch query override.
@@ -266,12 +267,19 @@ function generateApiQueryString( {
 		'tag.name.default',
 		'category.name.default',
 		'post_type',
-		'has.image',
 		'shortcode_types',
-		'image.url.raw',
 	];
 	const highlightFields = [ 'title', 'content', 'comments' ];
 
+	/* Fetch image fields for non-minimal results
+	 *
+	 * We always need these in the Customizer too, because the API request is not
+	 * repeated when switching result format
+	 */
+	if ( resultFormat !== RESULT_FORMAT_MINIMAL || isInCustomizer ) {
+		fields = fields.concat( [ 'has.image', 'image.url.raw', 'image.alt_text' ] );
+	}
+
 	/* Fetch additional fields for product results
 	 *
 	 * We always need these in the Customizer too, because the API request is not
diff --git a/projects/plugins/jetpack/modules/widgets/search.php b/projects/packages/search/src/widgets/class-search-widget.php
similarity index 87%
rename from projects/plugins/jetpack/modules/widgets/search.php
rename to projects/packages/search/src/widgets/class-search-widget.php
index 097159ebc7824..c21da1c779cb7 100644
--- a/projects/plugins/jetpack/modules/widgets/search.php
+++ b/projects/packages/search/src/widgets/class-search-widget.php
@@ -1,35 +1,18 @@
-<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+<?php
 /**
- * Jetpack Search: Jetpack_Search_Widget class
+ * Jetpack Search widget.
  *
- * @package    Jetpack
- * @subpackage Jetpack Search
- * @since      5.0.0
+ * @package automattic/jetpack-search
  */
 
+namespace Automattic\Jetpack\Search;
+
+use Automattic\Jetpack\Assets;
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Redirect;
-use Automattic\Jetpack\Search\Helper;
-use Automattic\Jetpack\Search\Options;
 use Automattic\Jetpack\Status;
 use Automattic\Jetpack\Tracking;
 
-add_action( 'widgets_init', 'jetpack_search_widget_init' );
-
-/**
- * Register the widget if Jetpack Search is available and enabled.
- */
-function jetpack_search_widget_init() {
-	if (
-		! Jetpack::is_connection_ready()
-		|| ( method_exists( 'Jetpack_Plan', 'supports' ) && ! Jetpack_Plan::supports( 'search' ) )
-		|| ! Jetpack::is_module_active( 'search' )
-	) {
-		return;
-	}
-
-	register_widget( 'Jetpack_Search_Widget' );
-}
-
 /**
  * Provides a widget to show available/selected filters on searches.
  *
@@ -37,15 +20,7 @@ function jetpack_search_widget_init() {
  *
  * @see   WP_Widget
  */
-class Jetpack_Search_Widget extends WP_Widget {
-
-	/**
-	 * The Jetpack_Search instance.
-	 *
-	 * @since 5.7.0
-	 * @var Jetpack_Search
-	 */
-	protected $jetpack_search;
+class Search_Widget extends \WP_Widget {
 
 	/**
 	 * Number of aggregations (filters) to show by default.
@@ -54,7 +29,6 @@ class Jetpack_Search_Widget extends WP_Widget {
 	 * @var int
 	 */
 	const DEFAULT_FILTER_COUNT = 5;
-
 	/**
 	 * Default sort order for search results.
 	 *
@@ -62,25 +36,38 @@ class Jetpack_Search_Widget extends WP_Widget {
 	 * @var string
 	 */
 	const DEFAULT_SORT = 'relevance_desc';
-
 	/**
-	 * Jetpack_Search_Widget constructor.
+	 * The Jetpack_Search instance.
 	 *
-	 * @since 5.0.0
+	 * @since 5.7.0
+	 * @var Jetpack_Search
+	 */
+	protected $jetpack_search;
+	/**
+	 * Module_Control instance
+	 *
+	 * @var Module_Control
+	 */
+	protected $module_control;
+
+	/**
+	 * Search_Widget constructor.
 	 *
 	 * @param string $name Widget name.
+	 * @since 5.0.0
 	 */
 	public function __construct( $name = null ) {
 		if ( empty( $name ) ) {
-			$name = esc_html__( 'Search', 'jetpack' );
+			$name = esc_html__( 'Search', 'jetpack-search-pkg' );
 		}
+		$this->module_control = new Module_Control();
 		parent::__construct(
 			Helper::FILTER_WIDGET_BASE,
 			/** This filter is documented in modules/widgets/facebook-likebox.php */
 			apply_filters( 'jetpack_widget_name', $name ),
 			array(
 				'classname'   => 'jetpack-filters widget_search',
-				'description' => __( 'Instant search and filtering to help visitors quickly find relevant answers and explore your site.', 'jetpack' ),
+				'description' => __( 'Instant search and filtering to help visitors quickly find relevant answers and explore your site.', 'jetpack-search-pkg' ),
 			)
 		);
 
@@ -111,7 +98,7 @@ public function __construct( $name = null ) {
 	 * @since 6.3
 	 */
 	public function is_search_active() {
-		return Jetpack::is_module_active( 'search' );
+		return $this->module_control->is_active();
 	}
 
 	/**
@@ -120,7 +107,7 @@ public function is_search_active() {
 	 * @since 6.3
 	 */
 	public function activate_search() {
-		Jetpack::activate_module( 'search', false, false );
+		return $this->module_control->activate();
 	}
 
 	/**
@@ -129,30 +116,33 @@ public function activate_search() {
 	 * @since 5.7.0
 	 */
 	public function widget_admin_setup() {
-		wp_enqueue_style(
-			'widget-jetpack-search-filters',
-			plugins_url( 'search/css/search-widget-admin-ui.css', __FILE__ ),
-			array(),
-			JETPACK__VERSION
-		);
-
 		// Register jp-tracks and jp-tracks-functions.
 		Tracking::register_tracks_functions_scripts();
 
-		wp_register_script(
+		Assets::register_script(
 			'jetpack-search-widget-admin',
-			plugins_url( 'search/js/search-widget-admin.js', __FILE__ ),
-			array( 'jquery', 'jquery-ui-sortable', 'jp-tracks-functions' ),
-			JETPACK__VERSION,
-			false
+			'js/search-widget-admin.js',
+			__FILE__,
+			array(
+				'in_footer'    => true,
+				'textdomain'   => 'jetpack-search-pkg',
+				'css_path'     => 'css/search-widget-admin-ui.css',
+				'dependencies' => array( 'jquery', 'jquery-ui-sortable', 'jp-tracks-functions' ),
+			)
 		);
 
+		// TODO: 'jetpack-search' better to be the current plugin where the package is running.
+		$dotcom_data = ( new Connection_Manager( 'jetpack-search' ) )->get_connected_user_data();
+
 		wp_localize_script(
 			'jetpack-search-widget-admin',
 			'jetpack_search_filter_admin',
 			array(
 				'defaultFilterCount' => self::DEFAULT_FILTER_COUNT,
-				'tracksUserData'     => Jetpack_Tracks_Client::get_connected_user_tracks_identity(),
+				'tracksUserData'     => ! empty( $dotcom_data ) ? array(
+					'userid'   => $dotcom_data['ID'],
+					'username' => $dotcom_data['login'],
+				) : false,
 				'tracksEventData'    => array(
 					'is_customizer' => (int) is_customize_preview(),
 				),
@@ -165,7 +155,7 @@ public function widget_admin_setup() {
 			)
 		);
 
-		wp_enqueue_script( 'jetpack-search-widget-admin' );
+		Assets::enqueue_script( 'jetpack-search-widget-admin' );
 	}
 
 	/**
@@ -177,51 +167,48 @@ public function enqueue_frontend_scripts() {
 		if ( ! is_active_widget( false, false, $this->id_base, true ) || Options::is_instant_enabled() ) {
 			return;
 		}
-
-		wp_enqueue_script(
+		Assets::register_script(
 			'jetpack-search-widget',
-			plugins_url( 'search/js/search-widget.js', __FILE__ ),
-			array(),
-			JETPACK__VERSION,
-			true
-		);
-
-		wp_enqueue_style(
-			'jetpack-search-widget',
-			plugins_url( 'search/css/search-widget-frontend.css', __FILE__ ),
-			array(),
-			JETPACK__VERSION
+			'js/search-widget.js',
+			__FILE__,
+			array(
+				'in_footer'  => true,
+				'textdomain' => 'jetpack-search-pkg',
+				// Jetpack the plugin would concatenated the style with other styles and minimize. And the style would be dequeued from WP.
+				// @see https://github.com/Automattic/jetpack/blob/b3de78dce3d88b0d9b283282a5b04515245c8057/projects/plugins/jetpack/tools/builder/frontend-css.js#L52.
+				// @see https://github.com/Automattic/jetpack/blob/bb1b6a9a9cfa98600441f8fa31c9f9c4ef9a04a5/projects/plugins/jetpack/class.jetpack.php#L106.
+				'css_path'   => 'css/search-widget-frontend.css',
+			)
 		);
+		Assets::enqueue_script( 'jetpack-search-widget' );
 	}
 
 	/**
 	 * Get the list of valid sort types/orders.
 	 *
-	 * @since 5.8.0
-	 *
 	 * @return array The sort orders.
+	 * @since 5.8.0
 	 */
 	private function get_sort_types() {
 		return array(
-			'relevance|DESC' => is_admin() ? esc_html__( 'Relevance (recommended)', 'jetpack' ) : esc_html__( 'Relevance', 'jetpack' ),
-			'date|DESC'      => esc_html__( 'Newest first', 'jetpack' ),
-			'date|ASC'       => esc_html__( 'Oldest first', 'jetpack' ),
+			'relevance|DESC' => is_admin() ? esc_html__( 'Relevance (recommended)', 'jetpack-search-pkg' ) : esc_html__( 'Relevance', 'jetpack-search-pkg' ),
+			'date|DESC'      => esc_html__( 'Newest first', 'jetpack-search-pkg' ),
+			'date|ASC'       => esc_html__( 'Oldest first', 'jetpack-search-pkg' ),
 		);
 	}
 
 	/**
 	 * Callback for an array_filter() call in order to only get filters for the current widget.
 	 *
-	 * @see   Jetpack_Search_Widget::widget()
-	 *
-	 * @since 5.7.0
-	 *
 	 * @param array $item Filter item.
 	 *
 	 * @return bool Whether the current filter item is for the current widget.
+	 * @see   Search_Widget::widget()
+	 *
+	 * @since 5.7.0
 	 */
 	public function is_for_current_widget( $item ) {
-		return isset( $item['widget_id'] ) && $this->id == $item['widget_id']; // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		return isset( $item['widget_id'] ) && $this->id == $item['widget_id']; // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 	}
 
 	/**
@@ -230,9 +217,8 @@ public function is_for_current_widget( $item ) {
 	 * This is meant to provide backwards-compatibility for VIP, and other professional plan users, that manually
 	 * configured filters via `Automattic\Jetpack\Search\Classic_Search::set_filters()`.
 	 *
-	 * @since 5.7.0
-	 *
 	 * @return bool Whether the widget should display site-wide filters or not.
+	 * @since 5.7.0
 	 */
 	public function should_display_sitewide_filters() {
 		$filter_widgets = get_option( 'widget_jetpack-search-filters' );
@@ -277,9 +263,9 @@ public function jetpack_search_populate_defaults( $instance ) {
 	/**
 	 * Populates the instance array with appropriate default values.
 	 *
-	 * @since 8.6.0
 	 * @param array $instance Previously saved values from database.
 	 * @return array Instance array with default values approprate for instant search
+	 * @since 8.6.0
 	 */
 	public function populate_defaults_for_instant_search( $instance ) {
 		return wp_parse_args(
@@ -294,10 +280,9 @@ public function populate_defaults_for_instant_search( $instance ) {
 	/**
 	 * Responsible for rendering the widget on the frontend.
 	 *
-	 * @since 5.0.0
-	 *
 	 * @param array $args     Widgets args supplied by the theme.
 	 * @param array $instance The current widget instance.
+	 * @since 5.0.0
 	 */
 	public function widget( $args, $instance ) {
 		$instance = $this->jetpack_search_populate_defaults( $instance );
@@ -307,7 +292,7 @@ public function widget( $args, $instance ) {
 			?><div id="<?php echo esc_attr( $this->id ); ?>-wrapper">
 				<div class="jetpack-search-sort-wrapper">
 					<label>
-						<?php esc_html_e( 'Jetpack Search not supported in Offline Mode', 'jetpack' ); ?>
+						<?php esc_html_e( 'Jetpack Search not supported in Offline Mode', 'jetpack-search-pkg' ); ?>
 					</label>
 				</div>
 			</div>
@@ -330,21 +315,20 @@ public function widget( $args, $instance ) {
 	/**
 	 * Render the non-instant frontend widget.
 	 *
-	 * @since 8.3.0
-	 *
 	 * @param array $args     Widgets args supplied by the theme.
 	 * @param array $instance The current widget instance.
+	 * @since 8.3.0
 	 */
 	public function widget_non_instant( $args, $instance ) {
 		$display_filters = false;
 
 		// Search instance must have been initialized before widget render.
-		if ( is_search() && Automattic\Jetpack\Search\Classic_Search::instance() ) {
+		if ( is_search() && Classic_Search::instance() ) {
 			if ( Helper::should_rerun_search_in_customizer_preview() ) {
-				Automattic\Jetpack\Search\Classic_Search::instance()->update_search_results_aggregations();
+				Classic_Search::instance()->update_search_results_aggregations();
 			}
 
-			$filters = Automattic\Jetpack\Search\Classic_Search::instance()->get_filters();
+			$filters = Classic_Search::instance()->get_filters();
 
 			if ( ! Helper::are_filters_by_widget_disabled() && ! $this->should_display_sitewide_filters() ) {
 				$filters = array_filter( $filters, array( $this, 'is_for_current_widget' ) );
@@ -375,11 +359,10 @@ public function widget_non_instant( $args, $instance ) {
 			 *
 			 * @module search
 			 *
-			 * @since  5.7.0
-			 *
 			 * @param string $title                The widget's title
 			 * @param string $args['before_title'] The HTML tag to display before the title
 			 * @param string $args['after_title']  The HTML tag to display after the title
+			 *@since  5.7.0
 			 */
 			do_action( 'jetpack_search_render_filters_widget_title', $title, $args['before_title'], $args['after_title'] );
 		}
@@ -391,14 +374,14 @@ public function widget_non_instant( $args, $instance ) {
 		// we need to dynamically inject the sort field into the search box when the search box is enabled, and display
 		// it separately when it's not.
 		if ( ! empty( $instance['search_box_enabled'] ) ) {
-			Automattic\Jetpack\Search\Template_Tags::render_widget_search_form( $instance['post_types'], $orderby, $order );
+			Template_Tags::render_widget_search_form( $instance['post_types'], $orderby, $order );
 		}
 
 		if ( ! empty( $instance['search_box_enabled'] ) && ! empty( $instance['user_sort_enabled'] ) ) :
 			?>
 					<div class="jetpack-search-sort-wrapper">
 				<label>
-					<?php esc_html_e( 'Sort by', 'jetpack' ); ?>
+					<?php esc_html_e( 'Sort by', 'jetpack-search-pkg' ); ?>
 					<select class="jetpack-search-sort">
 						<?php foreach ( $this->get_sort_types() as $sort => $label ) { ?>
 							<option value="<?php echo esc_attr( $sort ); ?>" <?php selected( $current_sort, $sort ); ?>>
@@ -417,10 +400,9 @@ public function widget_non_instant( $args, $instance ) {
 			 *
 			 * @module search
 			 *
-			 * @since  5.8.0
-			 *
 			 * @param array $filters    The possible filters for the current query.
 			 * @param array $post_types An array of post types to limit filtering to.
+			 *@since  5.8.0
 			 */
 			do_action(
 				'jetpack_search_render_filters',
@@ -438,22 +420,21 @@ public function widget_non_instant( $args, $instance ) {
 	/**
 	 * Render the instant frontend widget.
 	 *
-	 * @since 8.3.0
-	 *
 	 * @param array $args     Widgets args supplied by the theme.
 	 * @param array $instance The current widget instance.
+	 * @since 8.3.0
 	 */
 	public function widget_instant( $args, $instance ) {
 		// Exit early if search instance has not been initialized.
-		if ( ! Automattic\Jetpack\Search\Instant_Search::instance() ) {
+		if ( ! Instant_Search::instance() ) {
 			return false;
 		}
 
 		if ( Helper::should_rerun_search_in_customizer_preview() ) {
-			Automattic\Jetpack\Search\Instant_Search::instance()->update_search_results_aggregations();
+			Instant_Search::instance()->update_search_results_aggregations();
 		}
 
-		$filters = Automattic\Jetpack\Search\Instant_Search::instance()->get_filters();
+		$filters = Instant_Search::instance()->get_filters();
 		if ( ! Helper::are_filters_by_widget_disabled() && ! $this->should_display_sitewide_filters() ) {
 			$filters = array_filter( $filters, array( $this, 'is_for_current_widget' ) );
 		}
@@ -476,16 +457,15 @@ public function widget_instant( $args, $instance ) {
 			 *
 			 * @module search
 			 *
-			 * @since  5.7.0
-			 *
 			 * @param string $title                The widget's title
 			 * @param string $args['before_title'] The HTML tag to display before the title
 			 * @param string $args['after_title']  The HTML tag to display after the title
+			 *@since  5.7.0
 			 */
 			do_action( 'jetpack_search_render_filters_widget_title', $title, $args['before_title'], $args['after_title'] );
 		}
 
-		Automattic\Jetpack\Search\Template_Tags::render_widget_search_form( array(), '', '' );
+		Template_Tags::render_widget_search_form( array(), '', '' );
 
 		if ( $display_filters ) {
 			/**
@@ -493,10 +473,9 @@ public function widget_instant( $args, $instance ) {
 			 *
 			 * @module search
 			 *
-			 * @since  5.8.0
-			 *
 			 * @param array $filters    The possible filters for the current query.
 			 * @param array $post_types An array of post types to limit filtering to.
+			 *@since  5.8.0
 			 */
 			do_action(
 				'jetpack_search_render_filters',
@@ -512,10 +491,9 @@ public function widget_instant( $args, $instance ) {
 	/**
 	 * Render the instant widget for the overlay.
 	 *
-	 * @since 8.3.0
-	 *
 	 * @param array $args     Widgets args supplied by the theme.
 	 * @param array $instance The current widget instance.
+	 * @since 8.3.0
 	 */
 	public function widget_empty_instant( $args, $instance ) {
 		$title = isset( $instance['title'] ) ? $instance['title'] : '';
@@ -538,11 +516,10 @@ public function widget_empty_instant( $args, $instance ) {
 			 *
 			 * @module search
 			 *
-			 * @since  5.7.0
-			 *
 			 * @param string $title                The widget's title
 			 * @param string $args['before_title'] The HTML tag to display before the title
 			 * @param string $args['after_title']  The HTML tag to display after the title
+			 *@since  5.7.0
 			 */
 			do_action( 'jetpack_search_render_filters_widget_title', $title, $args['before_title'], $args['after_title'] );
 		}
@@ -559,11 +536,10 @@ public function widget_empty_instant( $args, $instance ) {
 	 * - find the orderby/order fields and set default values
 	 * - detect changes to the sort field, if it exists, and use it to set the order field values
 	 *
-	 * @since 5.8.0
-	 *
 	 * @param array  $instance The current widget instance.
 	 * @param string $order    The order to initialize the select with.
 	 * @param string $orderby  The orderby to initialize the select with.
+	 * @since 5.8.0
 	 */
 	private function maybe_render_sort_javascript( $instance, $order, $orderby ) {
 		if ( Options::is_instant_enabled() ) {
@@ -621,11 +597,10 @@ private function maybe_render_sort_javascript( $instance, $order, $orderby ) {
 	/**
 	 * Convert a sort string into the separate order by and order parts.
 	 *
-	 * @since 5.8.0
-	 *
 	 * @param string $sort A sort string.
 	 *
 	 * @return array Order by and order.
+	 * @since 5.8.0
 	 */
 	private function sorting_to_wp_query_param( $sort ) {
 		// phpcs:disable WordPress.Security.NonceVerification.Recommended
@@ -646,12 +621,11 @@ private function sorting_to_wp_query_param( $sort ) {
 	/**
 	 * Updates a particular instance of the widget. Validates and sanitizes the options.
 	 *
-	 * @since 5.0.0
-	 *
-	 * @param array $new_instance New settings for this instance as input by the user via Jetpack_Search_Widget::form().
+	 * @param array $new_instance New settings for this instance as input by the user via Search_Widget::form().
 	 * @param array $old_instance Old settings for this instance.
 	 *
 	 * @return array Settings to save.
+	 * @since 5.0.0
 	 */
 	public function update( $new_instance, $old_instance ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 		$new_instance = $this->maybe_reformat_widget( $new_instance );
@@ -660,7 +634,7 @@ public function update( $new_instance, $old_instance ) { // phpcs:ignore Variabl
 		$instance['title']              = sanitize_text_field( $new_instance['title'] );
 		$instance['search_box_enabled'] = empty( $new_instance['search_box_enabled'] ) ? '0' : '1';
 		$instance['user_sort_enabled']  = empty( $new_instance['user_sort_enabled'] ) ? '0' : '1';
-		$instance['sort']               = $new_instance['sort'];
+		$instance['sort']               = empty( $new_instance['sort'] ) ? self::DEFAULT_SORT : $new_instance['sort'];
 		$instance['post_types']         = empty( $new_instance['post_types'] ) || empty( $instance['search_box_enabled'] )
 			? array()
 			: array_map( 'sanitize_key', $new_instance['post_types'] );
@@ -737,9 +711,8 @@ protected function maybe_reformat_widget( $widget_instance ) {
 	/**
 	 * Outputs the settings update form.
 	 *
-	 * @since 5.0.0
-	 *
 	 * @param array $instance Previously saved values from database.
+	 * @since 5.0.0
 	 */
 	public function form( $instance ) {
 		if ( Options::is_instant_enabled() ) {
@@ -762,7 +735,7 @@ public function form( $instance ) {
 		<div class="<?php echo esc_attr( $classes ); ?>">
 			<p>
 				<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>">
-					<?php esc_html_e( 'Title (optional):', 'jetpack' ); ?>
+					<?php esc_html_e( 'Title (optional):', 'jetpack-search-pkg' ); ?>
 				</label>
 				<input
 					class="widefat"
@@ -781,7 +754,7 @@ class="jetpack-search-filters-widget__search-box-enabled"
 						name="<?php echo esc_attr( $this->get_field_name( 'search_box_enabled' ) ); ?>"
 						<?php checked( $instance['search_box_enabled'] ); ?>
 					/>
-					<?php esc_html_e( 'Show search box', 'jetpack' ); ?>
+					<?php esc_html_e( 'Show search box', 'jetpack-search-pkg' ); ?>
 				</label>
 			</p>
 
@@ -794,12 +767,12 @@ class="jetpack-search-filters-widget__sort-controls-enabled"
 						<?php checked( $instance['user_sort_enabled'] ); ?>
 						<?php disabled( ! $instance['search_box_enabled'] ); ?>
 					/>
-					<?php esc_html_e( 'Show sort selection dropdown', 'jetpack' ); ?>
+					<?php esc_html_e( 'Show sort selection dropdown', 'jetpack-search-pkg' ); ?>
 				</label>
 			</p>
 
 			<p class="jetpack-search-filters-widget__post-types-select">
-				<label><?php esc_html_e( 'Post types to search (minimum of 1):', 'jetpack' ); ?></label>
+				<label><?php esc_html_e( 'Post types to search (minimum of 1):', 'jetpack-search-pkg' ); ?></label>
 				<?php foreach ( get_post_types( array( 'exclude_from_search' => false ), 'objects' ) as $post_type ) : ?>
 					<label>
 						<input
@@ -815,7 +788,7 @@ class="jetpack-search-filters-widget__sort-controls-enabled"
 
 			<p>
 				<label>
-					<?php esc_html_e( 'Default sort order:', 'jetpack' ); ?>
+					<?php esc_html_e( 'Default sort order:', 'jetpack-search-pkg' ); ?>
 					<select
 						name="<?php echo esc_attr( $this->get_field_name( 'sort' ) ); ?>"
 						class="widefat jetpack-search-filters-widget__sort-order">
@@ -841,18 +814,18 @@ class="widefat jetpack-search-filters-widget__sort-order">
 				</div>
 				<p class="jetpack-search-filters-widget__add-filter-wrapper">
 					<a class="button jetpack-search-filters-widget__add-filter" href="#">
-						<?php esc_html_e( 'Add a filter', 'jetpack' ); ?>
+						<?php esc_html_e( 'Add a filter', 'jetpack-search-pkg' ); ?>
 					</a>
 				</p>
 				<noscript>
 					<p class="jetpack-search-filters-help">
-						<?php echo esc_html_e( 'Adding filters requires JavaScript!', 'jetpack' ); ?>
+						<?php echo esc_html_e( 'Adding filters requires JavaScript!', 'jetpack-search-pkg' ); ?>
 					</p>
 				</noscript>
 				<?php if ( is_customize_preview() ) : ?>
 					<p class="jetpack-search-filters-help">
 						<a href="<?php echo esc_url( Redirect::get_url( 'jetpack-support-search', array( 'anchor' => 'filters-not-showing-up' ) ) ); ?>" target="_blank">
-							<?php esc_html_e( "Why aren't my filters appearing?", 'jetpack' ); ?>
+							<?php esc_html_e( "Why aren't my filters appearing?", 'jetpack-search-pkg' ); ?>
 						</a>
 					</p>
 				<?php endif; ?>
@@ -864,9 +837,8 @@ class="widefat jetpack-search-filters-widget__sort-order">
 	/**
 	 * Outputs the widget update form to be used in the Customizer for Instant Search.
 	 *
-	 * @since 8.6.0
-	 *
 	 * @param array $instance Previously saved values from database.
+	 * @since 8.6.0
 	 */
 	private function form_for_instant_search( $instance ) {
 		$instance = $this->populate_defaults_for_instant_search( $instance );
@@ -877,7 +849,7 @@ private function form_for_instant_search( $instance ) {
 			<!-- Title control -->
 			<p>
 				<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>">
-					<?php esc_html_e( 'Title (optional):', 'jetpack' ); ?>
+					<?php esc_html_e( 'Title (optional):', 'jetpack-search-pkg' ); ?>
 				</label>
 				<input
 					class="widefat"
@@ -897,7 +869,7 @@ class="widefat"
 				</div>
 				<p class="jetpack-search-filters-widget__add-filter-wrapper">
 					<a class="button jetpack-search-filters-widget__add-filter" href="#">
-						<?php esc_html_e( 'Add a filter', 'jetpack' ); ?>
+						<?php esc_html_e( 'Add a filter', 'jetpack-search-pkg' ); ?>
 					</a>
 				</p>
 				<script class="jetpack-search-filters-widget__filter-template" type="text/template">
@@ -905,7 +877,7 @@ class="widefat"
 				</script>
 				<noscript>
 					<p class="jetpack-search-filters-help">
-						<?php echo esc_html_e( 'Adding filters requires JavaScript!', 'jetpack' ); ?>
+						<?php echo esc_html_e( 'Adding filters requires JavaScript!', 'jetpack-search-pkg' ); ?>
 					</p>
 				</noscript>
 			<?php endif; ?>
@@ -918,11 +890,10 @@ class="widefat"
 	 * and native PHP (server-side). This helper function allows for easy rendering
 	 * of attributes in both formats.
 	 *
-	 * @since 5.8.0
-	 *
 	 * @param string $name        Attribute name.
 	 * @param string $value       Attribute value.
 	 * @param bool   $is_template Whether this is for an Underscore template or not.
+	 * @since 5.8.0
 	 */
 	private function render_widget_attr( $name, $value, $is_template ) {
 		echo $is_template ? "<%= $name %>" : esc_attr( $value ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -933,12 +904,11 @@ private function render_widget_attr( $name, $value, $is_template ) {
 	 * and native PHP (server-side). This helper function allows for easy rendering
 	 * of the "selected" attribute in both formats.
 	 *
-	 * @since 5.8.0
-	 *
 	 * @param string $name        Attribute name.
 	 * @param string $value       Attribute value.
 	 * @param string $compare     Value to compare to the attribute value to decide if it should be selected.
 	 * @param bool   $is_template Whether this is for an Underscore template or not.
+	 * @since 5.8.0
 	 */
 	private function render_widget_option_selected( $name, $value, $compare, $is_template ) {
 		$compare_js = rawurlencode( $compare );
@@ -950,10 +920,9 @@ private function render_widget_option_selected( $name, $value, $compare, $is_tem
 	 *
 	 * We use this method for two purposes - rendering the fields server-side, and also rendering a script template for Underscore.
 	 *
-	 * @since 5.7.0
-	 *
 	 * @param array $filter      The filter to render.
 	 * @param bool  $is_template Whether this is for an Underscore template or not.
+	 * @since 5.7.0
 	 */
 	public function render_widget_edit_filter( $filter, $is_template = false ) {
 		$args = wp_parse_args(
@@ -975,16 +944,16 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 		<div class="jetpack-search-filters-widget__filter is-<?php $this->render_widget_attr( 'type', $args['type'], $is_template ); ?>">
 			<p class="jetpack-search-filters-widget__type-select">
 				<label>
-					<?php esc_html_e( 'Filter Type:', 'jetpack' ); ?>
+					<?php esc_html_e( 'Filter Type:', 'jetpack-search-pkg' ); ?>
 					<select name="<?php echo esc_attr( $this->get_field_name( 'filter_type' ) ); ?>[]" class="widefat filter-select">
 						<option value="taxonomy" <?php $this->render_widget_option_selected( 'type', $args['type'], 'taxonomy', $is_template ); ?>>
-							<?php esc_html_e( 'Taxonomy', 'jetpack' ); ?>
+							<?php esc_html_e( 'Taxonomy', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="post_type" <?php $this->render_widget_option_selected( 'type', $args['type'], 'post_type', $is_template ); ?>>
-							<?php esc_html_e( 'Post Type', 'jetpack' ); ?>
+							<?php esc_html_e( 'Post Type', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="date_histogram" <?php $this->render_widget_option_selected( 'type', $args['type'], 'date_histogram', $is_template ); ?>>
-							<?php esc_html_e( 'Date', 'jetpack' ); ?>
+							<?php esc_html_e( 'Date', 'jetpack-search-pkg' ); ?>
 						</option>
 					</select>
 				</label>
@@ -993,7 +962,7 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 			<p class="jetpack-search-filters-widget__taxonomy-select">
 				<label>
 					<?php
-						esc_html_e( 'Choose a taxonomy:', 'jetpack' );
+						esc_html_e( 'Choose a taxonomy:', 'jetpack-search-pkg' );
 						$seen_taxonomy_labels = array();
 					?>
 					<select name="<?php echo esc_attr( $this->get_field_name( 'taxonomy_type' ) ); ?>[]" class="widefat taxonomy-select">
@@ -1003,7 +972,7 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 									$label = in_array( $taxonomy->label, $seen_taxonomy_labels, true )
 										? sprintf(
 											/* translators: %1$s is the taxonomy name, %2s is the name of its type to help distinguish between several taxonomies with the same name, e.g. category and tag. */
-											_x( '%1$s (%2$s)', 'A label for a taxonomy selector option', 'jetpack' ),
+											_x( '%1$s (%2$s)', 'A label for a taxonomy selector option', 'jetpack-search-pkg' ),
 											$taxonomy->label,
 											$taxonomy->name
 										)
@@ -1019,19 +988,19 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 
 			<p class="jetpack-search-filters-widget__date-histogram-select">
 				<label>
-					<?php esc_html_e( 'Choose a field:', 'jetpack' ); ?>
+					<?php esc_html_e( 'Choose a field:', 'jetpack-search-pkg' ); ?>
 					<select name="<?php echo esc_attr( $this->get_field_name( 'date_histogram_field' ) ); ?>[]" class="widefat date-field-select">
 						<option value="post_date" <?php $this->render_widget_option_selected( 'field', $args['field'], 'post_date', $is_template ); ?>>
-							<?php esc_html_e( 'Date', 'jetpack' ); ?>
+							<?php esc_html_e( 'Date', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="post_date_gmt" <?php $this->render_widget_option_selected( 'field', $args['field'], 'post_date_gmt', $is_template ); ?>>
-							<?php esc_html_e( 'Date GMT', 'jetpack' ); ?>
+							<?php esc_html_e( 'Date GMT', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="post_modified" <?php $this->render_widget_option_selected( 'field', $args['field'], 'post_modified', $is_template ); ?>>
-							<?php esc_html_e( 'Modified', 'jetpack' ); ?>
+							<?php esc_html_e( 'Modified', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="post_modified_gmt" <?php $this->render_widget_option_selected( 'field', $args['field'], 'post_modified_gmt', $is_template ); ?>>
-							<?php esc_html_e( 'Modified GMT', 'jetpack' ); ?>
+							<?php esc_html_e( 'Modified GMT', 'jetpack-search-pkg' ); ?>
 						</option>
 					</select>
 				</label>
@@ -1039,13 +1008,13 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 
 			<p class="jetpack-search-filters-widget__date-histogram-select">
 				<label>
-					<?php esc_html_e( 'Choose an interval:', 'jetpack' ); ?>
+					<?php esc_html_e( 'Choose an interval:', 'jetpack-search-pkg' ); ?>
 					<select name="<?php echo esc_attr( $this->get_field_name( 'date_histogram_interval' ) ); ?>[]" class="widefat date-interval-select">
 						<option value="month" <?php $this->render_widget_option_selected( 'interval', $args['interval'], 'month', $is_template ); ?>>
-							<?php esc_html_e( 'Month', 'jetpack' ); ?>
+							<?php esc_html_e( 'Month', 'jetpack-search-pkg' ); ?>
 						</option>
 						<option value="year" <?php $this->render_widget_option_selected( 'interval', $args['interval'], 'year', $is_template ); ?>>
-							<?php esc_html_e( 'Year', 'jetpack' ); ?>
+							<?php esc_html_e( 'Year', 'jetpack-search-pkg' ); ?>
 						</option>
 					</select>
 				</label>
@@ -1053,7 +1022,7 @@ public function render_widget_edit_filter( $filter, $is_template = false ) {
 
 			<p class="jetpack-search-filters-widget__title">
 				<label>
-					<?php esc_html_e( 'Title:', 'jetpack' ); ?>
+					<?php esc_html_e( 'Title:', 'jetpack-search-pkg' ); ?>
 					<input
 						class="widefat"
 						type="text"
@@ -1066,7 +1035,7 @@ class="widefat"
 
 			<p>
 				<label>
-					<?php esc_html_e( 'Maximum number of filters (1-50):', 'jetpack' ); ?>
+					<?php esc_html_e( 'Maximum number of filters (1-50):', 'jetpack-search-pkg' ); ?>
 					<input
 						class="widefat filter-count"
 						name="<?php echo esc_attr( $this->get_field_name( 'num_filters' ) ); ?>[]"
@@ -1081,7 +1050,7 @@ class="widefat filter-count"
 			</p>
 
 			<p class="jetpack-search-filters-widget__controls">
-				<a href="#" class="delete"><?php esc_html_e( 'Remove', 'jetpack' ); ?></a>
+				<a href="#" class="delete"><?php esc_html_e( 'Remove', 'jetpack-search-pkg' ); ?></a>
 			</p>
 		</div>
 		<?php
diff --git a/projects/plugins/jetpack/modules/widgets/search/css/search-widget-admin-ui.css b/projects/packages/search/src/widgets/css/search-widget-admin-ui.css
similarity index 100%
rename from projects/plugins/jetpack/modules/widgets/search/css/search-widget-admin-ui.css
rename to projects/packages/search/src/widgets/css/search-widget-admin-ui.css
diff --git a/projects/plugins/jetpack/modules/widgets/search/css/search-widget-frontend.css b/projects/packages/search/src/widgets/css/search-widget-frontend.css
similarity index 100%
rename from projects/plugins/jetpack/modules/widgets/search/css/search-widget-frontend.css
rename to projects/packages/search/src/widgets/css/search-widget-frontend.css
diff --git a/projects/plugins/jetpack/modules/widgets/search/js/search-widget-admin.js b/projects/packages/search/src/widgets/js/search-widget-admin.js
similarity index 100%
rename from projects/plugins/jetpack/modules/widgets/search/js/search-widget-admin.js
rename to projects/packages/search/src/widgets/js/search-widget-admin.js
diff --git a/projects/plugins/jetpack/modules/widgets/search/js/search-widget.js b/projects/packages/search/src/widgets/js/search-widget.js
similarity index 100%
rename from projects/plugins/jetpack/modules/widgets/search/js/search-widget.js
rename to projects/packages/search/src/widgets/js/search-widget.js
diff --git a/projects/packages/status/CHANGELOG.md b/projects/packages/status/CHANGELOG.md
index b05aac407ada0..508bd11effd48 100644
--- a/projects/packages/status/CHANGELOG.md
+++ b/projects/packages/status/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.10.0] - 2022-01-25
+### Added
+- Added Visitor class for status regarding the site visitor.
+
 ## [1.9.5] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -146,6 +150,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Introduce a status package
 
+[1.10.0]: https://github.com/Automattic/jetpack-status/compare/v1.9.5...v1.10.0
 [1.9.5]: https://github.com/Automattic/jetpack-status/compare/v1.9.4...v1.9.5
 [1.9.4]: https://github.com/Automattic/jetpack-status/compare/v1.9.3...v1.9.4
 [1.9.3]: https://github.com/Automattic/jetpack-status/compare/v1.9.2...v1.9.3
diff --git a/projects/packages/status/changelog/add-visitor-status b/projects/packages/status/changelog/add-visitor-status
deleted file mode 100644
index 0b395e9ceee8c..0000000000000
--- a/projects/packages/status/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added Visitor class for status regarding the site visitor.
diff --git a/projects/packages/status/changelog/update-project-scripts-no-install b/projects/packages/status/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/status/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/sync/CHANGELOG.md b/projects/packages/sync/CHANGELOG.md
index 638ed40297e58..8555f34b96f4c 100644
--- a/projects/packages/sync/CHANGELOG.md
+++ b/projects/packages/sync/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.29.1] - 2022-02-02
+### Changed
+- Updated package dependencies.
+
+## [1.29.0] - 2022-01-25
+### Added
+- Jetpack Search: update the allowed post meta when search is active to include all indexable meta.
+
 ## [1.28.2] - 2022-01-18
 ### Changed
 - Updated package dependencies.
@@ -558,6 +566,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packages: Move sync to a classmapped package
 
+[1.29.1]: https://github.com/Automattic/jetpack-sync/compare/v1.29.0...v1.29.1
+[1.29.0]: https://github.com/Automattic/jetpack-sync/compare/v1.28.2...v1.29.0
 [1.28.2]: https://github.com/Automattic/jetpack-sync/compare/v1.28.1...v1.28.2
 [1.28.1]: https://github.com/Automattic/jetpack-sync/compare/v1.28.0...v1.28.1
 [1.28.0]: https://github.com/Automattic/jetpack-sync/compare/v1.27.6...v1.28.0
diff --git a/projects/packages/sync/changelog/add-jp-search-sync2 b/projects/packages/sync/changelog/add-jp-search-sync2
deleted file mode 100644
index c15615d416ffb..0000000000000
--- a/projects/packages/sync/changelog/add-jp-search-sync2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Jetpack Search :: update the allowed post meta when search is active to include all indexable meta.
diff --git a/projects/packages/sync/changelog/add-visitor-status b/projects/packages/sync/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/sync/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/sync/changelog/update-project-scripts-no-install b/projects/packages/sync/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/sync/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/sync/changelog/update-wpcs-to-dev-branch b/projects/packages/sync/changelog/update-wpcs-to-dev-branch
new file mode 100644
index 0000000000000..09ac220faa608
--- /dev/null
+++ b/projects/packages/sync/changelog/update-wpcs-to-dev-branch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed some new PHPCS warnings.
diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json
index 3b1c013be50c0..3b03f13a6811e 100644
--- a/projects/packages/sync/composer.json
+++ b/projects/packages/sync/composer.json
@@ -7,7 +7,7 @@
 		"automattic/jetpack-connection": "^1.36",
 		"automattic/jetpack-constants": "^1.6",
 		"automattic/jetpack-heartbeat": "^1.4",
-		"automattic/jetpack-identity-crisis": "^0.6",
+		"automattic/jetpack-identity-crisis": "^0.7",
 		"automattic/jetpack-options": "^1.14",
 		"automattic/jetpack-password-checker": "^0.2",
 		"automattic/jetpack-roles": "^1.4",
diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php
index 30107c557a3d6..cec2c534418ce 100644
--- a/projects/packages/sync/src/class-package-version.php
+++ b/projects/packages/sync/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.29.0-alpha';
+	const PACKAGE_VERSION = '1.29.2-alpha';
 
 	const PACKAGE_SLUG = 'sync';
 
diff --git a/projects/packages/sync/src/class-queue.php b/projects/packages/sync/src/class-queue.php
index fe80cf9019021..0bb31cdae8e9c 100644
--- a/projects/packages/sync/src/class-queue.php
+++ b/projects/packages/sync/src/class-queue.php
@@ -735,7 +735,7 @@ private function validate_checkout( $buffer ) {
 		}
 
 		// TODO: change to strict comparison.
-		if ( $checkout_id != $buffer->id ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		if ( $checkout_id != $buffer->id ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseNotEqual
 			return new WP_Error( 'buffer_mismatch', 'The buffer you checked in was not checked out' );
 		}
 
diff --git a/projects/packages/sync/src/modules/class-plugins.php b/projects/packages/sync/src/modules/class-plugins.php
index b244834f54699..84c45b6de857e 100644
--- a/projects/packages/sync/src/modules/class-plugins.php
+++ b/projects/packages/sync/src/modules/class-plugins.php
@@ -205,7 +205,7 @@ private function get_plugin_info( $slug ) {
 		$plugins = get_plugins(); // Get the most up to date info.
 		if ( isset( $plugins[ $slug ] ) ) {
 			return array_merge( array( 'slug' => $slug ), $plugins[ $slug ] );
-		};
+		}
 		// Try grabbing the info from before the update.
 		return isset( $this->plugins[ $slug ] ) ? array_merge( array( 'slug' => $slug ), $this->plugins[ $slug ] ) : array( 'slug' => $slug );
 	}
diff --git a/projects/packages/terms-of-service/CHANGELOG.md b/projects/packages/terms-of-service/CHANGELOG.md
index f9b91333e7dd0..b714f4d9b570b 100644
--- a/projects/packages/terms-of-service/CHANGELOG.md
+++ b/projects/packages/terms-of-service/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.19] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.9.18] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -182,6 +186,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Package: Create new TOS package
 
+[1.9.19]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.18...v1.9.19
 [1.9.18]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.17...v1.9.18
 [1.9.17]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.16...v1.9.17
 [1.9.16]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.15...v1.9.16
diff --git a/projects/packages/terms-of-service/changelog/add-visitor-status b/projects/packages/terms-of-service/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/terms-of-service/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/terms-of-service/changelog/update-project-scripts-no-install b/projects/packages/terms-of-service/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/terms-of-service/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/tracking/CHANGELOG.md b/projects/packages/tracking/CHANGELOG.md
index 970ab75772cab..92dcfaa26965d 100644
--- a/projects/packages/tracking/CHANGELOG.md
+++ b/projects/packages/tracking/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.14.1] - 2022-01-25
+### Changed
+- Updated package dependencies.
+
 ## [1.14.0] - 2022-01-04
 ### Changed
 - Switch to pcov for code coverage.
@@ -206,6 +210,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Create package for Jetpack Tracking
 
+[1.14.1]: https://github.com/Automattic/jetpack-tracking/compare/v1.14.0...v1.14.1
 [1.14.0]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.19...v1.14.0
 [1.13.19]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.18...v1.13.19
 [1.13.18]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.17...v1.13.18
diff --git a/projects/packages/tracking/changelog/add-fancy-eslint-ignore b/projects/packages/tracking/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index afe95e481cf32..0000000000000
--- a/projects/packages/tracking/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/packages/tracking/changelog/add-visitor-status b/projects/packages/tracking/changelog/add-visitor-status
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/packages/tracking/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/packages/tracking/changelog/update-project-scripts-no-install b/projects/packages/tracking/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/packages/tracking/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/packages/tracking/composer.json b/projects/packages/tracking/composer.json
index ea086a77f7ed4..1b4d2e003bc87 100644
--- a/projects/packages/tracking/composer.json
+++ b/projects/packages/tracking/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-assets": "^1.16",
+		"automattic/jetpack-assets": "^1.17",
 		"automattic/jetpack-options": "^1.14",
 		"automattic/jetpack-status": "^1.10",
 		"automattic/jetpack-terms-of-service": "^1.9"
diff --git a/projects/packages/waf/.gitattributes b/projects/packages/waf/.gitattributes
new file mode 100644
index 0000000000000..9f76af3f06e7e
--- /dev/null
+++ b/projects/packages/waf/.gitattributes
@@ -0,0 +1,16 @@
+# Files not needed to be distributed in the package.
+.gitattributes    export-ignore
+.github/          export-ignore
+package.json      export-ignore
+
+# Files to include in the mirror repo, but excluded via gitignore
+# Remember to end all directories with `/**` to properly tag every file.
+# /src/js/example.min.js  production-include
+
+# Files to exclude from the mirror repo, but included in the monorepo.
+# Remember to end all directories with `/**` to properly tag every file.
+.gitignore        production-exclude
+changelog/**      production-exclude
+phpunit.xml.dist  production-exclude
+.phpcs.dir.xml    production-exclude
+tests/**          production-exclude
diff --git a/projects/packages/waf/.gitignore b/projects/packages/waf/.gitignore
new file mode 100644
index 0000000000000..140fd587d2d52
--- /dev/null
+++ b/projects/packages/waf/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+node_modules/
diff --git a/projects/packages/waf/.phpcs.dir.xml b/projects/packages/waf/.phpcs.dir.xml
new file mode 100644
index 0000000000000..0b414c4ced0b6
--- /dev/null
+++ b/projects/packages/waf/.phpcs.dir.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<ruleset>
+
+	<!-- This is not WordPress code. -->
+	<rule ref="WordPress.Files.FileName">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.NamingConventions.ValidFunctionName">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.NamingConventions.ValidVariableName">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.PHP.DiscouragedPHPFunctions">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Security.EscapeOutput.OutputNotEscaped">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.WP.AlternativeFunctions">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Security.NonceVerification.Recommended">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.Security.NonceVerification.Missing">
+		<severity>0</severity>
+	</rule>
+	<rule ref="WordPress.PHP.DevelopmentFunctions.error_log_var_export">
+		<severity>0</severity>
+	</rule>
+</ruleset>
diff --git a/projects/packages/waf/CHANGELOG.md b/projects/packages/waf/CHANGELOG.md
new file mode 100644
index 0000000000000..03a962f457f66
--- /dev/null
+++ b/projects/packages/waf/CHANGELOG.md
@@ -0,0 +1,6 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
diff --git a/projects/packages/waf/README.md b/projects/packages/waf/README.md
new file mode 100644
index 0000000000000..c72f0cf32aa6f
--- /dev/null
+++ b/projects/packages/waf/README.md
@@ -0,0 +1,9 @@
+# waf
+
+Tools to assist with the Jetpack Web Application Firewall
+
+Need to report a security vulnerability? Go to [https://automattic.com/security/](https://automattic.com/security/) or directly to our security bug bounty site [https://hackerone.com/automattic](https://hackerone.com/automattic).
+
+## License
+
+waf is licensed under [GNU General Public License v2 (or later)](./LICENSE.txt)
diff --git a/projects/packages/waf/changelog/.gitkeep b/projects/packages/waf/changelog/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/projects/packages/waf/changelog/add-waf-package b/projects/packages/waf/changelog/add-waf-package
new file mode 100644
index 0000000000000..22245f547f57f
--- /dev/null
+++ b/projects/packages/waf/changelog/add-waf-package
@@ -0,0 +1,4 @@
+Significance: major
+Type: added
+
+added Initial version
diff --git a/projects/packages/waf/changelog/update-ignored-config-waf b/projects/packages/waf/changelog/update-ignored-config-waf
new file mode 100644
index 0000000000000..6a66cee0d2688
--- /dev/null
+++ b/projects/packages/waf/changelog/update-ignored-config-waf
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Core: do not ship .phpcs.dir.xml in production builds.
diff --git a/projects/packages/waf/composer.json b/projects/packages/waf/composer.json
new file mode 100644
index 0000000000000..6978dd41e99fe
--- /dev/null
+++ b/projects/packages/waf/composer.json
@@ -0,0 +1,50 @@
+{
+	"name": "automattic/jetpack-waf",
+	"description": "Tools to assist with the Jetpack Web Application Firewall",
+	"type": "library",
+	"license": "GPL-2.0-or-later",
+	"require": {
+		"wikimedia/aho-corasick": "^1.0"
+	},
+	"require-dev": {
+		"yoast/phpunit-polyfills": "1.0.3",
+		"automattic/jetpack-changelogger": "^3.0"
+	},
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	},
+	"scripts": {
+		"phpunit": [
+			"./vendor/phpunit/phpunit/phpunit --colors=always"
+		],
+		"test-coverage": [
+			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+		],
+		"test-php": [
+			"@composer phpunit"
+		]
+	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../../packages/*",
+			"options": {
+				"monorepo": true
+			}
+		}
+	],
+	"minimum-stability": "dev",
+	"prefer-stable": true,
+	"extra": {
+		"autotagger": true,
+		"mirror-repo": "Automattic/jetpack-waf",
+		"changelogger": {
+			"link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}"
+		},
+		"branch-alias": {
+			"dev-master": "0.1.x-dev"
+		}
+	}
+}
diff --git a/projects/packages/waf/phpunit.xml.dist b/projects/packages/waf/phpunit.xml.dist
new file mode 100644
index 0000000000000..3223c32458db2
--- /dev/null
+++ b/projects/packages/waf/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<phpunit bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" convertDeprecationsToExceptions="true">
+	<testsuites>
+		<testsuite name="main">
+			<directory prefix="test" suffix=".php">tests/php</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="false">
+			<!-- Better to only include "src" than to add "." and then exclude "tests", "vendor", and so on, as PHPUnit still scans the excluded directories. -->
+			<!-- Add additional lines for any files or directories outside of src/ that need coverage. -->
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/projects/packages/waf/src/class-waf-operators.php b/projects/packages/waf/src/class-waf-operators.php
new file mode 100644
index 0000000000000..3ad7b537e6674
--- /dev/null
+++ b/projects/packages/waf/src/class-waf-operators.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Rule compiler for Jetpack Waf.
+ *
+ * @package automattic/jetpack-waf
+ */
+
+namespace Automattic\Jetpack\Waf;
+
+/**
+ * WafOperators class
+ */
+class WafOperators {
+	/**
+	 * Returns true if the test string is found at the beginning of the input.
+	 *
+	 * @param string $input Input.
+	 * @param string $test Test.
+	 * @return string|false
+	 */
+	public function begins_with( $input, $test ) {
+		if ( '' === $input && '' === $test ) {
+			return '';
+		}
+
+		return substr( $input, 0, strlen( $test ) ) === $test
+		? $test
+		: false;
+	}
+
+	/**
+	 * Returns true if the test string is found anywhere in the input.
+	 *
+	 * @param string $input Input.
+	 * @param string $test Test.
+	 * @return string|false
+	 */
+	public function contains( $input, $test ) {
+		if ( empty( $input ) || empty( $test ) ) {
+			return false;
+		}
+
+		return strpos( $input, $test ) !== false
+		? $test
+		: false;
+	}
+
+	/**
+	 * Returns true if the test string with word boundaries is found anywhere in the input.
+	 *
+	 * @param string $input Input.
+	 * @param string $test Test.
+	 * @return string|false
+	 */
+	public function contains_word( $input, $test ) {
+		return ( $input === $test || 1 === preg_match( '/\b' . preg_quote( $test, '/' ) . '\b/Ds', $input ) )
+		? $test
+		: false;
+	}
+
+	/**
+	 * Returns true if the test string is found at the end of the input.
+	 *
+	 * @param string $input Input.
+	 * @param string $test Test.
+	 * @return string|false
+	 */
+	public function ends_with( $input, $test ) {
+		return ( '' === $test || substr( $input, -1 * strlen( $test ) ) === $test )
+		? $test
+		: false;
+	}
+
+	/**
+	 * Returns true if the input value is equal to the test value.
+	 * If either value cannot be converted to an int it will be treated as 0.
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return int|false
+	 */
+	public function eq( $input, $test ) {
+		return intval( $input ) === intval( $test )
+		? $input
+		: false;
+	}
+
+	/**
+	 * Returns true if the input value is greater than or equal to the test value.
+	 * If either value cannot be converted to an int it will be treated as 0.
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return int|false
+	 */
+	public function ge( $input, $test ) {
+		return intval( $input ) >= intval( $test )
+		? $input
+		: false;
+	}
+
+	/**
+	 * Returns true if the input value is greater than the test value.
+	 * If either value cannot be converted to an int it will be treated as 0.
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return int|false
+	 */
+	public function gt( $input, $test ) {
+		return intval( $input ) > intval( $test )
+		? $input
+		: false;
+	}
+
+	/**
+	 * Returns true if the input value is less than or equal to the test value.
+	 * If either value cannot be converted to an int it will be treated as 0.
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return int|false
+	 */
+	public function le( $input, $test ) {
+		return intval( $input ) <= intval( $test )
+		? $input
+		: false;
+	}
+
+	/**
+	 * Returns true if the input value is less than the test value.
+	 * If either value cannot be converted to an int it will be treated as 0.
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return int|false
+	 */
+	public function lt( $input, $test ) {
+		return intval( $input ) < intval( $test )
+		? $input
+		: false;
+	}
+
+	/**
+	 * Returns false.
+	 *
+	 * @return false
+	 */
+	public function no_match() {
+		return false;
+	}
+
+	/**
+	 * Uses a multi-string matching algorithm to search through $input for a number of given $words.
+	 *
+	 * @param string   $input Input.
+	 * @param string[] $words \AhoCorasick\MultiStringMatcher $matcher.
+	 * @return string[]|false Returns the words that were found in $input, or FALSE if no words were found.
+	 */
+	public function pm( $input, $words ) {
+		$results = $this->get_multi_string_matcher( $words )->searchIn( $input );
+
+		return isset( $results[0] )
+		? array_map(
+			function ( $r ) {
+				return $r[1]; },
+			$results
+		)
+		: false;
+	}
+
+	/**
+	 * The last-used pattern-matching algorithm.
+	 *
+	 * @var array
+	 */
+	private $last_multi_string_matcher = array( null, null );
+
+	/**
+	 * Creates a matcher that uses the Aho-Corasick algorithm to efficiently find a number of words in an input string.
+	 * Caches the last-used matcher so that the same word list doesn't have to be compiled multiple times.
+	 *
+	 * @param string[] $words Words.
+	 * @return \AhoCorasick\MultiStringMatcher
+	 */
+	private function get_multi_string_matcher( $words ) {
+		// only create a new matcher entity if we don't have one already for this word list.
+		if ( $this->last_multi_string_matcher[0] !== $words ) {
+			$this->last_multi_string_matcher = array( $words, new \AhoCorasick\MultiStringMatcher( $words ) );
+		}
+
+		return $this->last_multi_string_matcher[1];
+	}
+
+	/**
+	 * Performs a regular expression match on the input subject using the given pattern.
+	 * Returns false if the pattern does not match, or the substring(s) of the input
+	 * that were matched by the pattern.
+	 *
+	 * @param string $subject Subject.
+	 * @param string $pattern Pattern.
+	 * @return string[]|false
+	 */
+	public function rx( $subject, $pattern ) {
+		$matched = preg_match( $pattern, $subject, $matches );
+		return 1 === $matched
+			? $matches
+			: false;
+	}
+
+	/**
+	 * Returns true if the given input string matches the test string.
+	 *
+	 * @param string $input Input.
+	 * @param string $test Test.
+	 * @return string|false
+	 */
+	public function streq( $input, $test ) {
+		return $input === $test
+		? $test
+		: false;
+	}
+
+	/**
+	 * Returns true.
+	 *
+	 * @param string $input Input.
+	 * @return bool
+	 */
+	public function unconditional_match( $input ) {
+		return $input;
+	}
+
+	/**
+	 * Checks to see if the input string only contains characters within the given byte range
+	 *
+	 * @param string $input Input.
+	 * @param array  $valid_range Valid range.
+	 * @return string
+	 */
+	public function validate_byte_range( $input, $valid_range ) {
+		if ( '' === $input ) {
+			// an empty string is considered "valid".
+			return false;
+		}
+		$i = 0;
+		while ( isset( $input[ $i ] ) ) {
+			$n = ord( $input[ $i ] );
+			if ( $n < $valid_range['min'] || $n > $valid_range['max'] ) {
+				return $input[ $i ];
+			}
+			$valid = false;
+			foreach ( $valid_range['range'] as $b ) {
+				if ( $n === $b || is_array( $b ) && $n >= $b[0] && $n <= $b[1] ) {
+					$valid = true;
+					break;
+				}
+			}
+			if ( ! $valid ) {
+				return $input[ $i ];
+			}
+			$i++;
+		}
+
+		// if there weren't any invalid bytes, return false.
+		return false;
+	}
+
+	/**
+	 * Returns true if the input value is found anywhere inside the test value
+	 * (i.e. the inverse of @contains)
+	 *
+	 * @param mixed $input Input.
+	 * @param mixed $test Test.
+	 * @return string|false
+	 */
+	public function within( $input, $test ) {
+		if ( '' === $input || '' === $test ) {
+			return false;
+		}
+
+		return stripos( $test, $input ) !== false
+		? $input
+		: false;
+	}
+}
diff --git a/projects/packages/waf/src/class-waf-rule-compiler.php b/projects/packages/waf/src/class-waf-rule-compiler.php
new file mode 100644
index 0000000000000..9ffc18c3a29a0
--- /dev/null
+++ b/projects/packages/waf/src/class-waf-rule-compiler.php
@@ -0,0 +1,517 @@
+<?php
+/**
+ * Rule compiler for Jetpack Waf.
+ *
+ * @package automattic/jetpack-waf
+ */
+
+namespace Automattic\Jetpack\Waf;
+
+/**
+ * WafRuntime class
+ */
+class WafRuleCompiler {
+	/**
+	 * Maybe will change.
+	 *
+	 * @var array
+	 */
+	private $maybe_will_change = array();
+	/**
+	 * Marker map.
+	 *
+	 * @var array
+	 */
+	private $marker_map = array();
+	/**
+	 * Php.
+	 *
+	 * @var array
+	 */
+	private $php = array(
+		'<?php',
+	);
+
+	/**
+	 * Compile method.
+	 *
+	 * @param string $rules_json Rules in json format.
+	 */
+	public function compile( $rules_json ) {
+		foreach ( $rules_json as $rule ) {
+			if ( isset( $rule['expression'] ) ) {
+				// this is a normal rule
+				// add basic rule info.
+				$this->php[] = sprintf(
+					"\$rule = (object) array( 'id' => %s, 'reason' => %s, 'tags' => %s );",
+					var_export( $rule['id'], true ),
+					isset( $rule['reason'] ) ? $this->expand_macro( $rule['reason'] ) : "''",
+					var_export( isset( $rule['tags'] ) ? array_map( 'strtolower', $rule['tags'] ) : array(), true )
+				);
+				$rule_php    = $this->compile_rule( $rule );
+				$this->add_rule( $rule['id'], isset( $rule['tags'] ) ? $rule['tags'] : array(), $rule_php );
+			} elseif ( isset( $rule['actions'] ) ) {
+				// this is an actions-only rule.
+				$rule_php = $this->compile_actions( $rule['actions'] );
+				$this->add_rule( $rule['id'], isset( $rule['tags'] ) ? $rule['tags'] : array(), $rule_php );
+			} elseif ( isset( $rule['marker'] ) ) {
+				// this is a marker.
+				$this->add_marker( $rule['marker'] );
+			} else {
+				var_dump( 'UNKNOWN RULE:', $rule );
+				exit;
+			}
+		}
+		// check to see if there are any leftover markers.
+		if ( ! empty( $this->marker_map ) ) {
+			var_dump( 'Marker Map Is Not Empty!', $this->marker_map );
+			exit;
+		}
+	}
+
+	/**
+	 * Write rules to file.
+	 *
+	 * @param string $filepath File path.
+	 * @throws \Exception If file writing fails.
+	 */
+	public function write_to_file( $filepath ) {
+		$php_code = implode( PHP_EOL, $this->php );
+
+		$wp_filesystem = jpwaf_init_filesystem();
+		if ( ! $wp_filesystem ) {
+			throw new \Exception( 'No filesystem available' );
+		}
+		// ensure the folder exists.
+		if ( ! $wp_filesystem->is_writable( dirname( $filepath ) ) ) {
+			$wp_filesystem->mkdir( dirname( $filepath ) );
+		}
+		if ( ! $wp_filesystem->put_contents( $filepath, $php_code ) ) {
+			throw new \Exception( "Failed writing to: $filepath" );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Add rule.
+	 *
+	 * @param string $rule_id Rule id.
+	 * @param array  $rule_tags Rule tags.
+	 * @param array  $rule_php Rule php.
+	 */
+	private function add_rule( $rule_id, $rule_tags, $rule_php ) {
+		// wrap in a "if rule removed" check (only if a previous rule might be removing this rule).
+		if ( $this->check_if_maybe_will_change_at_runtime( 'rule', $rule_id, $rule_tags ) ) {
+			array_unshift( $rule_php, 'if(!$waf->rule_removed($rule->id, $rule->tags)) {' );
+			$rule_php[] = '}';
+		}
+		$this->php = array_merge( $this->php, $rule_php );
+		// add a marker in case another rules wants to skipAfter this rule.
+		$this->add_marker( $rule_id );
+	}
+
+	/**
+	 * Add marker.
+	 *
+	 * @param string $label Label.
+	 */
+	private function add_marker( $label ) {
+		if ( isset( $this->marker_map[ $label ] ) ) {
+			$this->php[] = $this->marker_map[ $label ] . ": // $label";
+			unset( $this->marker_map[ $label ] );
+		}
+	}
+
+	/**
+	 * Compile actions.
+	 *
+	 * @param array $actions Actions.
+	 */
+	private function compile_actions( $actions ) {
+		return array_map(
+			function ( $act ) {
+				switch ( $act['name'] ) {
+					case 'set_var':
+						// key, op, value.
+						$k = $this->expand_macro( strtolower( $act['key'] ) );
+						if ( 'x' === $act['op'] ) {
+							return sprintf(
+								'$waf->unset_var(%s);',
+								$k
+							);
+						} else {
+							$v  = $this->expand_macro( $act['value'] );
+							$fn = 'set_var';
+							if ( '+' === $act['op'] ) {
+								$fn = 'inc_var';
+							} elseif ( '-' === $act['op'] ) {
+								$fn = 'dec_var';
+							}
+							return sprintf(
+								'$waf->%s(%s,%s);',
+								$fn,
+								$k,
+								$v
+							);
+						}
+					case 'remove_target':
+						// make a note (for compiler use) other rules'
+						// targets may be updated based on ID or tag.
+						$this->maybe_will_change_at_runtime(
+							'target',
+							$act['prop'],
+							$act['value']
+						);
+						// add a runtime line.
+						return sprintf(
+							'$waf->flag_target_for_removal(%s,%s,%s,%s);',
+							var_export( $act['prop'], true ),
+							var_export( strtolower( $act['value'] ), true ),
+							var_export( strtolower( $act['targetName'] ), true ),
+							var_export( $act['targetProp'], true )
+						);
+					case 'remove_rule':
+						// make a note (for compiler use) other rules
+						// may be removed based on ID or tag.
+						$this->maybe_will_change_at_runtime( 'rule', $act['prop'], $act['value'] );
+						// add a runtime line.
+						return sprintf(
+							'$waf->flag_rule_for_removal(%s,%s);',
+							var_export( $act['prop'], true ),
+							var_export( $act['value'], true )
+						);
+					case 'set_reason':
+						return sprintf(
+							'$rule->reason = %s;',
+							$this->expand_macro( $act['reason'] )
+						);
+					default:
+						var_dump( $act );
+						exit;
+				}
+			},
+			$actions
+		);
+	}
+
+	/**
+	 * Compile rule.
+	 *
+	 * @param array $rule Rule.
+	 */
+	private function compile_rule( $rule ) {
+		// compile the the disruptive action.
+		$disruptive_action = '';
+		if ( $rule['action'] ) {
+			switch ( $rule['action']['name'] ) {
+				case 'block':
+				case 'deny':
+				case 'drop':
+					$disruptive_action = sprintf(
+						'return $waf->block(%s,$rule->id,$rule->reason,%s);',
+						var_export( $rule['action']['name'], true ),
+						var_export( $rule['action']['status'], true )
+					);
+					break;
+				case 'allow':
+					$disruptive_action = 'return;';
+					break;
+				case 'redirect':
+					$disruptive_action = sprintf(
+						'return $waf->redirect($rule->id,%s);',
+						var_export( $rule['action']['url'], true )
+					);
+					break;
+				case 'skipAfter':
+					$disruptive_action = sprintf(
+						'goto %s;',
+						$this->get_marker_label( $rule['action']['target'] )
+					);
+					break;
+			}
+		}
+		// compile the expressions.
+		return $this->compile_expression(
+			$rule['expression'],
+			$rule['id'],
+			isset( $rule['tags'] ) ? $rule['tags'] : array(),
+			$disruptive_action ? array( $disruptive_action ) : array(),
+			$rule
+		);
+	}
+
+	/**
+	 * Add marker.
+	 *
+	 * @param array  $expression Expression.
+	 * @param string $rule_id Rule id.
+	 * @param array  $rule_tags Rule tags.
+	 * @param array  $other_actions Other actions.
+	 * @param array  $rule Rule.
+	 */
+	private function compile_expression( $expression, $rule_id, $rule_tags, $other_actions, $rule ) {
+		$php_lines = array();
+		if ( 'and' === $expression['operator'] ) {
+			$php_lines = array_reduce(
+				array_reverse( $expression['expressions'] ),
+				function ( $lines, $expr ) use ( $rule_id, $rule_tags, $rule ) {
+					return $this->compile_expression( $expr, $rule_id, $rule_tags, $lines, $rule );
+				},
+				$other_actions
+			);
+		} elseif ( 'or' === $expression['operator'] ) {
+			die( 'or!' );
+		} else {
+			// Simple Expression
+			// prepare the targets.
+			$targets = array();
+			foreach ( $expression['targets'] as $t ) {
+				$t2 = $t;
+				if ( isset( $t2['only'] ) ) {
+					foreach ( $t2['only'] as $k => $v ) {
+						$t2['only'][ $k ] = '/' === $v[0]
+							? $v
+							: strtolower( $v );
+					}
+				}
+				if ( isset( $t2['except'] ) ) {
+					foreach ( $t2['except'] as $k => $v ) {
+						$t2['except'][ $k ] = '/' === $v[0]
+							? $v
+							: strtolower( $v );
+					}
+				}
+				unset( $t2['name'] );
+				$targets[ strtolower( $t['name'] ) ] = $t2;
+			}
+			$targets = var_export( $targets, true );
+			// if the targets for this rule may have been changed, then pass the targets
+			// to a method to update them at runtime.
+			if ( $this->check_if_maybe_will_change_at_runtime( 'target', $rule_id, $rule_tags ) ) {
+				$targets = sprintf(
+					'$waf->update_targets(%s, $rule->id, $rule->tags)',
+					$targets
+				);
+			}
+			// prepare the operation.
+			$op_name  = strtolower( $expression['operator'] );
+			$op_value = $expression['value'];
+			// these operators support macro expansion, which we can do some of ahead of time.
+			// the rest have their values directly printed out in PHP.
+			$expand_macro_operators = array(
+				'beginswith',
+				'contains',
+				'containsword',
+				'endswith',
+				'eq',
+				'ge',
+				'gt',
+				'le',
+				'lt',
+				'rsub',
+				'streq',
+				'within',
+				'',
+			);
+			if ( in_array( $op_name, $expand_macro_operators, true ) ) {
+				$op_value = $this->expand_macro( $op_value );
+			} else {
+				if ( 'validatebyterange' === $op_name ) {
+					$op_value = self::parse_byte_range( $op_value );
+				}
+				$op_value = var_export( $op_value, true );
+			}
+			// write the condition.
+			$php_lines[] = sprintf(
+				'if($waf->match_targets(%s,%s,%s,%s,%s,%s)) {',
+				var_export( isset( $rule['transforms'] ) ? $rule['transforms'] : array(), true ),
+				$targets,
+				var_export( $op_name, true ),
+				$op_value,
+				$expression['not'] ? 'true' : 'false',
+				$expression['capture'] ? 'true' : 'false'
+			);
+
+			// add the actions.
+			$php_lines = array_merge(
+				$php_lines,
+				$this->compile_actions(
+					isset( $expression['actions'] )
+					? $expression['actions']
+					: array()
+				),
+				$other_actions
+			);
+			// close the condition block.
+			$php_lines[] = '}';
+		}
+
+		return $php_lines;
+	}
+
+	/**
+	 * Expand macro.
+	 *
+	 * @param string $v Value.
+	 */
+	private function expand_macro( $v ) {
+		if ( '' === $v ) {
+			return "''";
+		}
+		$matched  = array();
+		$replaced = preg_replace_callback(
+			'/%\{[\w\.\-]+\}/',
+			function ( $m ) use ( &$matched ) {
+				$k = strtolower( substr( $m[0], 2, -1 ) );
+				if ( 1 === preg_match( '/^(tx|ip)\./', $k ) ) {
+					$matched[] = '$waf->get_var(' . var_export( $k, true ) . ')';
+				} elseif ( strpos( $k, 'request_headers.' ) === 0 ) {
+					$matched[] = "\$waf->meta('headers', " . var_export( substr( $k, 16 ), true ) . ')';
+				} else {
+					switch ( $k ) {
+						case 'matched_var':
+							$matched[] = '$waf->matched_var';
+							break;
+						case 'matched_var_name':
+							$matched[] = '$waf->matched_var_name';
+							break;
+						case 'remote_addr':
+						case 'request_line':
+							$matched[] = '$waf->meta(\'' . $k . '\')';
+							break;
+						case 'rule.msg':
+						case 'rule.reason':
+							$matched[] = '$rule->reason';
+							break;
+						case 'reqbody_error_msg':
+							$matched[] = '';
+							// these are unsupported macros from modsecurity.
+							break;
+						default:
+							$matched[] = '';
+							var_dump( 'Unknown macro:', $m );
+					}
+				}
+				return "\r\f\r";
+			},
+			$v
+		);
+		$parts    = array_filter(
+			preg_split( '/\r+/', $replaced ),
+			function ( $s ) {
+				return '' !== $s; }
+		);
+		$parts    = array_map(
+			function ( $s ) use ( &$matched ) {
+				return "\f" === $s
+					? array_shift( $matched )
+					: var_export( $s, true );
+			},
+			$parts
+		);
+		$parts    = array_filter(
+			$parts,
+			function ( $s ) {
+				return '' !== $s;
+			}
+		);
+		$string   = implode( '.', $parts );
+		if ( preg_match( '/\.$/', $string ) ) {
+			var_dump(
+				$v,
+				$parts,
+				array_filter(
+					$parts,
+					function ( $p ) {
+						return null !== $p;
+					}
+				),
+				$string
+			);
+			exit;
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Maybe will change at runtime.
+	 *
+	 * @param string $type Type.
+	 * @param string $prop Prop.
+	 * @param string $value Value.
+	 */
+	private function maybe_will_change_at_runtime( $type, $prop, $value ) {
+		$key                             = strtolower( "$type/$prop/$value" );
+		$this->maybe_will_change[ $key ] = true;
+	}
+
+	/**
+	 * Check if maybe will change at runtime.
+	 *
+	 * @param string $type Type.
+	 * @param string $rule_id Rule id.
+	 * @param array  $rule_tags Rule tags.
+	 */
+	private function check_if_maybe_will_change_at_runtime( $type, $rule_id, $rule_tags ) {
+		// check to see if the rule ID might be targeted by a runtime action.
+		if ( isset( $this->maybe_will_change[ "$type/id/$rule_id" ] ) ) {
+			return true;
+		}
+		// check to see if one of the tags might be targeted by a runtime action.
+		foreach ( $rule_tags as $tag ) {
+			if ( isset( $this->maybe_will_change[ "$type/tag/$tag" ] ) ) {
+				return true;
+			}
+		}
+		// None of the rule's attributes are being targeted.
+		return false;
+	}
+
+	/**
+	 * Get marker label.
+	 *
+	 * @param string $name Name.
+	 */
+	private function get_marker_label( $name ) {
+		if ( ! isset( $this->marker_map[ $name ] ) ) {
+			$this->marker_map[ $name ] = preg_replace( '/\W/', '_', uniqid( 'marker_', true ) );
+		}
+		return $this->marker_map[ $name ];
+	}
+
+	/**
+	 * Given an array of byte numbers and/or ranges of numbers, compile into a data structure that will
+	 * be easier to evaluate at runtime.
+	 *
+	 * @param mixed $ranges Ranges.
+	 * @return array
+	 */
+	public static function parse_byte_range( $ranges ) {
+		$range = array();
+		$min   = PHP_INT_MAX;
+		$max   = 0;
+		foreach ( $ranges as $b ) {
+			if ( false === strpos( $b, '-' ) ) {
+				$b       = intval( $b );
+				$min     = min( $b, $min );
+				$max     = max( $b, $max );
+				$range[] = $b;
+			} else {
+				list( $b0, $b1 ) = preg_split( '/\s*-\s*/', $b );
+				$b0              = intval( $b0 );
+				$b1              = intval( $b1 );
+				$min             = min( $b0, $min );
+				$max             = max( $b1, $max );
+				$range[]         = array( $b0, $b1 );
+			}
+		}
+
+		return array(
+			'min'   => $min,
+			'max'   => $max,
+			'range' => $range,
+		);
+	}
+}
diff --git a/projects/packages/waf/src/class-waf-runtime.php b/projects/packages/waf/src/class-waf-runtime.php
new file mode 100644
index 0000000000000..b4af3dbdad069
--- /dev/null
+++ b/projects/packages/waf/src/class-waf-runtime.php
@@ -0,0 +1,643 @@
+<?php
+/**
+ * Runtime for Jetpack Waf
+ *
+ * @package automattic/jetpack-waf
+ */
+
+namespace Automattic\Jetpack\Waf;
+
+/**
+ * The environment variable that defined the WAF running mode.
+ *
+ * @var string JETPACK_WAF_MODE
+ */
+
+/**
+ * WafRuntime class
+ */
+class WafRuntime {
+
+	/**
+	 * Last rule.
+	 *
+	 * @var string
+	 */
+	public $last_rule = '';
+	/**
+	 * Matched vars.
+	 *
+	 * @var array
+	 */
+	public $matched_vars = array();
+	/**
+	 * Matched var.
+	 *
+	 * @var string
+	 */
+	public $matched_var = '';
+	/**
+	 * Matched var names.
+	 *
+	 * @var array
+	 */
+	public $matched_var_names = array();
+	/**
+	 * Matched var name.
+	 *
+	 * @var string
+	 */
+	public $matched_var_name = '';
+
+	/**
+	 * State.
+	 *
+	 * @var array
+	 */
+	private $state = array();
+	/**
+	 * Metadata.
+	 *
+	 * @var array
+	 */
+	private $metadata = array();
+
+	/**
+	 * Transforms.
+	 *
+	 * @var WafTransforms[]
+	 */
+	private $transforms;
+	/**
+	 * Operators.
+	 *
+	 * @var WafOperators[]
+	 */
+	private $operators;
+
+	/**
+	 * Rules to remove.
+	 *
+	 * @var array[]
+	 */
+	private $rules_to_remove = array(
+		'id'  => array(),
+		'tag' => array(),
+	);
+
+	/**
+	 * Targets to remove.
+	 *
+	 * @var array[]
+	 */
+	private $targets_to_remove = array(
+		'id'  => array(),
+		'tag' => array(),
+	);
+
+	/**
+	 * Constructor method.
+	 *
+	 * @param WafTransforms $transforms Transforms.
+	 * @param WafOperators  $operators Operators.
+	 */
+	public function __construct( $transforms, $operators ) {
+		$this->transforms = $transforms;
+		$this->operators  = $operators;
+	}
+
+	/**
+	 * Rule removed method.
+	 *
+	 * @param string   $id Ids.
+	 * @param string[] $tags Tags.
+	 */
+	public function rule_removed( $id, $tags ) {
+		if ( isset( $this->rules_to_remove['id'][ $id ] ) ) {
+			return true;
+		}
+		foreach ( $tags as $tag ) {
+			if ( isset( $this->rules_to_remove['tag'][ $tag ] ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Update Targets.
+	 *
+	 * @param array    $targets Targets.
+	 * @param string   $rule_id Rule id.
+	 * @param string[] $rule_tags Rule tags.
+	 */
+	public function update_targets( $targets, $rule_id, $rule_tags ) {
+		$updates = array();
+		// look for target updates based on the rule's ID.
+		if ( isset( $this->targets_to_remove['id'][ $rule_id ] ) ) {
+			foreach ( $this->targets_to_remove['id'][ $rule_id ] as $name => $props ) {
+				$updates[] = array( $name, $props );
+			}
+		}
+		// look for target updates based on the rule's tags.
+		foreach ( $rule_tags as $tag ) {
+			if ( isset( $this->targets_to_remove['tag'][ $tag ] ) ) {
+				foreach ( $this->targets_to_remove['tag'][ $tag ] as $name => $props ) {
+					$updates[] = array( $name, $props );
+				}
+			}
+		}
+		// apply any found target updates.
+
+		foreach ( $updates as list( $name, $props ) ) {
+			if ( isset( $targets[ $name ] ) ) {
+				// we only need to remove targets that exist.
+				if ( true === $props ) {
+					// if the entire target is being removed, remove it.
+					unset( $targets[ $name ] );
+				} else {
+					// otherwise just mark single props to ignore.
+					$targets[ $name ]['except'] = array_merge(
+						isset( $targets[ $name ]['except'] ) ? $targets[ $name ]['except'] : array(),
+						$props
+					);
+				}
+			}
+		}
+		return $targets;
+	}
+
+	/**
+	 * Return TRUE if at least one of the targets matches the rule.
+	 *
+	 * @param string[] $transforms One of the transform methods defined in the JetpackWafTransforms class.
+	 * @param mixed    $targets Targets.
+	 * @param string   $match_operator Match operator.
+	 * @param mixed    $match_value Match value.
+	 * @param bool     $match_not Match not.
+	 * @param bool     $capture Capture.
+	 * @return bool
+	 */
+	public function match_targets( $transforms, $targets, $match_operator, $match_value, $match_not, $capture = false ) {
+		$this->matched_vars      = array();
+		$this->matched_var_names = array();
+		$this->matched_var       = '';
+		$this->matched_var_name  = '';
+		$match_found             = false;
+
+		// get values.
+		$values = $this->normalize_targets( $targets );
+
+		// apply transforms.
+		foreach ( $transforms as $t ) {
+			foreach ( $values as &$v ) {
+				$v['value'] = $this->transforms->$t( $v['value'] );
+			}
+		}
+
+		// pass each target value to the operator to find any that match.
+		$matched  = array();
+		$captures = array();
+		foreach ( $values as $v ) {
+			$match     = $this->operators->{$match_operator}( $v['value'], $match_value );
+			$did_match = false !== $match;
+			if ( $match_not !== $did_match ) {
+				// If either:
+				// - rule is negated ("not" flag set) and the target was not matched
+				// - rule not negated and the target was matched
+				// then this is considered a match.
+				$match_found               = true;
+				$this->matched_var_names[] = $v['source'];
+				$this->matched_vars[]      = $v['value'];
+				$this->matched_var_name    = end( $this->matched_var_names );
+				$this->matched_var         = end( $this->matched_vars );
+				$matched[]                 = array( $v, $match );
+				// Set any captured matches into state if the rule has the "capture" flag.
+				if ( $capture ) {
+					$captures = is_array( $match ) ? $match : array( $match );
+					foreach ( array_slice( $captures, 0, 10 )  as $i => $c ) {
+						$this->set_var( "tx.$i", $c );
+					}
+				}
+			}
+		}
+
+		return $match_found;
+	}
+
+	/**
+	 * Block.
+	 *
+	 * @param string $action Action.
+	 * @param string $rule_id Rule id.
+	 * @param string $reason Block reason.
+	 * @param int    $status_code Http status code.
+	 */
+	public function block( $action, $rule_id, $reason, $status_code = 403 ) {
+		if ( ! $reason ) {
+			$reason = "rule $rule_id";
+		}
+		jpwaf_write_blocklog( $rule_id, $reason );
+		error_log( "Jetpack WAF Blocked Request\t$action\t$rule_id\t$status_code\t$reason" );
+		header( "X-JetpackWAF-Blocked: $status_code $reason" );
+		if ( defined( 'JETPACK_WAF_MODE' ) && 'normal' === JETPACK_WAF_MODE ) {
+			header( $_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, $status_code );
+			die( "rule $rule_id" );
+		}
+	}
+
+	/**
+	 * Redirect.
+	 *
+	 * @param string $rule_id Rule id.
+	 * @param string $url Url.
+	 */
+	public function redirect( $rule_id, $url ) {
+		error_log( "Jetpack WAF Redirected Request.\tRule:$rule_id\t$url" );
+		header( "Location: $url" );
+		exit;
+	}
+
+	/**
+	 * Flag rule for removal.
+	 *
+	 * @param string $prop Prop.
+	 * @param string $value Value.
+	 */
+	public function flag_rule_for_removal( $prop, $value ) {
+		if ( 'id' === $prop ) {
+			$this->rules_to_remove['id'][ $value ] = true;
+		} else {
+			$this->rules_to_remove['tag'][ $value ] = true;
+		}
+	}
+
+	/**
+	 * Flag target for removal.
+	 *
+	 * @param string $id_or_tag Id or tag.
+	 * @param string $id_or_tag_value Id or tag value.
+	 * @param string $name Name.
+	 * @param string $prop Prop.
+	 */
+	public function flag_target_for_removal( $id_or_tag, $id_or_tag_value, $name, $prop = null ) {
+		if ( null === $prop ) {
+			$this->targets_to_remove[ $id_or_tag ][ $id_or_tag_value ][ $name ] = true;
+		} else {
+			if (
+				! isset( $this->targets_to_remove[ $id_or_tag ][ $id_or_tag_value ][ $name ] )
+				// if the entire target is already being removed then it would be redundant to remove a single property.
+				|| true !== $this->targets_to_remove[ $id_or_tag ][ $id_or_tag_value ][ $name ]
+			) {
+				$this->targets_to_remove[ $id_or_tag ][ $id_or_tag_value ][ $name ][] = $prop;
+			}
+		}
+	}
+
+	/**
+	 * Get variable value.
+	 *
+	 * @param string $key Key.
+	 */
+	public function get_var( $key ) {
+		return isset( $this->state[ $key ] )
+			? $this->state[ $key ]
+			: '';
+	}
+
+	/**
+	 * Set variable value.
+	 *
+	 * @param string $key Key.
+	 * @param string $value Value.
+	 */
+	public function set_var( $key, $value ) {
+		$this->state[ $key ] = $value;
+	}
+
+	/**
+	 * Increment variable.
+	 *
+	 * @param string $key Key.
+	 * @param mixed  $value Value.
+	 */
+	public function inc_var( $key, $value ) {
+		if ( ! isset( $this->state[ $key ] ) ) {
+			$this->state[ $key ] = 0;
+		}
+		$this->state[ $key ] += floatval( $value );
+	}
+
+	/**
+	 * Decrement variable.
+	 *
+	 * @param string $key Key.
+	 * @param mixed  $value Value.
+	 */
+	public function dec_var( $key, $value ) {
+		if ( ! isset( $this->state[ $key ] ) ) {
+			$this->state[ $key ] = 0;
+		}
+		$this->state[ $key ] -= floatval( $value );
+	}
+
+	/**
+	 * Unset variable.
+	 *
+	 * @param string $key Key.
+	 */
+	public function unset_var( $key ) {
+		unset( $this->state[ $key ] );
+	}
+
+	/**
+	 * Meta.
+	 *
+	 * @param string $key Key.
+	 * @param string $prop Prop.
+	 */
+	public function meta( $key, $prop = false ) {
+		if ( ! isset( $this->metadata[ $key ] ) ) {
+			$value = null;
+			switch ( $key ) {
+				case 'headers':
+					$value = array();
+					foreach ( $_SERVER as $k => $v ) {
+						$k = strtolower( $k );
+						if ( 'http_' === substr( $k, 0, 5 ) ) {
+							$value[ $this->normalizeHeaderName( substr( $k, 0, 5 ) ) ] = $v;
+						} elseif ( 'content_type' === $k ) {
+							$value['content-type'] = $v;
+						} elseif ( 'content_length' === $k ) {
+							$value['content-length'] = $v;
+						}
+					}
+					$value['content-type'] = ( ! isset( $value['content-type'] ) || '' === $value['content-type'] )
+						// default Content-Type per RFC 7231 section 3.1.5.5.
+						? 'application/octet-stream'
+						: $value['content-type'];
+					$value['content-length'] = ( isset( $value['content-length'] ) && '' !== $value['content-length'] )
+						? $value['content-length']
+						// if the content-length header is missing, default it to zero.
+						: '0';
+					break;
+				case 'remote_addr':
+					$value = '';
+					if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
+						$value = $_SERVER['HTTP_CLIENT_IP'];
+					} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+						$value = $_SERVER['HTTP_X_FORWARDED_FOR'];
+					} elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
+						$value = $_SERVER['REMOTE_ADDR'];
+					}
+					break;
+				case 'request_method':
+					$value = empty( $_SERVER['REQUEST_METHOD'] )
+						? 'GET'
+						: $_SERVER['REQUEST_METHOD'];
+					break;
+				case 'request_protocol':
+					$value = empty( $_SERVER['SERVER_PROTOCOL'] )
+						? ( empty( $_SERVER['HTTPS'] ) ? 'HTTP' : 'HTTPS' )
+						: $_SERVER['SERVER_PROTOCOL'];
+					break;
+				case 'request_uri':
+					$value = isset( $_SERVER['REQUEST_URI'] )
+						? $_SERVER['REQUEST_URI']
+						: '';
+					break;
+				case 'request_uri_raw':
+					$value = ( isset( $_SERVER['https'] ) ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . $this->meta( 'request_uri' );
+					break;
+				case 'request_filename':
+					$value = strtok(
+						isset( $_SERVER['REQUEST_URI'] )
+							? $_SERVER['REQUEST_URI']
+							: '',
+						'?'
+					);
+					break;
+				case 'request_line':
+					$value = sprintf(
+						'%s %s %s',
+						$this->meta( 'request_method' ),
+						$this->meta( 'request_uri' ),
+						$this->meta( 'request_protocol' )
+					);
+					break;
+				case 'request_basename':
+					$value = basename( $this->meta( 'request_filename' ) );
+					break;
+				case 'request_body':
+					$value = file_get_contents( 'php://input' );
+					break;
+				case 'query_string':
+					$value = isset( $_SERVER['QUERY_STRING'] ) ? $_SERVER['QUERY_STRING'] : '';
+			}
+			$this->metadata[ $key ] = $value;
+		}
+
+		return false === $prop
+			? $this->metadata[ $key ]
+			: ( isset( $this->metadata[ $key ][ $prop ] ) ? $this->metadata[ $key ][ $prop ] : '' );
+	}
+
+	/**
+	 * State values.
+	 *
+	 * @param string $prefix Prefix.
+	 */
+	private function state_values( $prefix ) {
+		$output = array();
+		$len    = strlen( $prefix );
+		foreach ( $this->state as $k => $v ) {
+			if ( 0 === stripos( $k, $prefix ) ) {
+				$output[ substr( $k, $len ) ] = $v;
+			}
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Change a string to all lowercase and replace spaces and underscores with dashes.
+	 *
+	 * @param string $name Name.
+	 * @return string
+	 */
+	public function normalize_header_name( $name ) {
+		return str_replace( array( ' ', '_' ), '-', strtolower( $name ) );
+	}
+
+	/**
+	 * Normalize targets.
+	 *
+	 * @param array $targets Targets.
+	 */
+	public function normalize_targets( $targets ) {
+		$return = array();
+		foreach ( $targets as $k => $v ) {
+			$count_only = isset( $v['count'] );
+			$only       = isset( $v['only'] ) ? $v['only'] : array();
+			$except     = isset( $v['except'] ) ? $v['except'] : array();
+			$_k         = strtolower( $k );
+			switch ( $_k ) {
+				case 'request_headers':
+					$only   = array_map(
+						function ( $t ) {
+							return '/' === $t[0] ? $t : $this->normalize_header_name( $t );
+						},
+						$only
+					);
+					$except = array_map(
+						function ( $t ) {
+							return '/' === $t[0] ? $t : $this->normalize_header_name( $t );
+						},
+						$except
+					);
+					$this->normalize_array_target( $this->meta( 'headers' ), $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'request_headers_names':
+					$this->normalize_array_target( array_keys( $this->meta( 'headers' ) ), array(), array(), $k, $return, $count_only );
+					continue 2;
+				case 'request_method':
+				case 'request_protocol':
+				case 'request_uri':
+				case 'request_uri_raw':
+				case 'request_filename':
+				case 'remote_addr':
+				case 'request_basename':
+				case 'request_body':
+				case 'query_string':
+				case 'request_line':
+					$v = $this->meta( $_k );
+					break;
+				case 'tx':
+				case 'ip':
+					$this->normalize_array_target( $this->state_values( "$k." ), $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'request_cookies':
+					$this->normalize_array_target( $_COOKIE, $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'request_cookies_names':
+					$this->normalize_array_target( array_keys( $_COOKIE ), array(), array(), $k, $return, $count_only );
+					continue 2;
+				case 'args':
+					$this->normalize_array_target( $_REQUEST, $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'args_names':
+					$this->normalize_array_target( array_keys( $_REQUEST ), array(), array(), $k, $return, $count_only );
+					continue 2;
+				case 'args_get':
+					$this->normalize_array_target( $_GET, $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'args_get_names':
+					$this->normalize_array_target( array_keys( $_GET ), array(), array(), $k, $return, $count_only );
+					continue 2;
+				case 'args_post':
+					$this->normalize_array_target( $_POST, $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'args_post_names':
+					$this->normalize_array_target( array_keys( $_POST ), array(), array(), $k, $return, $count_only );
+					continue 2;
+				case 'files':
+					$names = array_map(
+						function ( $f ) {
+							return $f['name'];
+						},
+						$_FILES
+					);
+					$this->normalize_array_target( $names, $only, $except, $k, $return, $count_only );
+					continue 2;
+				case 'files_names':
+					$this->normalize_array_target( array_keys( $_FILES ), $only, $except, $k, $return, $count_only );
+					continue 2;
+				default:
+					var_dump( 'Unknown target', $k, $v );
+					exit;
+			}
+			$return[] = array(
+				'name'   => $k,
+				'value'  => $v,
+				'source' => $k,
+			);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Normalize array target.
+	 *
+	 * @param array  $source Source.
+	 * @param array  $only Only.
+	 * @param array  $excl Excl.
+	 * @param string $name Name.
+	 * @param array  $results Results.
+	 * @param bool   $count_only Count only.
+	 */
+	private function normalize_array_target( $source, $only, $excl, $name, &$results, $count_only ) {
+		$output   = array();
+		$has_only = isset( $only[0] );
+		$has_excl = isset( $excl[0] );
+
+		if ( $has_only ) {
+			foreach ( $only as $prop ) {
+				if ( isset( $source[ $prop ] ) && $this->key_matches( $prop, $only ) ) {
+					$output[ $prop ] = $source[ $prop ];
+				}
+			}
+		} else {
+			$output = $source;
+		}
+
+		if ( $has_excl ) {
+			foreach ( array_keys( $output ) as $k ) {
+				if ( $this->key_matches( $k, $excl ) ) {
+					unset( $output[ $k ] );
+				}
+			}
+		}
+
+		// todo: normalize nested arrays in values??
+		if ( $count_only ) {
+			$results[] = array(
+				'name'   => $name,
+				'value'  => count( $output ),
+				'source' => '&' . $name,
+			);
+		} else {
+			foreach ( $output as $tk => $tv ) {
+				$results[] = array(
+					'name'   => $tk,
+					'value'  => $tv,
+					'source' => "$name:$tk",
+				);
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Key matches.
+	 *
+	 * @param string $input Input.
+	 * @param array  $patterns Patterns.
+	 */
+	private function key_matches( $input, $patterns ) {
+		foreach ( $patterns as $p ) {
+			if ( '/' === $p[0] ) {
+				if ( 1 === preg_match( $p, $input ) ) {
+					return true;
+				}
+			} else {
+				if ( 0 === strcasecmp( $p, $input ) ) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/projects/packages/waf/src/class-waf-transforms.php b/projects/packages/waf/src/class-waf-transforms.php
new file mode 100644
index 0000000000000..496a1fa315a9f
--- /dev/null
+++ b/projects/packages/waf/src/class-waf-transforms.php
@@ -0,0 +1,342 @@
+<?php
+/**
+ * Transforms for Jetpack Waf
+ *
+ * @package automattic/jetpack-waf
+ */
+
+namespace Automattic\Jetpack\Waf;
+
+/**
+ * WafTransforms class
+ */
+class WafTransforms {
+	/**
+	 * Decode a Base64-encoded string.
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function base64_decode( $value ) {
+		return base64_decode( $value );
+	}
+
+	/**
+	 * Remove all characters that might escape a command line command
+	 *
+	 * @see https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-%28v2.x%29#cmdLine
+	 * @param string $value value to be escaped.
+	 * @return string
+	 */
+	public function cmd_line( $value ) {
+		return strtolower(
+			preg_replace(
+				'/\s+/',
+				' ',
+				str_replace(
+					array( ',', ';' ),
+					' ',
+					preg_replace(
+						'/\s+(?=[\/\(])/',
+						'',
+						str_replace(
+							array( '^', "'", '"', '\\' ),
+							'',
+							$value
+						)
+					)
+				)
+			)
+		);
+	}
+
+	/**
+	 * Decode a SQL hex string.
+	 *
+	 * @example 414243 decodes to "ABC"
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function sql_hex_decode( $value ) {
+		return preg_replace_callback(
+			'/0x[a-f0-9]+/i',
+			function ( $matches ) {
+				$str = substr( $matches[0], 2 );
+				if ( 0 !== strlen( $str ) % 2 ) {
+					$str = '0' . $str;
+				}
+				return hex2bin( $str );
+			},
+			$value
+		);
+	}
+
+	/**
+	 * Encode a string using Base64 encoding.
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function base64_encode( $value ) {
+		return base64_encode( $value );
+	}
+
+	/**
+	 * Convert all whitespace characters to a space and remove any repeated spaces.
+	 *
+	 * @param string $value value to be converted.
+	 * @return string
+	 */
+	public function compress_whitespace( $value ) {
+		return preg_replace( '/\s+/', ' ', $value );
+	}
+
+	/**
+	 * Encode string (possibly containing binary characters) by replacing each input byte with two hexadecimal characters.
+	 *
+	 * @param string $value value to be encoded.
+	 * @return string
+	 */
+	public function hex_encode( $value ) {
+		return bin2hex( $value );
+	}
+
+	/**
+	 * Decode string that was previously encoded by hexEncode()
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function hex_decode( $value ) {
+		return pack( 'H*', $value );
+	}
+
+	/**
+	 * Decode the characters encoded as HTML entities.
+	 *
+	 * @param mixed $value value do be decoded.
+	 * @return string
+	 */
+	public function html_entity_decode( $value ) {
+		return html_entity_decode( $value );
+	}
+
+	/**
+	 * Return the length of the input string.
+	 *
+	 * @param string $value input string.
+	 * @return int
+	 */
+	public function length( $value ) {
+		return strlen( $value );
+	}
+
+	/**
+	 * Convert all characters to lowercase.
+	 *
+	 * @param string $value string to be converted.
+	 * @return string
+	 */
+	public function lowercase( $value ) {
+		return strtolower( $value );
+	}
+
+	/**
+	 * Calculate an md5 hash for the given data
+	 *
+	 * @param mixed $value value to be hashed.
+	 * @return string
+	 */
+	public function md5( $value ) {
+		return md5( $value, true );
+	}
+
+	/**
+	 * Removes multiple slashes, directory self-references, and directory back-references (except when at the beginning of the input) from input string.
+	 *
+	 * @param string $value value to be normalized.
+	 * @return string
+	 */
+	public function normalize_path( $value ) {
+		$parts = explode(
+			'/',
+			// replace any duplicate slashes with a single one.
+			preg_replace( '~/{2,}~', '/', $value )
+		);
+
+		$i = 0;
+		while ( isset( $parts[ $i ] ) ) {
+			switch ( $parts[ $i ] ) {
+				// If this folder is a self-reference, remove it.
+				case '..':
+					// If this folder is a backreference, remove it unless we're already at the root.
+					if ( isset( $parts[ $i - 1 ] ) && ! in_array( $parts[ $i - 1 ], array( '', '..' ), true ) ) {
+						array_splice( $parts, $i - 1, 2 );
+						$i--;
+						continue 2;
+					}
+					break;
+				case '.':
+					array_splice( $parts, $i, 1 );
+					continue 2;
+			}
+			$i++;
+		}
+
+		return implode( '/', $parts );
+	}
+
+	/**
+	 * Convert backslash characters to forward slashes, and then normalize using `normalizePath`
+	 *
+	 * @param string $value to be normalized.
+	 * @return string
+	 */
+	public function normalize_path_win( $value ) {
+		return $this->normalize_path( str_replace( '\\', '/', $value ) );
+	}
+
+	/**
+	 * Removes all NUL bytes from input.
+	 *
+	 * @param string $value value to be filtered.
+	 * @return string
+	 */
+	public function remove_nulls( $value ) {
+		return str_replace( "\x0", '', $value );
+	}
+
+	/**
+	 * Remove all whitespace characters from input.
+	 *
+	 * @param string $value value to be filtered.
+	 * @return string
+	 */
+	public function remove_whitespace( $value ) {
+		return preg_replace( '/\s/', '', $value );
+	}
+
+	/**
+	 * Replaces each occurrence of a C-style comment (/ * ... * /) with a single space.
+	 * Unterminated comments will also be replaced with a space. However, a standalone termination of a comment (* /) will not be acted upon.
+	 *
+	 * @param string $value value to be filtered.
+	 * @return string
+	 */
+	public function replace_comments( $value ) {
+		$value = preg_replace( '~/\*.*?\*/|/\*.*?$~Ds', ' ', $value );
+		return explode( '/*', $value, 2 )[0];
+	}
+
+	/**
+	 * Removes common comments chars (/ *, * /, --, #).
+	 *
+	 * @param string $value value to be filtered.
+	 * @return string
+	 */
+	public function remove_comments_char( $value ) {
+		return preg_replace( '~/*|*/|--|#|//~', '', $value );
+	}
+
+	/**
+	 * Replaces each NUL byte in input with a space.
+	 *
+	 * @param string $value value to be filtered.
+	 * @return string
+	 */
+	public function replace_nulls( $value ) {
+		return str_replace( "\x0", ' ', $value );
+	}
+
+	/**
+	 * Decode a URL-encoded input string.
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function url_decode( $value ) {
+		return urldecode( $value );
+	}
+
+	/**
+	 * Decode a URL-encoded input string.
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function url_decode_uni( $value ) {
+		error_log( 'JETPACKWAF TRANSFORM NOT IMPLEMENTED: urlDecodeUni' );
+		return $value;
+	}
+
+	/**
+	 * Decode a json encoded input string.
+	 *
+	 * @param string $value value to be decoded.
+	 * @return string
+	 */
+	public function js_decode( $value ) {
+		error_log( 'JETPACKWAF TRANSFORM NOT IMPLEMENTED: jsDecode' );
+		return $value;
+	}
+
+	/**
+	 * Convert all characters to uppercase.
+	 *
+	 * @param string $value value to be encoded.
+	 * @return string
+	 */
+	public function uppercase( $value ) {
+		return strtoupper( $value );
+	}
+
+	/**
+	 * Calculate a SHA1 hash from the input string.
+	 *
+	 * @param mixed $value value to be hashed.
+	 * @return string
+	 */
+	public function sha1( $value ) {
+		return sha1( $value, true );
+	}
+
+	/**
+	 * Remove whitespace from the left side of the input string.
+	 *
+	 * @param string $value value to be trimmed.
+	 * @return string
+	 */
+	public function trim_left( $value ) {
+		return ltrim( $value );
+	}
+
+	/**
+	 * Remove whitespace from the right side of the input string.
+	 *
+	 * @param string $value value to be trimmed.
+	 * @return string
+	 */
+	public function trim_right( $value ) {
+		return rtrim( $value );
+	}
+
+	/**
+	 * Remove whitespace from both sides of the input string.
+	 *
+	 * @param string $value value to be trimmed.
+	 * @return string
+	 */
+	public function trim( $value ) {
+		return trim( $value );
+	}
+
+	/**
+	 * Convert utf-8 characters to unicode characters
+	 *
+	 * @param string $value value to be encoded.
+	 * @return string
+	 */
+	public function utf8_to_unicode( $value ) {
+		return preg_replace( '/\\\u(?=[a-f0-9]{4})/', '%u', substr( json_encode( $value ), 1, -1 ) );
+	}
+}
diff --git a/projects/packages/waf/tests/php/bootstrap.php b/projects/packages/waf/tests/php/bootstrap.php
new file mode 100644
index 0000000000000..46763b04a2cdb
--- /dev/null
+++ b/projects/packages/waf/tests/php/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Bootstrap.
+ *
+ * @package automattic/
+ */
+
+/**
+ * Include the composer autoloader.
+ */
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/projects/packages/waf/tests/php/class-waf-operators-test-case.php b/projects/packages/waf/tests/php/class-waf-operators-test-case.php
new file mode 100644
index 0000000000000..78c51e9e97651
--- /dev/null
+++ b/projects/packages/waf/tests/php/class-waf-operators-test-case.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Rule compiler for Jetpack Waf.
+ *
+ * @package automattic/jetpack-waf
+ */
+
+namespace Automattic\Jetpack\Waf\Tests;
+
+/**
+ * Operators test case.
+ */
+class WafOperatorsTestCase {
+	/**
+	 * Input string.
+	 *
+	 * @var string
+	 */
+	public $input;
+	/**
+	 * Param string.
+	 *
+	 * @var string
+	 */
+	public $param;
+	/**
+	 * Expected return string.
+	 *
+	 * @var string
+	 */
+	public $expected_return;
+}
diff --git a/projects/packages/waf/tests/php/test-waf-operators.php b/projects/packages/waf/tests/php/test-waf-operators.php
new file mode 100644
index 0000000000000..74a09a557420b
--- /dev/null
+++ b/projects/packages/waf/tests/php/test-waf-operators.php
@@ -0,0 +1,521 @@
+<?php
+/**
+ * Adapted from modsecurity tests: https://github.com/SpiderLabs/ModSecurity/tree/caadf97524a4861456be176a8cb91dcbb76b97e4/tests/op
+ *
+ * @package automattic/jetpack-waf
+ */
+
+use Automattic\Jetpack\Waf\WafOperators;
+use Automattic\Jetpack\Waf\WafRuleCompiler;
+
+/**
+ * Operators test suite.
+ */
+final class WafOperatorsTest extends PHPUnit\Framework\TestCase {
+	/**
+	 * Instance of WafOperators
+	 *
+	 * @var WafOperators
+	 */
+	private $o;
+
+	/**
+	 * Test setup
+	 *
+	 * @before
+	 */
+	protected function before() {
+		$this->o = new WafOperators();
+	}
+
+	/**
+	 * Main test function
+	 *
+	 * @param string $ofn The name of the operator function that is being tested.
+	 * @param array  ...$tests The tests cases.
+	 *
+	 * @dataProvider transformDataProvider
+	 */
+	public function testOperators( $ofn, ...$tests ) {
+		$n = 1;
+		for ( $i = 0, $z = count( $tests ); $i < $z; $i += 3 ) {
+			$input    = $tests[ $i ];
+			$param    = $tests[ $i + 1 ];
+			$expected = $tests[ $i + 2 ];
+			$this->assertSame(
+				$expected,
+				$this->o->$ofn( $input, $param ),
+				sprintf( 'Failed %s assertion #%d with input: %s ', $ofn, $n, $input )
+			);
+			$n++;
+		}
+	}
+
+	/**
+	 * Test data provider
+	 */
+	public function transformDataProvider() {
+		yield array(
+			'begins_with',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			'',
+			'TestCase',
+			'',
+			'',
+			'abcdef',
+			'abcdef',
+			'abcdef',
+			'abcdefghi',
+			'abcdef',
+			'abcdef',
+			'',
+			'TestCase',
+			false,
+			'abc',
+			'abcdef',
+			false,
+		);
+
+		yield array(
+			'contains',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			false,
+			'TestCase',
+			'',
+			false,
+			'abcdefghi',
+			'abc',
+			'abc',
+			'abcdefghi',
+			'ghi',
+			'ghi',
+			'x',
+			'x',
+			'x',
+			'xyz',
+			'y',
+			'y',
+			'hidinX<-not quite, but is later on->hiding',
+			'hiding',
+			'hiding',
+		);
+
+		yield array(
+			'contains_word',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			'',
+			'TestCase',
+			'',
+			'',
+			'abc def ghi',
+			'abc',
+			'abc',
+			'abc def ghi',
+			'def',
+			'def',
+			'abc def ghi',
+			'ghi',
+			'ghi',
+			"abc\0def ghi",
+			'abc',
+			'abc',
+			"abc\0def ghi",
+			'def',
+			'def',
+			'x',
+			'x',
+			'x',
+			' x ',
+			'x',
+			'x',
+			'hidingX<-not on word boundary, but is later on->hiding',
+			'hiding',
+			'hiding',
+			'',
+			'TestCase',
+			false,
+			'abcdefghi',
+			'abc',
+			false,
+			'abcdefghi',
+			'def',
+			false,
+			'abcdefghi',
+			'ghi',
+			false,
+			'xyz',
+			'y',
+			false,
+		);
+
+		yield array(
+			'ends_with',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			'',
+			'TestCase',
+			'',
+			'',
+			'abcdefghi',
+			'ghi',
+			'ghi',
+			"abcdef\0ghi",
+			'ghi',
+			'ghi',
+			'',
+			'TestCase',
+			false,
+			'abcdefghi',
+			'abc',
+			false,
+			'abcdefghi',
+			'def',
+			false,
+		);
+
+		yield array(
+			'eq',
+			// input, paramToMatch, expected_return.
+			'',
+			'0',
+			'',
+			'0',
+			'xxx',
+			'0',
+			'xxx',
+			'0',
+			'xxx',
+			'0',
+			'0',
+			'0',
+			'5',
+			'5',
+			'5',
+			'-5',
+			'-5',
+			'-5',
+			'',
+			'5',
+			false,
+			'5',
+			'xxx',
+			false,
+			'-1',
+			'xxx',
+			false,
+			'xxx',
+			'5',
+			false,
+			'-5',
+			'0',
+			false,
+			'5',
+			'0',
+			false,
+			'0',
+			'5',
+			false,
+			'10',
+			'5',
+			false,
+		);
+
+		yield array(
+			'ge',
+			// input, paramToMatch, expected_return.
+			'',
+			'0',
+			'',
+			'5',
+			'xxx',
+			'5',
+			'xxx',
+			'0',
+			'xxx',
+			'0',
+			'0',
+			'0',
+			'5',
+			'0',
+			'5',
+			'5',
+			'5',
+			'5',
+			'10',
+			'5',
+			'10',
+			'',
+			'5',
+			false,
+			'-1',
+			'xxx',
+			false,
+			'xxx',
+			'5',
+			false,
+			'-5',
+			'',
+			false,
+			'0',
+			'5',
+			false,
+		);
+
+		yield array(
+			'gt',
+			// input, paramToMatch, expected_return.
+			'5',
+			'xxx',
+			'5',
+			'xxx',
+			'-1',
+			'xxx',
+			'5',
+			'0',
+			'5',
+			'10',
+			'5',
+			'10',
+			'',
+			'0',
+			false,
+			'',
+			'5',
+			false,
+			'-1',
+			'xxx',
+			false,
+			'xxx',
+			'5',
+			false,
+			'-5',
+			'0',
+			false,
+			'0',
+			'0',
+			false,
+			'0',
+			'5',
+			false,
+			'5',
+			'5',
+			false,
+		);
+
+		yield array(
+			'le',
+			// input, paramToMatch, expected_return.
+			'',
+			'0',
+			'',
+			'',
+			'5',
+			'',
+			'5',
+			'xxx',
+			false,
+			'-1',
+			'xxx',
+			'-1',
+			'xxx',
+			'0',
+			'xxx',
+			'xxx',
+			'5',
+			'xxx',
+			'-5',
+			'0',
+			'-5',
+			'0',
+			'0',
+			'0',
+			'5',
+			'0',
+			false,
+			'0',
+			'5',
+			'0',
+			'5',
+			'5',
+			'5',
+			'10',
+			'5',
+			false,
+		);
+
+		yield array(
+			'lt',
+			// input, paramToMatch, expected_return.
+			'',
+			'0',
+			false,
+			'',
+			'5',
+			'',
+			'5',
+			'xxx',
+			false,
+			'-1',
+			'xxx',
+			'-1',
+			'xxx',
+			'-1',
+			false,
+			'xxx',
+			'5',
+			'xxx',
+			'-5',
+			'0',
+			'-5',
+			'0',
+			'0',
+			false,
+			'5',
+			'0',
+			false,
+			'0',
+			'5',
+			'0',
+			'5',
+			'5',
+			false,
+			'10',
+			'5',
+			false,
+		);
+
+		yield array(
+			'no_match',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			false,
+			'TestCase',
+			'',
+			false,
+			'',
+			'TestCase',
+			false,
+		);
+
+		yield array(
+			'rx',
+			// input, paramToMatch, expected_return.
+			'',
+			'//Ds',
+			array( '' ),
+			'',
+			'/TestCase/Ds',
+			false,
+			'TestCase',
+			'//Ds',
+			array( '' ),
+			'abcdefghi',
+			'/abc/Ds',
+			array( 'abc' ),
+			'abcdefghi',
+			'/def/Ds',
+			array( 'def' ),
+			'abcdefghi',
+			'/ghi/Ds',
+			array( 'ghi' ),
+			'abcdefghi',
+			'/ghij/Ds',
+			false,
+			'SELECT pg_sleep(10);',
+			'/(?i:(sleep\\((\\s*?)(\\d*?)(\\s*?)\\)|benchmark\\((.*?)\\,(.*?)\\)))/Ds',
+			array( 'sleep(10)', 'sleep(10)', '', '10', '' ),
+		);
+
+		yield array(
+			'streq',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			'',
+			'',
+			'TestCase',
+			false,
+			'TestCase',
+			'',
+			false,
+			'abcdefghi',
+			'abc',
+			false,
+			'abcdefghi',
+			'def',
+			false,
+			'abcdefghi',
+			'ghi',
+			false,
+			'abcdefghi',
+			'abcdefghi',
+			'abcdefghi',
+		);
+
+		yield array(
+			'unconditional_match',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			'',
+			'',
+			'TestCase',
+			'',
+			'TestCase',
+			'',
+			'TestCase',
+		);
+
+		$a2i = ord( 'a' ) . '-' . ord( 'i' );
+		yield array(
+			'validate_byte_range',
+			// input, paramToMatch, expected_return.
+			'',
+			WafRuleCompiler::parse_byte_range( array( '0-255' ) ),
+			false,
+			'abcdefghi',
+			WafRuleCompiler::parse_byte_range( array( '0-255' ) ),
+			false,
+			'abcdefghi',
+			WafRuleCompiler::parse_byte_range( array( $a2i ) ),
+			false,
+			'abcdefghij',
+			WafRuleCompiler::parse_byte_range( array( $a2i ) ),
+			'j',
+		);
+
+		yield array(
+			'within',
+			// input, paramToMatch, expected_return.
+			'',
+			'',
+			false,
+			'',
+			'TestCase',
+			false,
+			'TestCase',
+			'',
+			false,
+			'abc',
+			'abcdefghi',
+			'abc',
+			'def',
+			'abcdefghi',
+			'def',
+			'ghi',
+			'abcdefghi',
+			'ghi',
+			'ghij',
+			'abcdefghi',
+			false,
+		);
+	}
+}
diff --git a/projects/packages/waf/tests/php/test-waf-runtime.php b/projects/packages/waf/tests/php/test-waf-runtime.php
new file mode 100644
index 0000000000000..e4d932bcc0e92
--- /dev/null
+++ b/projects/packages/waf/tests/php/test-waf-runtime.php
@@ -0,0 +1,281 @@
+<?php
+/**
+ * Runtime test suite.
+ *
+ * @package automattic/jetpack-waf
+ */
+
+use Automattic\Jetpack\Waf\WafOperators;
+use Automattic\Jetpack\Waf\WafRuntime;
+use Automattic\Jetpack\Waf\WafTransforms;
+
+/**
+ * Runtime test suite.
+ */
+final class WafRuntimeTest extends PHPUnit\Framework\TestCase {
+	/**
+	 * Instance of the Runtime class
+	 *
+	 * @var WafRuntime
+	 */
+	private $runtime;
+
+	/**
+	 * Test setup
+	 *
+	 * @before
+	 */
+	protected function before() {
+		$this->runtime = new WafRuntime( new WafTransforms(), new WafOperators() );
+	}
+
+	/**
+	 * Test removing rule by id
+	 */
+	public function testRemovingRuleById() {
+		$this->runtime->flag_rule_for_removal( 'id', '111' );
+		$this->assertTrue( $this->runtime->rule_removed( '111', array() ) );
+		$this->assertFalse( $this->runtime->rule_removed( '222', array() ) );
+	}
+
+	/**
+	 * Test removing rule by tag
+	 */
+	public function testRemovingRuleByTag() {
+		$this->runtime->flag_rule_for_removal( 'tag', 'abc' );
+		$this->assertTrue( $this->runtime->rule_removed( '111', array( 'abc' ) ) );
+		$this->assertTrue( $this->runtime->rule_removed( '111', array( 'abc', 'def' ) ) );
+		$this->assertTrue( $this->runtime->rule_removed( '111', array( '789', 'abc', 'def' ) ) );
+		$this->assertFalse( $this->runtime->rule_removed( '111', array() ) );
+		$this->assertFalse( $this->runtime->rule_removed( '111', array( 'abcdef' ) ) );
+	}
+
+	/**
+	 * Test removing target rule by id
+	 */
+	public function testRemovingTargetByRuleId() {
+		$this->runtime->flag_target_for_removal( 'id', '111', 'args' );
+		$this->assertEquals(
+			array( 'auth_type' => array() ),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'111',
+				array()
+			),
+			'Did not remove target'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'222',
+				array()
+			),
+			'Incorrectly removed target of non-matching rule'
+		);
+	}
+
+	/**
+	 * Test removing targed prop by rule id
+	 */
+	public function testRemovingTargetPropByRuleId() {
+		$this->runtime->flag_target_for_removal( 'id', '111', 'args', 'p' );
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array( 'except' => array( 'p' ) ),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'111',
+				array()
+			),
+			'Did not create except list for removed prop'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array( 'except' => array( 'o', 'p' ) ),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array( 'except' => array( 'o' ) ),
+					'auth_type' => array(),
+				),
+				'111',
+				array()
+			),
+			'Did not add prop to existing except list'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(
+					'only'   => array( 'z' ),
+					'except' => array( 'o', 'p' ),
+				),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(
+						'only'   => array( 'z' ),
+						'except' => array( 'o' ),
+					),
+					'auth_type' => array(),
+				),
+				'111',
+				array()
+			)
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'222',
+				array()
+			),
+			'Incorrectly updated target of non-matching rule'
+		);
+	}
+
+	/**
+	 * Test removing targed by rule tag
+	 */
+	public function testRemovingTargetByRuleTag() {
+		$this->runtime->flag_target_for_removal( 'tag', 'abc', 'args' );
+		$this->assertEquals(
+			array( 'auth_type' => array() ),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'111',
+				array( 'abc' )
+			),
+			'Did not remove target'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'222',
+				array( 'def' )
+			),
+			'Incorrectly removed target of non-matching rule'
+		);
+	}
+
+	/**
+	 * Test removing targed prop by rule tag
+	 */
+	public function testRemovingTargetPropByRuleTag() {
+		$this->runtime->flag_target_for_removal( 'tag', 'abc', 'args', 'p' );
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array( 'except' => array( 'p' ) ),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'111',
+				array( 'abc' )
+			),
+			'Did not create except list for removed prop'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array( 'except' => array( 'o', 'p' ) ),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array( 'except' => array( 'o' ) ),
+					'auth_type' => array(),
+				),
+				'222',
+				array( 'abc' )
+			),
+			'Did not add prop to existing except list'
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(
+					'only'   => array( 'z' ),
+					'except' => array( 'o', 'p' ),
+				),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(
+						'only'   => array( 'z' ),
+						'except' => array( 'o' ),
+					),
+					'auth_type' => array(),
+				),
+				'333',
+				array( 'abc' )
+			)
+		);
+		$this->assertEquals(
+			array(
+				'auth_type' => array(),
+				'args'      => array(),
+			),
+			$this->runtime->update_targets(
+				array(
+					'args'      => array(),
+					'auth_type' => array(),
+				),
+				'444',
+				array( 'def' )
+			),
+			'Incorrectly updated target of non-matching rule'
+		);
+	}
+
+	/**
+	 * Test vars
+	 */
+	public function testVars() {
+		$this->assertSame( '', $this->runtime->get_var( 'abc' ) );
+		$this->runtime->set_var( 'abc', '123' );
+		$this->assertSame( '123', $this->runtime->get_var( 'abc' ) );
+		$this->runtime->inc_var( 'abc', 3 );
+		$this->assertEquals( 126, $this->runtime->get_var( 'abc' ) );
+		$this->runtime->dec_var( 'abc', 10 );
+		$this->assertEquals( 116, $this->runtime->get_var( 'abc' ) );
+		$this->runtime->inc_var( 'def', 2 );
+		$this->assertSame( 2.0, $this->runtime->get_var( 'def' ) );
+		$this->runtime->unset_var( 'abc' );
+		$this->assertSame( '', $this->runtime->get_var( 'abc' ) );
+	}
+}
diff --git a/projects/packages/waf/tests/php/test-waf-transforms.php b/projects/packages/waf/tests/php/test-waf-transforms.php
new file mode 100644
index 0000000000000..4e1ed160e24b0
--- /dev/null
+++ b/projects/packages/waf/tests/php/test-waf-transforms.php
@@ -0,0 +1,379 @@
+<?php
+/**
+ * Adapted from modsecurity tests: https://github.com/SpiderLabs/ModSecurity/tree/caadf97524a4861456be176a8cb91dcbb76b97e4/tests/tfn
+ *
+ * @package automattic/jetpack-waf
+ */
+
+use Automattic\Jetpack\Waf\WafTransforms as GlobalWafTransforms;
+
+/**
+ * Transforms test suite.
+ */
+final class WafTransformsTest extends PHPUnit\Framework\TestCase {
+
+	/**
+	 * Instance of WafTransforms
+	 *
+	 * @var GlobalWafTransforms
+	 */
+	private $t;
+
+	/**
+	 * Test setup
+	 *
+	 * @before
+	 */
+	protected function before() {
+		$this->t = new GlobalWafTransforms();
+	}
+
+	/**
+	 * Main test function
+	 *
+	 * @param string $tfn The name of the transform function that is being tested.
+	 * @param array  $tests The tests cases, each key in the array is the raw value with the value being the expected transformed value.
+	 *
+	 * @dataProvider transformDataProvider
+	 */
+	public function testTransforms( $tfn, $tests ) {
+		$i = 1;
+		foreach ( $tests as $in => $out ) {
+			$this->assertSame( $out, $this->t->$tfn( $in ), "Failed #$i with input: $in" );
+			$i++;
+		}
+	}
+
+	/**
+	 * Test data provider
+	 */
+	public function transformDataProvider() {
+		yield array(
+			'base64_decode',
+			array(
+				''                 => '',
+				'VGVzdENhc2U='     => 'TestCase',
+				'VGVzdENhc2Ux'     => 'TestCase1',
+				'VGVzdENhc2UxMg==' => 'TestCase12',
+			),
+		);
+
+		yield array(
+			'base64_encode',
+			array(
+				''           => '',
+				'TestCase'   => 'VGVzdENhc2U=',
+				'TestCase1'  => 'VGVzdENhc2Ux',
+				'TestCase12' => 'VGVzdENhc2UxMg==',
+				"Test\0Case" => 'VGVzdABDYXNl',
+			),
+		);
+
+		yield array(
+			'compress_whitespace',
+			array(
+				''                    => '',
+				'TestCase'            => 'TestCase',
+				"Test\0Case"          => "Test\0Case",
+				'Test Case'           => 'Test Case',
+				"  Test  \t   Case  " => ' Test Case ',
+				"This is a   test case with a tab \t, vtab \x0b, newline \x0a, return \x0d, formfeed \f, and a NUL\0 in it with a CRLF at the end.\x0d\x0a" => "This is a test case with a tab , vtab , newline , return , formfeed , and a NUL\0 in it with a CRLF at the end. ",
+			),
+		);
+
+		yield array(
+			'hex_decode',
+			array(
+				''                   => '',
+				'5465737443617365'   => 'TestCase',
+				'546573740043617365' => "Test\0Case",
+							// todo: these are invalid hex strings that PHP handles differently than modsecurity's code
+							// '01234567890a0z01234567890a' => "\x01#Eg\x89\x0a#\x01#Eg\x89\x0a",
+							// '01234567890az' => "\x01#Eg\x89\x0a",
+							// '01234567890a0' => "\x01#Eg\x89\x0a", .
+			),
+		);
+
+		yield array(
+			'hex_encode',
+			array(
+				'TestCase'   => '5465737443617365',
+				"Test\0Case" => '546573740043617365',
+			),
+		);
+
+		yield array(
+			'html_entity_decode',
+			array(
+				''           => '',
+				'TestCase'   => 'TestCase',
+				"Test\0Case" => "Test\0Case",
+							// todo: PHP's html_entity_decode works differently than modsecurity, fails these tests
+							// "&#x0;&#X0;&#x20;&#X20;&#0;&#32;\0&#100;&quot;&amp;&lt;&gt;&nbsp;" => "\0\0\x20\x20\0\x20\0\x64\"&<>\xa0",
+							// "&#x0&#X0&#x20&#X20&#0&#32\0&#100&quot&amp&lt&gt&nbsp" => "\0\0\x20\x20\0\x20\0\x64\"&<>\xa0",
+							// "&#xg;&#Xg;&#xg0;&#X2g;&#a;\0&#a2;&#3a&#a00;&#1a0;&#10a;&foo;" => "&#xg;&#Xg;&#xg0;\x02g;&#a;\0&#a2;\x03a&#a00;\x01a0;\x0aa;&foo;",
+							// "&#xg&#Xg&#xg0&#X2g&#a\0&#a2&#3a&#a00&#1a0&#10a&foo" => "&#xg&#Xg&#xg0\x02g&#a\0&#a2\x03a&#a00\x01a0\x0aa&foo", .
+			),
+		);
+
+		yield array(
+			'length',
+			array(
+				'0123456789abcdef'   => 16,
+				"0123456789\tabcdef" => 17,
+				"Test\0Case"         => 9,
+			),
+		);
+
+		yield array(
+			'lowercase',
+			array(
+				''           => '',
+				'testcase'   => 'testcase',
+				"test\0case" => "test\0case",
+				'TestCase'   => 'testcase',
+				"Test\0Case" => "test\0case",
+			),
+		);
+
+		yield array(
+			'md5',
+			array(
+				''                                     => "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e",
+				'TestCase'                             => "\xc9\xab\xa2\xc3\xe6\x01\x26\x16\x9e\x80\xe9\xa2\x6b\xa2\x73\xc1",
+				"\x00\x01\x02\x03\x04\x05\x06\x07\x08" => "\xa6\xe7\xd3\xb4\x6f\xdf\xaf\x0b\xde\x2a\x1f\x83\x2a\x00\xd2\xde",
+			),
+		);
+
+		yield array(
+			'normalize_path',
+			array(
+				''                                  => '',
+				'/foo/bar/baz'                      => '/foo/bar/baz',
+				"/foo/bar\0/baz"                    => "/foo/bar\0/baz",
+				'x'                                 => 'x',
+				'.'                                 => '',
+				'./'                                => '',
+				'./..'                              => '..',
+				'./../'                             => '../',
+				'..'                                => '..',
+				'../'                               => '../',
+				'../.'                              => '..',
+				'.././'                             => '../',
+				'../..'                             => '../..',
+				'../../'                            => '../../',
+				'/dir/foo//bar'                     => '/dir/foo/bar',
+				'dir/foo//bar/'                     => 'dir/foo/bar/',
+				'dir/../foo'                        => 'foo',
+				'dir/../../foo'                     => '../foo',
+				'dir/./.././../../foo/bar'          => '../../foo/bar',
+				'dir/./.././../../foo/bar/.'        => '../../foo/bar',
+				'dir/./.././../../foo/bar/./'       => '../../foo/bar/',
+				'dir/./.././../../foo/bar/..'       => '../../foo',
+				'dir/./.././../../foo/bar/../'      => '../../foo/',
+				'dir/./.././../../foo/bar/'         => '../../foo/bar/',
+				'dir//.//..//.//..//..//foo//bar'   => '../../foo/bar',
+				'dir//.//..//.//..//..//foo//bar//' => '../../foo/bar/',
+				'dir/subdir/subsubdir/subsubsubdir/../../..' => 'dir',
+				'dir/./subdir/./subsubdir/./subsubsubdir/../../..' => 'dir',
+				'dir/./subdir/../subsubdir/../subsubsubdir/..' => 'dir',
+				'/dir/./subdir/../subsubdir/../subsubsubdir/../' => '/dir/',
+							// todo: I have no idea how the input is supposed to turn into the output for this test:
+							// "/./.././../../../../../../../\0/../etc/./passwd" => '/etc/passwd', .
+			),
+		);
+
+		yield array(
+			'normalize_path_win',
+			array(
+				''                                     => '',
+				'\\foo\\bar\\baz'                      => '/foo/bar/baz',
+				"\\foo\\bar\0\\baz"                    => "/foo/bar\0/baz",
+				'x'                                    => 'x',
+				'.'                                    => '',
+				'.\\'                                  => '',
+				'.\\..'                                => '..',
+				'.\\..\\'                              => '../',
+				'..'                                   => '..',
+				'..\\'                                 => '../',
+				'..\\.'                                => '..',
+				'..\\.\\'                              => '../',
+				'..\\..'                               => '../..',
+				'..\\..\\'                             => '../../',
+				'\\dir\\foo\\\\bar'                    => '/dir/foo/bar',
+				'dir\\foo\\\\bar\\'                    => 'dir/foo/bar/',
+				'dir\\..\\foo'                         => 'foo',
+				'dir\\..\\..\\foo'                     => '../foo',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar'      => '../../foo/bar',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar\\.'   => '../../foo/bar',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar\\.\\' => '../../foo/bar/',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar\\..'  => '../../foo',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar\\../' => '../../foo/',
+				'dir\\.\\..\\.\\..\\..\\foo\\bar\\'    => '../../foo/bar/',
+				'dir\\\\.\\\\..\\\\.\\\\..\\\\..\\\\foo\\\\bar' => '../../foo/bar',
+				'dir\\\\.\\\\..\\\\.\\\\..\\\\..\\\\foo\\\\bar\\\\' => '../../foo/bar/',
+				'dir\\subdir\\subsubdir\\subsubsubdir\\..\\..\\..' => 'dir',
+				'dir\\.\\subdir\\.\\subsubdir\\.\\subsubsubdir\\..\\..\\..' => 'dir',
+				'dir\\.\\subdir\\..\\subsubdir\\..\\subsubsubdir\\..' => 'dir',
+				'\\dir\\.\\subdir\\..\\subsubdir\\..\\subsubsubdir\\..\\' => '/dir/',
+							// todo: I have no idea how the input is supposed to turn into the output for this test:
+							// "\\.\\..\\.\\..\\..\\..\\..\\..\\..\\..\\\0\\..\\etc\\./passwd" => '/etc/passwd', .
+			),
+		);
+
+		yield array(
+			'remove_nulls',
+			array(
+				''               => '',
+				'TestCase'       => 'TestCase',
+				"Test\x01Case"   => "Test\x01Case",
+				"\0TestCase"     => 'TestCase',
+				"Test\0Case"     => 'TestCase',
+				"Test\0\0Case"   => 'TestCase',
+				"TestCase\0"     => 'TestCase',
+				"\0Test\0Case\0" => 'TestCase',
+			),
+		);
+
+		yield array(
+			'remove_whitespace',
+			array(
+				''                    => '',
+				'TestCase'            => 'TestCase',
+				"Test\0Case"          => "Test\0Case",
+				"  Test  \t   Case  " => 'TestCase',
+				"This is a   test case with a tab \t, vtab \x0b, newline \x0a, return \x0d, formfeed \f, and a NUL\0 in it with a CRLF at the end.\x0d\x0a" => "Thisisatestcasewithatab,vtab,newline,return,formfeed,andaNUL\0initwithaCRLFattheend.",
+			),
+		);
+
+		yield array(
+			'replace_comments',
+			array(
+				''                            => '',
+				'TestCase'                    => 'TestCase',
+				"Test\0Case"                  => "Test\0Case",
+				'/* TestCase */'              => ' ',
+				'/*TestCase*/'                => ' ',
+				'/* TestCase*/'               => ' ',
+				'/*TestCase */'               => ' ',
+				'Before/* TestCase */After'   => 'Before After',
+				'Before /* TestCase */ After' => 'Before   After',
+				"/* Test\nCase */"            => ' ',
+				"/* Test\x0d\x0aCase */"      => ' ',
+				"/* Test\x0aCase */"          => ' ',
+				"/* Test\x0dCase */"          => ' ',
+				"Before/* Test\x0d\x0aCase "  => 'Before ',
+				"Before /* Test\x0aCase "     => 'Before  ',
+				"Before/* Test\x0d\x0aCase "  => 'Before ',
+				"Before /* Test\x0aCase "     => 'Before  ',
+				"Test\x0d\x0aCase */After"    => "Test\x0d\x0aCase */After",
+				"Test\x0aCase */ After"       => "Test\x0aCase */ After",
+				"Test\x0d\x0aCase */After"    => "Test\x0d\x0aCase */After",
+				"Test\x0aCase */ After"       => "Test\x0aCase */ After",
+			),
+		);
+
+		yield array(
+			'replace_nulls',
+			array(
+				''               => '',
+				'TestCase'       => 'TestCase',
+				"\0TestCase"     => ' TestCase',
+				"Test\0Case"     => 'Test Case',
+				"Test\0\0Case"   => 'Test  Case',
+				"TestCase\0"     => 'TestCase ',
+				"\0Test\0Case\0" => ' Test Case ',
+			),
+		);
+
+		yield array(
+			'sha1',
+			array(
+				''                                     => "\xda\x39\xa3\xee\x5e\x6b\x4b\x0d\x32\x55\xbf\xef\x95\x60\x18\x90\xaf\xd8\x07\x09",
+				'TestCase'                             => "\xa7\x0c\xe3\x83\x89\xe3\x18\xbd\x2b\xe1\x8a\x01\x11\xc6\xdc\x76\xbd\x2c\xd9\xed",
+				"\x00\x01\x02\x03\x04\x05\x06\x07\x08" => "\x63\xbf\x60\xc7\x10\x5a\x07\xa2\xb1\x25\xbb\xf8\x9e\x61\xab\xda\xbc\x69\x78\xc2",
+			),
+		);
+
+		yield array(
+			'trim',
+			array(
+				''                                     => '',
+				'TestCase'                             => 'TestCase',
+				"Test\0Case"                           => "Test\0Case",
+				'    TestCase'                         => 'TestCase',
+				'TestCase    '                         => 'TestCase',
+				'    TestCase    '                     => 'TestCase',
+				'    Test   Case    '                  => 'Test   Case',
+				"    Test \0 Case    "                 => "Test \0 Case",
+				" 	   Test \0 Case 	  	   \r\n  " => "Test \0 Case",
+			),
+		);
+
+		yield array(
+			'trim_left',
+			array(
+				''                                     => '',
+				'TestCase'                             => 'TestCase',
+				"Test\0Case"                           => "Test\0Case",
+				'TestCase   '                          => 'TestCase   ',
+				'    TestCase'                         => 'TestCase',
+				'    TestCase    '                     => 'TestCase    ',
+				'    Test   Case    '                  => 'Test   Case    ',
+				"    Test \0 Case    "                 => "Test \0 Case    ",
+				" 	   Test \0 Case 	  	   \r\n  " => "Test \0 Case 	  	   \r\n  ",
+			),
+		);
+
+		yield array(
+			'trim_right',
+			array(
+				''                                     => '',
+				'TestCase'                             => 'TestCase',
+				'   TestCase'                          => '   TestCase',
+				'TestCase   '                          => 'TestCase',
+				'   TestCase   '                       => '   TestCase',
+				'    Test   Case    '                  => '    Test   Case',
+				"    Test \0 Case    "                 => "    Test \0 Case",
+				" 	   Test \0 Case 	  	   \r\n  " => " 	   Test \0 Case",
+			),
+		);
+
+		yield array(
+			'url_decode',
+			array(
+				''                                   => '',
+				'TestCase'                           => 'TestCase',
+				"Test\0Case"                         => "Test\0Case",
+				'+%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f%20%21%22%23%24%25%26%27%28%29%2a%2b%2c%2d%2e%2f%30%31%32%33%34%35%36%37%38%39%3a%3b%3c%3d%3e%3f%40%41%42%43%44%45%46%47%48%49%4a%4b%4c%4d%4e%4f%50%51%52%53%54%55%56%57%58%59%5a%5b%5c%5d%5e%5f%60%61%62%63%64%65%66%67%68%69%6a%6b%6c%6d%6e%6f%70%71%72%73%74%75%76%77%78%79%7a%7b%7c%7d%7e%7f%80%81%82%83%84%85%86%87%88%89%8a%8b%8c%8d%8e%8f%90%91%92%93%94%95%96%97%98%99%9a%9b%9c%9d%9e%9f%a0%a1%a2%a3%a4%a5%a6%a7%a8%a9%aa%ab%ac%ad%ae%af%b0%b1%b2%b3%b4%b5%b6%b7%b8%b9%ba%bb%bc%bd%be%bf%c0%c1%c2%c3%c4%c5%c6%c7%c8%c9%ca%cb%cc%cd%ce%cf%d0%d1%d2%d3%d4%d5%d6%d7%d8%d9%da%db%dc%dd%de%df%e0%e1%e2%e3%e4%e5%e6%e7%e8%e9%ea%eb%ec%ed%ee%ef%f0%f1%f2%f3%f4%f5%f6%f7%f8%f9%fa%fb%fc%fd%fe%ff' => " \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f \x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+				'Test+Case'                          => 'Test Case',
+				'%+'                                 => '% ',
+				'%%20'                               => '% ',
+				'%0g%20'                             => '%0g ',
+				'%0%20'                              => '%0 ',
+				'%g0%20'                             => '%g0 ',
+				'%g%20'                              => '%g ',
+				'%0%1%2%3%4%5%6%7%8%9%0%a%b%c%d%e%f' => '%0%1%2%3%4%5%6%7%8%9%0%a%b%c%d%e%f',
+				'%g0%g1%g2%g3%g4%g5%g6%g7%g8%g9%g0%ga%gb%gc%gd%ge%gf' => '%g0%g1%g2%g3%g4%g5%g6%g7%g8%g9%g0%ga%gb%gc%gd%ge%gf',
+				'%0g%1g%2g%3g%4g%5g%6g%7g%8g%9g%0g%ag%bg%cg%dg%eg%fg' => '%0g%1g%2g%3g%4g%5g%6g%7g%8g%9g%0g%ag%bg%cg%dg%eg%fg',
+				'%'                                  => '%',
+				'%%'                                 => '%%',
+				'%0g'                                => '%0g',
+				'%gg'                                => '%gg',
+			),
+		);
+
+		yield array(
+			'utf8_to_unicode',
+			array(
+				'Ā ā Ă ă Ą ą Ć ć Ĉ ĉ Ċ ċ Č č Ď ď Đ đ Ē ē Ĕ ĕ Ė ė Ę ę Ě ě Ĝ ĝ Ğ ğ Ġ ġ Ģ ģ Ĥ ĥ Ħ ħ Ĩ ĩ Ī ī Ĭ ĭ Į į İ ı IJ ij Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Ł ł Ń ń Ņ ņ Ň ň ʼn Ŋ ŋ Ō ō Ŏ ŏ Ő ő Œ œ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ ŝ Ş ş Š š Ţ ţ Ť ť Ŧ ŧ Ũ ũ Ū ū Ŭ ŭ Ů ů Ű ű Ų ų Ŵ ŵ Ŷ ŷ Ÿ Ź ź Ż ż Ž ž ſ' => '%u0100 %u0101 %u0102 %u0103 %u0104 %u0105 %u0106 %u0107 %u0108 %u0109 %u010a %u010b %u010c %u010d %u010e %u010f %u0110 %u0111 %u0112 %u0113 %u0114 %u0115 %u0116 %u0117 %u0118 %u0119 %u011a %u011b %u011c %u011d %u011e %u011f %u0120 %u0121 %u0122 %u0123 %u0124 %u0125 %u0126 %u0127 %u0128 %u0129 %u012a %u012b %u012c %u012d %u012e %u012f %u0130 %u0131 %u0132 %u0133 %u0134 %u0135 %u0136 %u0137 %u0138 %u0139 %u013a %u013b %u013c %u013d %u013e %u013f %u0140 %u0141 %u0142 %u0143 %u0144 %u0145 %u0146 %u0147 %u0148 %u0149 %u014a %u014b %u014c %u014d %u014e %u014f %u0150 %u0151 %u0152 %u0153 %u0154 %u0155 %u0156 %u0157 %u0158 %u0159 %u015a %u015b %u015c %u015d %u015e %u015f %u0160 %u0161 %u0162 %u0163 %u0164 %u0165 %u0166 %u0167 %u0168 %u0169 %u016a %u016b %u016c %u016d %u016e %u016f %u0170 %u0171 %u0172 %u0173 %u0174 %u0175 %u0176 %u0177 %u0178 %u0179 %u017a %u017b %u017c %u017d %u017e %u017f',
+				'Ѐ Ё Ђ Ѓ Є Ѕ І Ї Ј Љ Њ Ћ Ќ Ѝ Ў Џ А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я ѐ ё ђ ѓ є ѕ і ї ј љ њ ћ ќ ѝ ў џ Ѡ ѡ Ѣ ѣ Ѥ ѥ Ѧ ѧ Ѩ ѩ Ѫ ѫ Ѭ ѭ Ѯ ѯ Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ Ѹ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ Ҁ ҁ ҂ ҈ ҉ Ҋ ҋ Ҍ ҍ Ҏ ҏ Ґ ґ Ғ ғ Ҕ ҕ Җ җ Ҙ ҙ Қ қ Ҝ ҝ Ҟ ҟ Ҡ ҡ Ң ң Ҥ ҥ Ҧ ҧ Ҩ ҩ Ҫ ҫ Ҭ ҭ Ү ү Ұ ұ Ҳ ҳ Ҵ ҵ Ҷ ҷ Ҹ ҹ Һ һ Ҽ ҽ Ҿ ҿ Ӏ Ӂ ӂ Ӄ ӄ Ӆ ӆ Ӈ ӈ Ӊ ӊ Ӌ ӌ Ӎ ӎ ӏ Ӑ ӑ Ӓ ӓ Ӕ ӕ Ӗ ӗ Ә ә Ӛ ӛ Ӝ ӝ Ӟ ӟ Ӡ ӡ Ӣ ӣ Ӥ ӥ Ӧ ӧ Ө ө Ӫ ӫ Ӭ ӭ Ӯ ӯ Ӱ ӱ Ӳ ӳ Ӵ ӵ Ӷ ӷ Ӹ ӹ Ӻ ӻ Ӽ ӽ Ӿ ӿ ͵ ͺ ͻ ͼ ͽ ΄ ΅ Ά Έ Ή Ί Ό Ύ Ώ ΐ Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί ΰ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ ς σ τ υ φ χ ψ ω ϊ ϋ ό ύ ώ ϐ ϑ ϒ ϓ ϔ ϕ ϖ ϗ Ϙ ϙ Ϛ ϛ Ϝ ϝ Ϟ ϟ Ϡ ϡ Ϣ ϣ Ϥ ϥ Ϧ ϧ Ϩ ϩ Ϫ ϫ Ϭ ϭ Ϯ ϯ ϰ ϱ ϲ ϳ ϴ ϵ ϶ Ϸ ϸ Ϲ Ϻ ϻ ϼ Ͻ Ͼ Ͽ ־ ׀ ׃ ׆ א ב ג ד ה ו ז ח ט י ך כ ל ם מ ן נ ס ע ף פ ץ צ ק ר ש ת װ ױ ײ ׳ ״' => '%u0400 %u0401 %u0402 %u0403 %u0404 %u0405 %u0406 %u0407 %u0408 %u0409 %u040a %u040b %u040c %u040d %u040e %u040f %u0410 %u0411 %u0412 %u0413 %u0414 %u0415 %u0416 %u0417 %u0418 %u0419 %u041a %u041b %u041c %u041d %u041e %u041f %u0420 %u0421 %u0422 %u0423 %u0424 %u0425 %u0426 %u0427 %u0428 %u0429 %u042a %u042b %u042c %u042d %u042e %u042f %u0430 %u0431 %u0432 %u0433 %u0434 %u0435 %u0436 %u0437 %u0438 %u0439 %u043a %u043b %u043c %u043d %u043e %u043f %u0440 %u0441 %u0442 %u0443 %u0444 %u0445 %u0446 %u0447 %u0448 %u0449 %u044a %u044b %u044c %u044d %u044e %u044f %u0450 %u0451 %u0452 %u0453 %u0454 %u0455 %u0456 %u0457 %u0458 %u0459 %u045a %u045b %u045c %u045d %u045e %u045f %u0460 %u0461 %u0462 %u0463 %u0464 %u0465 %u0466 %u0467 %u0468 %u0469 %u046a %u046b %u046c %u046d %u046e %u046f %u0470 %u0471 %u0472 %u0473 %u0474 %u0475 %u0476 %u0477 %u0478 %u0479 %u047a %u047b %u047c %u047d %u047e %u047f %u0480 %u0481 %u0482 %u0488 %u0489 %u048a %u048b %u048c %u048d %u048e %u048f %u0490 %u0491 %u0492 %u0493 %u0494 %u0495 %u0496 %u0497 %u0498 %u0499 %u049a %u049b %u049c %u049d %u049e %u049f %u04a0 %u04a1 %u04a2 %u04a3 %u04a4 %u04a5 %u04a6 %u04a7 %u04a8 %u04a9 %u04aa %u04ab %u04ac %u04ad %u04ae %u04af %u04b0 %u04b1 %u04b2 %u04b3 %u04b4 %u04b5 %u04b6 %u04b7 %u04b8 %u04b9 %u04ba %u04bb %u04bc %u04bd %u04be %u04bf %u04c0 %u04c1 %u04c2 %u04c3 %u04c4 %u04c5 %u04c6 %u04c7 %u04c8 %u04c9 %u04ca %u04cb %u04cc %u04cd %u04ce %u04cf %u04d0 %u04d1 %u04d2 %u04d3 %u04d4 %u04d5 %u04d6 %u04d7 %u04d8 %u04d9 %u04da %u04db %u04dc %u04dd %u04de %u04df %u04e0 %u04e1 %u04e2 %u04e3 %u04e4 %u04e5 %u04e6 %u04e7 %u04e8 %u04e9 %u04ea %u04eb %u04ec %u04ed %u04ee %u04ef %u04f0 %u04f1 %u04f2 %u04f3 %u04f4 %u04f5 %u04f6 %u04f7 %u04f8 %u04f9 %u04fa %u04fb %u04fc %u04fd %u04fe %u04ff %u0375 %u037a %u037b %u037c %u037d %u0384 %u0385 %u0386 %u0388 %u0389 %u038a %u038c %u038e %u038f %u0390 %u0391 %u0392 %u0393 %u0394 %u0395 %u0396 %u0397 %u0398 %u0399 %u039a %u039b %u039c %u039d %u039e %u039f %u03a0 %u03a1 %u03a3 %u03a4 %u03a5 %u03a6 %u03a7 %u03a8 %u03a9 %u03aa %u03ab %u03ac %u03ad %u03ae %u03af %u03b0 %u03b1 %u03b2 %u03b3 %u03b4 %u03b5 %u03b6 %u03b7 %u03b8 %u03b9 %u03ba %u03bb %u03bc %u03bd %u03be %u03bf %u03c0 %u03c1 %u03c2 %u03c3 %u03c4 %u03c5 %u03c6 %u03c7 %u03c8 %u03c9 %u03ca %u03cb %u03cc %u03cd %u03ce %u03d0 %u03d1 %u03d2 %u03d3 %u03d4 %u03d5 %u03d6 %u03d7 %u03d8 %u03d9 %u03da %u03db %u03dc %u03dd %u03de %u03df %u03e0 %u03e1 %u03e2 %u03e3 %u03e4 %u03e5 %u03e6 %u03e7 %u03e8 %u03e9 %u03ea %u03eb %u03ec %u03ed %u03ee %u03ef %u03f0 %u03f1 %u03f2 %u03f3 %u03f4 %u03f5 %u03f6 %u03f7 %u03f8 %u03f9 %u03fa %u03fb %u03fc %u03fd %u03fe %u03ff %u05be %u05c0 %u05c3 %u05c6 %u05d0 %u05d1 %u05d2 %u05d3 %u05d4 %u05d5 %u05d6 %u05d7 %u05d8 %u05d9 %u05da %u05db %u05dc %u05dd %u05de %u05df %u05e0 %u05e1 %u05e2 %u05e3 %u05e4 %u05e5 %u05e6 %u05e7 %u05e8 %u05e9 %u05ea %u05f0 %u05f1 %u05f2 %u05f3 %u05f4',
+				'ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ـ ف ق ك ل م ن ه و ى ي ٖ ٗ ٘ ٙ ٠ ١ ٢ ٣ ٤ ٥ ٦ ٧ ٨ ٩ ٪ ٫ ٬ ٭ ٮ ٯ ٱ ٲ ٳ ٴ ٵ ٶ ٷ ٸ ٹ ٺ ٻ ټ ٽ پ ٿ ڀ ځ ڂ ڃ ڄ څ چ ڇ ڈ ډ ڊ ڋ ڌ ڍ ڎ ڏ ڐ ڑ ڒ ړ ڔ ڕ ږ ڗ ژ ڙ ښ ڛ ڜ ڝ ڞ ڟ ڠ ڡ ڢ ڣ ڤ ڥ ڦ ڧ ڨ ک ڪ ګ ڬ ڭ ڮ گ ڰ ڱ ڲ ڳ ڴ ڵ ڶ ڷ ڸ ڹ ں ڻ ڼ ڽ ھ ڿ ۀ ہ ۂ ۃ ۄ ۅ ۆ ۇ ۈ ۉ ۊ ۋ ی ۍ ێ ۏ ې ۑ ے ۓ ۔ ە ۝ ۞ ۥ ۦ ۩ ۮ ۯ ۰ ۱ ۲ ۳ ۴ ۵ ۶ ۷ ۸ ۹ ۺ ۻ ۼ ۽ ۾ ' => '%u0628 %u0629 %u062a %u062b %u062c %u062d %u062e %u062f %u0630 %u0631 %u0632 %u0633 %u0634 %u0635 %u0636 %u0637 %u0638 %u0639 %u063a %u0640 %u0641 %u0642 %u0643 %u0644 %u0645 %u0646 %u0647 %u0648 %u0649 %u064a %u0656 %u0657 %u0658 %u0659 %u0660 %u0661 %u0662 %u0663 %u0664 %u0665 %u0666 %u0667 %u0668 %u0669 %u066a %u066b %u066c %u066d %u066e %u066f %u0671 %u0672 %u0673 %u0674 %u0675 %u0676 %u0677 %u0678 %u0679 %u067a %u067b %u067c %u067d %u067e %u067f %u0680 %u0681 %u0682 %u0683 %u0684 %u0685 %u0686 %u0687 %u0688 %u0689 %u068a %u068b %u068c %u068d %u068e %u068f %u0690 %u0691 %u0692 %u0693 %u0694 %u0695 %u0696 %u0697 %u0698 %u0699 %u069a %u069b %u069c %u069d %u069e %u069f %u06a0 %u06a1 %u06a2 %u06a3 %u06a4 %u06a5 %u06a6 %u06a7 %u06a8 %u06a9 %u06aa %u06ab %u06ac %u06ad %u06ae %u06af %u06b0 %u06b1 %u06b2 %u06b3 %u06b4 %u06b5 %u06b6 %u06b7 %u06b8 %u06b9 %u06ba %u06bb %u06bc %u06bd %u06be %u06bf %u06c0 %u06c1 %u06c2 %u06c3 %u06c4 %u06c5 %u06c6 %u06c7 %u06c8 %u06c9 %u06ca %u06cb %u06cc %u06cd %u06ce %u06cf %u06d0 %u06d1 %u06d2 %u06d3 %u06d4 %u06d5 %u06dd %u06de %u06e5 %u06e6 %u06e9 %u06ee %u06ef %u06f0 %u06f1 %u06f2 %u06f3 %u06f4 %u06f5 %u06f6 %u06f7 %u06f8 %u06f9 %u06fa %u06fb %u06fc %u06fd %u06fe ',
+				'■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ ▩ ▪ ▫ ▬ ▭ ▮ ▯ ▰ ▱ ▲ △ ▴ ▵ ▶ ▷ ▸ ▹ ► ▻ ▼ ▽ ▾ ▿ ◀ ◁ ◂ ◃ ◄ ◅ ◆ ◇ ◈ ◉ ◊ ○ ◌ ◍ ◎ ● ◐ ◑ ◒ ◓ ◔ ◕ ◖ ◗ ◘ ◙ ◚ ◛ ◜ ◝ ◞ ◟ ◠ ◡ ◢ ◣ ◤ ◥ ◦ ◧ ◨ ◩ ◪ ◫ ◬ ◭ ◮ ◯ ◰ ◱ ◲ ◳ ◴ ◵ ◶ ◷ ◸ ◹ ◺ ◻ ◼ ◽ ◾ ◿' => '%u25a0 %u25a1 %u25a2 %u25a3 %u25a4 %u25a5 %u25a6 %u25a7 %u25a8 %u25a9 %u25aa %u25ab %u25ac %u25ad %u25ae %u25af %u25b0 %u25b1 %u25b2 %u25b3 %u25b4 %u25b5 %u25b6 %u25b7 %u25b8 %u25b9 %u25ba %u25bb %u25bc %u25bd %u25be %u25bf %u25c0 %u25c1 %u25c2 %u25c3 %u25c4 %u25c5 %u25c6 %u25c7 %u25c8 %u25c9 %u25ca %u25cb %u25cc %u25cd %u25ce %u25cf %u25d0 %u25d1 %u25d2 %u25d3 %u25d4 %u25d5 %u25d6 %u25d7 %u25d8 %u25d9 %u25da %u25db %u25dc %u25dd %u25de %u25df %u25e0 %u25e1 %u25e2 %u25e3 %u25e4 %u25e5 %u25e6 %u25e7 %u25e8 %u25e9 %u25ea %u25eb %u25ec %u25ed %u25ee %u25ef %u25f0 %u25f1 %u25f2 %u25f3 %u25f4 %u25f5 %u25f6 %u25f7 %u25f8 %u25f9 %u25fa %u25fb %u25fc %u25fd %u25fe %u25ff',
+				' ✁ ✂ ✃ ✄ ✅ ✆ ✇ ✈ ✉ ✊ ✋ ✌ ✍ ✎ ✏ ✐ ✑ ✒ ✓ ✔ ✕ ✖ ✗ ✘ ✙ ✚ ✛ ✜ ✝ ✞ ✟ ✠ ✡ ✢ ✣ ✤ ✥ ✦ ✧ ✨ ✩ ✪ ✫ ✬ ✭ ✮ ✯ ✰ ✱ ✲ ✳ ✴ ✵ ✶ ✷ ✸ ✹ ✺ ✻ ✼ ✽ ✾ ✿ ❀ ❁ ❂ ❃ ❄ ❅ ❆ ❇ ❈ ❉ ❊ ❋ ❌ ❍ ❎ ❏ ❐ ❑ ❒ ❓ ❔ ❕ ❖ ❗ ❘ ❙ ❚ ❛ ❜ ❝ ❣ ❤ ❥ ❦ ❧ ❨ ❩ ❪ ❫ ❬ ❭ ❮ ❯ ❰ ❱ ❲ ❳ ❴ ❵ ❶ ❷ ❸ ❹ ❺ ❻ ❼ ❽ ❾ ❿ ➀ ➁ ➂ ➃ ➄ ➅ ➆ ➇ ➈ ➉ ➊ ➋ ➌ ➍ ➎ ➏ ➐ ➑ ➒ ➓ ➔ ➘ ➙ ➚ ➛ ➜ ➝ ➞ ➟ ➠ ➡ ➢ ➣ ➤ ➥ ➦ ➧ ➨ ➩ ➪ ➫ ➬ ➭ ➮ ➯ ➰ ➱ ➲ ➳ ➴ ➵ ➶ ➷ ➸ ➹ ➺ ➻ ➼ ➽ ➾ ➿' => ' %u2701 %u2702 %u2703 %u2704 %u2705 %u2706 %u2707 %u2708 %u2709 %u270a %u270b %u270c %u270d %u270e %u270f %u2710 %u2711 %u2712 %u2713 %u2714 %u2715 %u2716 %u2717 %u2718 %u2719 %u271a %u271b %u271c %u271d %u271e %u271f %u2720 %u2721 %u2722 %u2723 %u2724 %u2725 %u2726 %u2727 %u2728 %u2729 %u272a %u272b %u272c %u272d %u272e %u272f %u2730 %u2731 %u2732 %u2733 %u2734 %u2735 %u2736 %u2737 %u2738 %u2739 %u273a %u273b %u273c %u273d %u273e %u273f %u2740 %u2741 %u2742 %u2743 %u2744 %u2745 %u2746 %u2747 %u2748 %u2749 %u274a %u274b %u274c %u274d %u274e %u274f %u2750 %u2751 %u2752 %u2753 %u2754 %u2755 %u2756 %u2757 %u2758 %u2759 %u275a %u275b %u275c %u275d %u2763 %u2764 %u2765 %u2766 %u2767 %u2768 %u2769 %u276a %u276b %u276c %u276d %u276e %u276f %u2770 %u2771 %u2772 %u2773 %u2774 %u2775 %u2776 %u2777 %u2778 %u2779 %u277a %u277b %u277c %u277d %u277e %u277f %u2780 %u2781 %u2782 %u2783 %u2784 %u2785 %u2786 %u2787 %u2788 %u2789 %u278a %u278b %u278c %u278d %u278e %u278f %u2790 %u2791 %u2792 %u2793 %u2794 %u2798 %u2799 %u279a %u279b %u279c %u279d %u279e %u279f %u27a0 %u27a1 %u27a2 %u27a3 %u27a4 %u27a5 %u27a6 %u27a7 %u27a8 %u27a9 %u27aa %u27ab %u27ac %u27ad %u27ae %u27af %u27b0 %u27b1 %u27b2 %u27b3 %u27b4 %u27b5 %u27b6 %u27b7 %u27b8 %u27b9 %u27ba %u27bb %u27bc %u27bd %u27be %u27bf',
+				' ⟀ ⟁ ⟂ ⟃ ⟄ ⟅ ⟆ ⟇ ⟈ ⟉ ⟊ ⟌ ⟐ ⟑ ⟒ ⟓ ⟔ ⟕ ⟖ ⟗ ⟘ ⟙ ⟚ ⟛ ⟜ ⟝ ⟞ ⟟ ⟠ ⟡ ⟢ ⟣ ⟤ ⟥ ⟦ ⟧ ⟨ ⟩ ⟪ ⟫ ⟬ ⟭ ⟮ ⟯' => ' %u27c0 %u27c1 %u27c2 %u27c3 %u27c4 %u27c5 %u27c6 %u27c7 %u27c8 %u27c9 %u27ca %u27cc %u27d0 %u27d1 %u27d2 %u27d3 %u27d4 %u27d5 %u27d6 %u27d7 %u27d8 %u27d9 %u27da %u27db %u27dc %u27dd %u27de %u27df %u27e0 %u27e1 %u27e2 %u27e3 %u27e4 %u27e5 %u27e6 %u27e7 %u27e8 %u27e9 %u27ea %u27eb %u27ec %u27ed %u27ee %u27ef',
+				' ⟰ ⟱ ⟲ ⟳ ⟴ ⟵ ⟶ ⟷ ⟸ ⟹ ⟺ ⟻ ⟼ ⟽ ⟾ ⟿' => ' %u27f0 %u27f1 %u27f2 %u27f3 %u27f4 %u27f5 %u27f6 %u27f7 %u27f8 %u27f9 %u27fa %u27fb %u27fc %u27fd %u27fe %u27ff',
+			),
+		);
+	}
+}
diff --git a/projects/plugins/backup/CHANGELOG.md b/projects/plugins/backup/CHANGELOG.md
index bfacd050ec085..5c04e6a47b115 100644
--- a/projects/plugins/backup/CHANGELOG.md
+++ b/projects/plugins/backup/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.1.0-beta - 2022-01-13
+## 1.1.0 - 2022-01-26
 ### Added
 - Added My Jetpack page work in progress behind a feature flag.
 - Added pricing information to Jetpack Connection screen.
diff --git a/projects/js-packages/storybook/changelog/add-10.1-changelog b/projects/plugins/backup/changelog/2022-01-25-15-58-16-336664
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-10.1-changelog
rename to projects/plugins/backup/changelog/2022-01-25-15-58-16-336664
diff --git a/projects/js-packages/storybook/changelog/add-changelogger-squash-command b/projects/plugins/backup/changelog/2022-01-27-11-15-38-111622
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-changelogger-squash-command
rename to projects/plugins/backup/changelog/2022-01-27-11-15-38-111622
diff --git a/projects/js-packages/storybook/changelog/add-idc-errors b/projects/plugins/backup/changelog/2022-02-02-15-16-49-411998
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-idc-errors
rename to projects/plugins/backup/changelog/2022-02-02-15-16-49-411998
diff --git a/projects/plugins/vaultpress/changelog/add-idc-customizate-labels b/projects/plugins/backup/changelog/add-anti-spam-my-jetpack
similarity index 100%
rename from projects/plugins/vaultpress/changelog/add-idc-customizate-labels
rename to projects/plugins/backup/changelog/add-anti-spam-my-jetpack
diff --git a/projects/js-packages/storybook/changelog/add-idc-non-admin b/projects/plugins/backup/changelog/add-dependency-analysis-in-cli
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-idc-non-admin
rename to projects/plugins/backup/changelog/add-dependency-analysis-in-cli
diff --git a/projects/js-packages/storybook/changelog/add-jetpack-spinner-to-storybook b/projects/plugins/backup/changelog/add-disconnect-modal-click-events
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-jetpack-spinner-to-storybook
rename to projects/plugins/backup/changelog/add-disconnect-modal-click-events
diff --git a/projects/js-packages/storybook/changelog/add-js-packages-exports b/projects/plugins/backup/changelog/add-idc-safe-mode-bar
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-js-packages-exports
rename to projects/plugins/backup/changelog/add-idc-safe-mode-bar
diff --git a/projects/js-packages/storybook/changelog/add-my-jetpack-sections b/projects/plugins/backup/changelog/add-my-jetpack-plugin-installation
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-my-jetpack-sections
rename to projects/plugins/backup/changelog/add-my-jetpack-plugin-installation
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#6 b/projects/plugins/backup/changelog/add-my_jetpack_has_plan
similarity index 54%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo#6
rename to projects/plugins/backup/changelog/add-my_jetpack_has_plan
index 302aa8cf46b5c..650406ad22bff 100644
--- a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#6
+++ b/projects/plugins/backup/changelog/add-my_jetpack_has_plan
@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies
+updated lock file
diff --git a/projects/plugins/vaultpress/changelog/add-idc-customizer-tags b/projects/plugins/backup/changelog/add-my_jetpack_has_plan#2
similarity index 100%
rename from projects/plugins/vaultpress/changelog/add-idc-customizer-tags
rename to projects/plugins/backup/changelog/add-my_jetpack_has_plan#2
diff --git a/projects/plugins/vaultpress/changelog/add-rna-connect-screen-required-plan b/projects/plugins/backup/changelog/add-plugins-install-mirror-repo
similarity index 100%
rename from projects/plugins/vaultpress/changelog/add-rna-connect-screen-required-plan
rename to projects/plugins/backup/changelog/add-plugins-install-mirror-repo
diff --git a/projects/js-packages/storybook/changelog/add-new-attach-license-method b/projects/plugins/backup/changelog/fix-connection-status-card-display_name
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-new-attach-license-method
rename to projects/plugins/backup/changelog/fix-connection-status-card-display_name
diff --git a/projects/plugins/vaultpress/changelog/feature-sync-error-capture b/projects/plugins/backup/changelog/fix-my-jetpack-tests
similarity index 100%
rename from projects/plugins/vaultpress/changelog/feature-sync-error-capture
rename to projects/plugins/backup/changelog/fix-my-jetpack-tests
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#4 b/projects/plugins/backup/changelog/renovate-wordpress-monorepo
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo#4
rename to projects/plugins/backup/changelog/renovate-wordpress-monorepo
diff --git a/projects/js-packages/storybook/changelog/add-rna-connect-screen-required-plan#2 b/projects/plugins/backup/changelog/renovate-wordpress-monorepo#2
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-rna-connect-screen-required-plan#2
rename to projects/plugins/backup/changelog/renovate-wordpress-monorepo#2
diff --git a/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2 b/projects/plugins/backup/changelog/update-better-structure-for-i18n-loader
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-user-license-activate-notice-2
rename to projects/plugins/backup/changelog/update-better-structure-for-i18n-loader
diff --git a/projects/plugins/backup/changelog/update-changelog-readme b/projects/plugins/backup/changelog/update-changelog-readme
new file mode 100644
index 0000000000000..74d631b06c790
--- /dev/null
+++ b/projects/plugins/backup/changelog/update-changelog-readme
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated changelog and readme with 1.1.0 version identifier
diff --git a/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2#2 b/projects/plugins/backup/changelog/update-move-i18n-loader-pkg-path-into-assets
similarity index 100%
rename from projects/js-packages/storybook/changelog/add-user-license-activate-notice-2#2
rename to projects/plugins/backup/changelog/update-move-i18n-loader-pkg-path-into-assets
diff --git a/projects/js-packages/storybook/changelog/backup-branch-1.1.0 b/projects/plugins/backup/changelog/update-my-jetpack-styles
similarity index 100%
rename from projects/js-packages/storybook/changelog/backup-branch-1.1.0
rename to projects/plugins/backup/changelog/update-my-jetpack-styles
diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json
index 462cc8e0b7c17..d57f24e6fbecd 100644
--- a/projects/plugins/backup/composer.json
+++ b/projects/plugins/backup/composer.json
@@ -4,16 +4,16 @@
 	"type": "library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-assets": "1.16.x-dev",
+		"automattic/jetpack-assets": "1.17.x-dev",
 		"automattic/jetpack-admin-ui": "0.2.x-dev",
 		"automattic/jetpack-autoloader": "2.10.x-dev",
 		"automattic/jetpack-backup": "1.2.x-dev",
-		"automattic/jetpack-composer-plugin": "1.0.x-dev",
+		"automattic/jetpack-composer-plugin": "1.1.x-dev",
 		"automattic/jetpack-config": "1.6.x-dev",
 		"automattic/jetpack-connection": "1.36.x-dev",
 		"automattic/jetpack-connection-ui": "2.3.x-dev",
-		"automattic/jetpack-identity-crisis": "0.6.x-dev",
-		"automattic/jetpack-my-jetpack": "0.4.x-dev",
+		"automattic/jetpack-identity-crisis": "0.7.x-dev",
+		"automattic/jetpack-my-jetpack": "0.5.x-dev",
 		"automattic/jetpack-sync": "1.29.x-dev",
 		"automattic/jetpack-status": "1.10.x-dev"
 	},
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
index 89904c6485ed5..12a44dfd7877b 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/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": "f6c6a6654288c4971fe6b4c1cb93f238",
+    "content-hash": "c3a6891977d5f9e3a9b540f58682effe",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -60,7 +60,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "e9c471e1ac68c4dd7cf656fd17a4b96fdc4c6ff1"
+                "reference": "bbb92b9b9852760e84b7aaee877ee081616efcb3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
@@ -71,6 +71,7 @@
             "extra": {
                 "autotagger": true,
                 "mirror-repo": "Automattic/jetpack-admin-ui",
+                "textdomain": "jetpack-admin-ui",
                 "changelogger": {
                     "link-template": "https://github.com/Automattic/jetpack-admin-ui/compare/${old}...${new}"
                 },
@@ -115,7 +116,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "558a4eabba5541257e2b496aeba6da3a06e169f5"
+                "reference": "810134d18a0baedd94aae5398f2f506f213bac7b"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6"
@@ -135,7 +136,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "1.16.x-dev"
+                    "dev-master": "1.17.x-dev"
                 }
             },
             "autoload": {
@@ -147,11 +148,21 @@
                 ]
             },
             "scripts": {
+                "build-development": [
+                    "pnpm run build"
+                ],
+                "build-production": [
+                    "pnpm run build-production"
+                ],
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
                 "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
+                    "pnpm run test-coverage"
+                ],
+                "test-js": [
+                    "pnpm run test"
                 ],
                 "test-php": [
                     "@composer phpunit"
@@ -291,7 +302,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "d9a79b97dbf363bdffb2f748e0dbed8216753c36"
+                "reference": "c3fc0e4cf179c619f896174a6c9db8e70cff74c3"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -310,7 +321,7 @@
                 },
                 "autotagger": true,
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -450,14 +461,14 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection-ui",
-                "reference": "73a9cff560f04b981ca97d26225cc8fbb91c0be5"
+                "reference": "af0b68a96950278824fbd56aad4fc5f5a2af4240"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-device-detection": "^1.4",
-                "automattic/jetpack-identity-crisis": "^0.6"
+                "automattic/jetpack-identity-crisis": "^0.7"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0"
@@ -644,10 +655,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "daea57d4601da806be82d3265429cb9c2a304c00"
+                "reference": "80cc6904f5337f7cfa194199ad307e054fece278"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-logo": "^1.5",
@@ -672,7 +683,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.6.x-dev"
+                    "dev-master": "0.7.x-dev"
                 }
             },
             "autoload": {
@@ -767,17 +778,20 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "a5d7c6f0f3652d649cac7b11dfe35db034634fb7"
+                "reference": "0a4354d247242a1fbc56373c2ddd4ccacab62d52"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2",
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
+                "automattic/jetpack-plugins-installer": "^0.1",
                 "automattic/jetpack-terms-of-service": "^1.9",
                 "automattic/jetpack-tracking": "^1.14"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
+                "automattic/jetpack-options": "^1.14",
+                "automattic/jetpack-search": "^0.7",
                 "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "1.0.3"
             },
@@ -790,7 +804,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.4.x-dev"
+                    "dev-master": "0.5.x-dev"
                 }
             },
             "autoload": {
@@ -933,6 +947,58 @@
                 "relative": true
             }
         },
+        {
+            "name": "automattic/jetpack-plugins-installer",
+            "version": "dev-master",
+            "dist": {
+                "type": "path",
+                "url": "../../packages/plugins-installer",
+                "reference": "19c930344c337c188d411a51938c7c870ea511a1"
+            },
+            "require": {
+                "automattic/jetpack-a8c-mc-stats": "^1.4"
+            },
+            "require-dev": {
+                "automattic/jetpack-changelogger": "^3.0",
+                "yoast/phpunit-polyfills": "1.0.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                },
+                "mirror-repo": "Automattic/jetpack-plugins-installer",
+                "changelogger": {
+                    "link-template": "https://github.com/Automattic/jetpack-plugins-installer/compare/v${old}...v${new}"
+                },
+                "autotagger": true,
+                "textdomain": "jetpack-plugins-installer"
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "scripts": {
+                "phpunit": [
+                    "./vendor/phpunit/phpunit/phpunit --colors=always"
+                ],
+                "test-coverage": [
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                ],
+                "test-php": [
+                    "@composer phpunit"
+                ]
+            },
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Handle installation of plugins from WP.org",
+            "transport-options": {
+                "monorepo": true,
+                "relative": true
+            }
+        },
         {
             "name": "automattic/jetpack-redirect",
             "version": "dev-master",
@@ -1092,13 +1158,13 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "cad6e550e4c76cc17cab3ddef0829b67e2c04838"
+                "reference": "08c63a81a1ac29072c140383f3bf9266a4c3c6be"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-heartbeat": "^1.4",
-                "automattic/jetpack-identity-crisis": "^0.6",
+                "automattic/jetpack-identity-crisis": "^0.7",
                 "automattic/jetpack-options": "^1.14",
                 "automattic/jetpack-password-checker": "^0.2",
                 "automattic/jetpack-roles": "^1.4",
@@ -1211,10 +1277,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/tracking",
-                "reference": "ed6f897aaaa8e843271556d271e6c7a829cb8727"
+                "reference": "60dd2a4462221bcc460aadf9f86daeb308fd8027"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-options": "^1.14",
                 "automattic/jetpack-status": "^1.10",
                 "automattic/jetpack-terms-of-service": "^1.9"
@@ -1423,9 +1489,6 @@
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
diff --git a/projects/plugins/backup/package.json b/projects/plugins/backup/package.json
index 5c9a0d3570a08..2c22996fe254b 100644
--- a/projects/plugins/backup/package.json
+++ b/projects/plugins/backup/package.json
@@ -24,20 +24,20 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@automattic/jetpack-connection": "workspace:^0.14.0-alpha",
-		"@wordpress/api-fetch": "5.2.6",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/element": "4.0.4",
-		"@wordpress/date": "4.2.3",
-		"@wordpress/i18n": "4.2.4",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.15.1-alpha",
+		"@wordpress/api-fetch": "6.0.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/element": "4.1.0",
+		"@wordpress/date": "4.3.0",
+		"@wordpress/i18n": "4.3.0",
 		"react": "17.0.2",
 		"react-dom": "17.0.2"
 	},
 	"devDependencies": {
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
 		"@babel/core": "7.16.0",
 		"@babel/preset-env": "7.16.4",
 		"@babel/register": "7.16.0",
diff --git a/projects/plugins/backup/readme.txt b/projects/plugins/backup/readme.txt
index 28e2b6b77d369..786c204352019 100644
--- a/projects/plugins/backup/readme.txt
+++ b/projects/plugins/backup/readme.txt
@@ -4,7 +4,7 @@ Tags: jetpack
 Requires at least: 5.8
 Requires PHP: 5.6
 Tested up to: 5.9
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -158,7 +158,7 @@ No, Jetpack Backup does not currently support split site or split home URLs.
 2. Your site backups are stored in multiple locations on our world-class cloud infrastructure so you can recover them at any moment.
 
 == Changelog ==
-### 1.1.0-beta - 2022-01-13
+### 1.1.0 - 2022-01-26
 #### Added
 - Added My Jetpack page work in progress behind a feature flag.
 - Added pricing information to Jetpack Connection screen.
diff --git a/projects/plugins/backup/src/js/components/Admin.js b/projects/plugins/backup/src/js/components/Admin.js
index 2724a00d0c7dd..1398091f32028 100644
--- a/projects/plugins/backup/src/js/components/Admin.js
+++ b/projects/plugins/backup/src/js/components/Admin.js
@@ -9,7 +9,7 @@ import {
 	AdminPage,
 	AdminSection,
 	AdminSectionHero,
-	Row,
+	Container,
 	Col,
 	getRedirectUrl,
 	PricingCard,
@@ -84,7 +84,7 @@ const Admin = () => {
 			'jetpack-backup'
 		);
 		return (
-			<Row>
+			<Container>
 				<Col lg={ 6 } md={ 6 } sm={ 4 }>
 					<h1>{ __( 'Secure your site with a Backup subscription.', 'jetpack-backup' ) }</h1>
 					<p>
@@ -115,7 +115,7 @@ const Admin = () => {
 						title={ __( 'Jetpack Backup', 'jetpack-backup' ) }
 					/>
 				</Col>
-			</Row>
+			</Container>
 		);
 	};
 
@@ -130,11 +130,11 @@ const Admin = () => {
 			}
 
 			return (
-				<Row>
+				<Container>
 					<Col lg={ 12 } md={ 8 } sm={ 4 }>
 						{ renderConnectScreen() }
 					</Col>
-				</Row>
+				</Container>
 			);
 		}
 
@@ -154,11 +154,11 @@ const Admin = () => {
 		// Render an error state, this shouldn't occurr since we've passed userConnected checks
 		if ( capabilitiesError ) {
 			return (
-				<Row>
+				<Container>
 					<Col lg={ 12 } md={ 8 } sm={ 4 }>
 						{ capabilitiesError }
 					</Col>
-				</Row>
+				</Container>
 			);
 		}
 
@@ -168,7 +168,7 @@ const Admin = () => {
 	// Renders additional segments under the jp-hero area condition on having a backup plan
 	const renderBackupSegments = () => {
 		return (
-			<Row>
+			<Container>
 				<Col lg={ 6 } md={ 4 }>
 					<h2>{ __( 'Your cloud backups', 'jetpack-backup' ) }</h2>
 					<p>
@@ -218,7 +218,7 @@ const Admin = () => {
 
 					{ renderConnectionStatusCard() }
 				</Col>
-			</Row>
+			</Container>
 		);
 	};
 
diff --git a/projects/plugins/beta/changelog/renovate-major-eslint-packages b/projects/plugins/beta/changelog/renovate-major-eslint-packages
new file mode 100644
index 0000000000000..f8a4b188c86c1
--- /dev/null
+++ b/projects/plugins/beta/changelog/renovate-major-eslint-packages
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Added docs to JS file.
diff --git a/projects/plugins/beta/src/admin/updates.js b/projects/plugins/beta/src/admin/updates.js
index badcf5e315c2c..6ac54c55e5c62 100644
--- a/projects/plugins/beta/src/admin/updates.js
+++ b/projects/plugins/beta/src/admin/updates.js
@@ -1,4 +1,6 @@
 /**
+ * Update message hooks.
+ *
  * @param {jQuery}  $ - jQuery object.
  * @param {object}  wp - WP object.
  * @param {object}  i18n - I18n data.
diff --git a/projects/plugins/boost/.phpcs.dir.xml b/projects/plugins/boost/.phpcs.dir.xml
index de9dcf15a11a6..0d50ca55e7c99 100644
--- a/projects/plugins/boost/.phpcs.dir.xml
+++ b/projects/plugins/boost/.phpcs.dir.xml
@@ -21,4 +21,38 @@
 		</properties>
 	</rule>
 
+	<rule ref="WordPress.Files.FileName.InvalidClassFileName">
+		<severity>0</severity>
+	</rule>
+
+	<rule ref="Squiz.Commenting.FileComment.Missing">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Commenting.ClassComment.Missing">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Commenting.FunctionComment.Missing">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Commenting.FunctionComment.MissingParamComment">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Commenting.DocComment.MissingShort">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Squiz.Commenting.VariableComment.Missing">
+		<severity>0</severity>
+	</rule>
+
+	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
+		<properties>
+			<property name="ignoreUnusedRegexp" value="/^_/"/>
+		</properties>
+	</rule>
+
 </ruleset>
+
+
+
+
+
diff --git a/projects/plugins/boost/app/admin/class-admin.php b/projects/plugins/boost/app/admin/class-admin.php
index 014fc768c3b77..4cfe6eb0e9b69 100644
--- a/projects/plugins/boost/app/admin/class-admin.php
+++ b/projects/plugins/boost/app/admin/class-admin.php
@@ -10,14 +10,14 @@
 
 use Automattic\Jetpack\Admin_UI\Admin_Menu;
 use Automattic\Jetpack\Status;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
+use Automattic\Jetpack_Boost\Features\Optimizations\Optimizations;
+use Automattic\Jetpack_Boost\Features\Speed_Score\Speed_Score;
 use Automattic\Jetpack_Boost\Jetpack_Boost;
 use Automattic\Jetpack_Boost\Lib\Analytics;
 use Automattic\Jetpack_Boost\Lib\Environment_Change_Detector;
-use Automattic\Jetpack_Boost\Lib\Speed_Score;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Nonce;
 
-/**
- * Class Admin
- */
 class Admin {
 
 	/**
@@ -45,7 +45,7 @@ class Admin {
 	 *
 	 * @var Jetpack_Boost Plugin.
 	 */
-	private $jetpack_boost;
+	private $modules;
 
 	/**
 	 * Speed_Score class instance.
@@ -54,21 +54,13 @@ class Admin {
 	 */
 	private $speed_score;
 
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @param Jetpack_Boost $jetpack_boost Main plugin instance.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct( Jetpack_Boost $jetpack_boost ) {
-		$this->jetpack_boost = $jetpack_boost;
-		$this->speed_score   = new Speed_Score( $jetpack_boost );
+	public function __construct( Optimizations $modules ) {
+		$this->modules     = $modules;
+		$this->speed_score = new Speed_Score( $modules );
 		Environment_Change_Detector::init();
 
 		add_action( 'init', array( new Analytics(), 'init' ) );
 		add_filter( 'plugin_action_links_' . JETPACK_BOOST_PLUGIN_BASE, array( $this, 'plugin_page_settings_link' ) );
-		add_action( 'rest_api_init', array( $this, 'register_rest_routes' ) );
 		add_action( 'admin_notices', array( $this, 'show_notices' ) );
 		add_action( 'wp_ajax_set_show_rating_prompt', array( $this, 'handle_set_show_rating_prompt' ) );
 		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_js_constants' ) );
@@ -102,7 +94,7 @@ public function enqueue_styles() {
 		$internal_path = apply_filters( 'jetpack_boost_asset_internal_path', 'app/assets/dist/' );
 
 		wp_enqueue_style(
-			$this->jetpack_boost->get_plugin_name() . '-css',
+			'jetpack-boost-css',
 			plugins_url( $internal_path . 'jetpack-boost.css', JETPACK_BOOST_PATH ),
 			array( 'wp-components' ),
 			JETPACK_BOOST_VERSION
@@ -117,7 +109,7 @@ public function enqueue_styles() {
 	public function enqueue_scripts() {
 		$internal_path = apply_filters( 'jetpack_boost_asset_internal_path', 'app/assets/dist/' );
 
-		$admin_js_handle = $this->jetpack_boost->get_plugin_name() . '-admin';
+		$admin_js_handle = 'jetpack-boost-admin';
 
 		wp_register_script(
 			$admin_js_handle,
@@ -127,6 +119,7 @@ public function enqueue_scripts() {
 			true
 		);
 
+		$optimizations = ( new Optimizations() )->get_status();
 		// Prepare configuration constants for JavaScript.
 		$constants = array(
 			'version'             => JETPACK_BOOST_VERSION,
@@ -134,8 +127,7 @@ public function enqueue_scripts() {
 				'namespace' => JETPACK_BOOST_REST_NAMESPACE,
 				'prefix'    => JETPACK_BOOST_REST_PREFIX,
 			),
-			'modules'             => $this->jetpack_boost->get_available_modules(),
-			'config'              => $this->jetpack_boost->config()->get_data(),
+			'optimizations'       => $optimizations,
 			'locale'              => get_locale(),
 			'site'                => array(
 				'url'       => get_home_url(),
@@ -146,6 +138,14 @@ public function enqueue_scripts() {
 			'preferences'         => array(
 				'showRatingPrompt' => $this->get_show_rating_prompt(),
 			),
+
+			/**
+			 * A bit of necessary magic,
+			 * Explained more in the Nonce class.
+			 *
+			 * Nonces are automatically generated when registering routes.
+			 */
+			'nonces'              => Nonce::get_generated_nonces(),
 		);
 
 		// Give each module an opportunity to define extra constants.
@@ -179,7 +179,7 @@ public function plugin_page_settings_link( $links ) {
 	 */
 	public function render_settings() {
 		wp_localize_script(
-			$this->jetpack_boost->get_plugin_name() . '-admin',
+			'jetpack-boost-admin',
 			'wpApiSettings',
 			array(
 				'root'  => esc_url_raw( rest_url() ),
@@ -200,49 +200,6 @@ public function check_for_permissions() {
 		return current_user_can( 'manage_options' );
 	}
 
-	/**
-	 * Register REST routes for settings.
-	 *
-	 * @return void
-	 */
-	public function register_rest_routes() {
-		// Activate and deactivate a module.
-		register_rest_route(
-			JETPACK_BOOST_REST_NAMESPACE,
-			JETPACK_BOOST_REST_PREFIX . '/module/(?P<slug>[a-z\-]+)/status',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'set_module_status' ),
-				'permission_callback' => array( $this, 'check_for_permissions' ),
-			)
-		);
-	}
-
-	/**
-	 * Handler for the /module/(?P<slug>[a-z\-]+)/status endpoint.
-	 *
-	 * @param \WP_REST_Request $request The request object.
-	 *
-	 * @return \WP_REST_Response|\WP_Error The response.
-	 */
-	public function set_module_status( $request ) {
-		$params = $request->get_json_params();
-
-		if ( ! isset( $params['status'] ) ) {
-			return new \WP_Error(
-				'jetpack_boost_error_missing_module_status_param',
-				__( 'Missing status param', 'jetpack-boost' )
-			);
-		}
-
-		$module_slug = $request['slug'];
-		$this->jetpack_boost->set_module_status( (bool) $params['status'], $module_slug );
-
-		return rest_ensure_response(
-			$this->jetpack_boost->get_module_status( $module_slug )
-		);
-	}
-
 	/**
 	 * Show any admin notices from enabled modules.
 	 */
@@ -250,7 +207,7 @@ public function show_notices() {
 		// Determine if we're already on the settings page.
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		$on_settings_page = isset( $_GET['page'] ) && self::MENU_SLUG === $_GET['page'];
-		$notices          = $this->jetpack_boost->get_admin_notices();
+		$notices          = $this->get_admin_notices();
 
 		// Filter out any that have been dismissed, unless newer than the dismissal.
 		$dismissed_notices = \get_option( self::DISMISSED_NOTICE_OPTION, array() );
@@ -281,7 +238,7 @@ function ( $notice ) use ( $dismissed_notices ) {
 	 * @return array List of notice ids.
 	 */
 	private function get_shown_admin_notice_ids() {
-		$notices = $this->jetpack_boost->get_admin_notices();
+		$notices = $this->get_admin_notices();
 		$ids     = array();
 		foreach ( $notices as $notice ) {
 			$ids[] = $notice->get_id();
@@ -290,6 +247,18 @@ private function get_shown_admin_notice_ids() {
 		return $ids;
 	}
 
+	/**
+	 * Returns a list of admin notices to show. Asks each module to provide admin notices the user needs to see.
+	 *
+	 * @TODO: This is still a code smell. We're carrying the whole modules instance just to get a list of admin notices.
+	 *
+	 * @return \Automattic\Jetpack_Boost\Admin\Admin_Notice[]
+	 */
+	public function get_admin_notices() {
+		$critical_css = new Critical_CSS();
+		return $critical_css->get_admin_notices();
+	}
+
 	/**
 	 * Check for a GET parameter used to dismiss an admin notice.
 	 *
diff --git a/projects/plugins/boost/app/assets/src/js/api/api.ts b/projects/plugins/boost/app/assets/src/js/api/api.ts
index bc6831bcecfb8..51d37883c4cd9 100644
--- a/projects/plugins/boost/app/assets/src/js/api/api.ts
+++ b/projects/plugins/boost/app/assets/src/js/api/api.ts
@@ -15,6 +15,7 @@ import { ApiError } from './api-error';
 import type { JSONObject } from '../utils/json-types';
 
 function getEndpointUrl( path: string ): string {
+	// eslint-disable-next-line camelcase
 	return wpApiSettings.root + Jetpack_Boost.api.namespace + Jetpack_Boost.api.prefix + path;
 }
 
diff --git a/projects/plugins/boost/app/assets/src/js/api/speed-scores.ts b/projects/plugins/boost/app/assets/src/js/api/speed-scores.ts
index 4d4cf27bd128a..014133d6eba8e 100644
--- a/projects/plugins/boost/app/assets/src/js/api/speed-scores.ts
+++ b/projects/plugins/boost/app/assets/src/js/api/speed-scores.ts
@@ -43,6 +43,7 @@ export async function requestSpeedScores( force = false ): Promise< SpeedScoresS
 	// Request metrics
 	const response = parseResponse(
 		await api.post( force ? '/speed-scores/refresh' : '/speed-scores', {
+			// eslint-disable-next-line camelcase
 			url: Jetpack_Boost.site.url,
 		} )
 	);
@@ -121,6 +122,7 @@ async function pollRequest(): Promise< SpeedScoresSet > {
 		timeoutError: __( 'Timed out while waiting for speed-score.', 'jetpack-boost' ),
 		callback: async resolve => {
 			const response = parseResponse(
+				// eslint-disable-next-line camelcase
 				await api.post( '/speed-scores', { url: Jetpack_Boost.site.url } )
 			);
 
diff --git a/projects/plugins/boost/app/assets/src/js/global.d.ts b/projects/plugins/boost/app/assets/src/js/global.d.ts
index 16d75ef98e167..b341177e5a5a8 100644
--- a/projects/plugins/boost/app/assets/src/js/global.d.ts
+++ b/projects/plugins/boost/app/assets/src/js/global.d.ts
@@ -12,7 +12,7 @@ import type { BrowserInterfaceIframe, generateCriticalCSS } from 'jetpack-boost-
  */
 import type { ConnectionStatus } from './stores/connection';
 import type { CriticalCssStatus } from './stores/critical-css-status';
-import type { ModulesState } from './stores/modules';
+import type { Optimizations } from './stores/modules';
 
 declare global {
 	const wpApiSettings: {
@@ -35,15 +35,17 @@ declare global {
 		connection: ConnectionStatus;
 		criticalCssStatus?: CriticalCssStatus;
 		showRatingPromptNonce?: string;
-		criticalCssDismissRecommendationsNonce?: string;
 		criticalCssDismissedRecommendations: string[];
 		site: {
 			url: string;
 			online: boolean;
 			assetPath: string;
 		};
-		config: ModulesState;
+		optimizations: Optimizations;
 		shownAdminNoticeIds: string[];
+		nonces: {
+			[ key: string ]: string;
+		};
 	};
 
 	// Critical CSS Generator library.
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/RatingCard.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/elements/RatingCard.svelte
index cbca5742929f0..9371e4dd16fb7 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/RatingCard.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/elements/RatingCard.svelte
@@ -24,6 +24,7 @@
 		await makeAdminAjaxRequest( {
 			action: 'set_show_rating_prompt',
 			value: false,
+			// eslint-disable-next-line camelcase
 			nonce: Jetpack_Boost.showRatingPromptNonce,
 		} );
 
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
index 248947810c484..b2f62e26d96c1 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
@@ -25,6 +25,7 @@
 	 */
 	import { __ } from '@wordpress/i18n';
 
+	// eslint-disable-next-line camelcase
 	const siteIsOnline = Jetpack_Boost.site.online;
 
 	let loadError;
@@ -120,6 +121,7 @@
 		}
 	}, 2000 );
 
+	// eslint-disable-next-line camelcase
 	const respawnRatingPrompt = writable( Jetpack_Boost.preferences.showRatingPrompt );
 
 	const showRatingCard = derived(
diff --git a/projects/plugins/boost/app/assets/src/js/stores/connection.ts b/projects/plugins/boost/app/assets/src/js/stores/connection.ts
index f0849625e2c4d..c8ddcf54ca75b 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/connection.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/connection.ts
@@ -14,6 +14,7 @@ export type ConnectionStatus = {
 	error: null | string;
 };
 
+// eslint-disable-next-line camelcase
 const initialState = Jetpack_Boost.connection;
 const { subscribe, update } = writable< ConnectionStatus >( initialState );
 
diff --git a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
index 4f80206670bc4..ee0f67931040f 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/critical-css-recommendations.ts
@@ -6,11 +6,11 @@ import { writable, derived } from 'svelte/store';
 /**
  * Internal dependencies
  */
+import api from '../api/api';
 import { CriticalCssErrorDetails, criticalCssStatus } from './critical-css-status';
 import type { JSONObject } from '../utils/json-types';
 import { objectFilter } from '../utils/object-filter';
 import { sortByFrequency } from '../utils/sort-by-frequency';
-import { makeAdminAjaxRequest } from '../utils/make-admin-ajax-request';
 import { castToString } from '../utils/cast-to-string';
 
 const importantProviders = [
@@ -20,6 +20,7 @@ const importantProviders = [
 	'singular_post',
 ];
 
+// eslint-disable-next-line camelcase
 const initialState = Jetpack_Boost.criticalCssDismissedRecommendations || [];
 const dismissed = writable< string[] >( initialState );
 
@@ -118,10 +119,10 @@ export function setDismissalError( title: string, error: JSONObject ): void {
  * @param {string} key Key of recommendation to dismiss.
  */
 export async function dismissRecommendation( key: string ): Promise< void > {
-	await makeAdminAjaxRequest( {
-		action: 'dismiss_recommendations',
+	await api.post( '/recommendations/dismiss', {
 		providerKey: key,
-		nonce: Jetpack_Boost.criticalCssDismissRecommendationsNonce,
+		// eslint-disable-next-line camelcase
+		nonce: Jetpack_Boost.nonces[ 'recommendations/dismiss' ],
 	} );
 	dismissed.update( keys => [ ...keys, key ] );
 }
@@ -130,9 +131,9 @@ export async function dismissRecommendation( key: string ): Promise< void > {
  * Clear all the dismissed recommendations.
  */
 export async function clearDismissedRecommendations(): Promise< void > {
-	await makeAdminAjaxRequest( {
-		action: 'reset_dismissed_recommendations',
-		nonce: Jetpack_Boost.criticalCssDismissRecommendationsNonce,
+	await api.post( '/recommendations/reset', {
+		// eslint-disable-next-line camelcase
+		nonce: Jetpack_Boost.nonces[ 'recommendations/reset' ],
 	} );
 	dismissed.set( [] );
 }
diff --git a/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts b/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
index 7f9a7d82e8f7d..1254c3f1d107a 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/critical-css-status.ts
@@ -47,6 +47,7 @@ export interface CriticalCssStatus {
 const success = 'success';
 const fail = 'fail';
 
+// eslint-disable-next-line camelcase
 const initialState = Jetpack_Boost.criticalCssStatus || {
 	generating: false,
 	progress: 0,
diff --git a/projects/plugins/boost/app/assets/src/js/stores/modules.ts b/projects/plugins/boost/app/assets/src/js/stores/modules.ts
index f9accfb9b2544..668f0771c61e6 100644
--- a/projects/plugins/boost/app/assets/src/js/stores/modules.ts
+++ b/projects/plugins/boost/app/assets/src/js/stores/modules.ts
@@ -9,6 +9,10 @@ import { writable } from 'svelte/store';
 import config from './config';
 import { setModuleState } from '../api/modules';
 
+export type Optimizations = {
+	[ slug: string ]: boolean;
+};
+
 export type ModulesState = {
 	[ slug: string ]: {
 		enabled: boolean;
@@ -16,7 +20,13 @@ export type ModulesState = {
 	};
 };
 
-const initialState = config.config;
+const initialState = {};
+for ( const [ name, value ] of Object.entries( config.optimizations ) ) {
+	initialState[ name ] = {
+		enabled: value,
+	};
+}
+
 const { subscribe, update } = writable< ModulesState >( initialState );
 
 // Keep a subscribed copy for quick reading.
diff --git a/projects/plugins/boost/app/assets/src/js/utils/analytics.ts b/projects/plugins/boost/app/assets/src/js/utils/analytics.ts
index 73da7fe910d27..fa35b4d6f29e9 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/analytics.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/analytics.ts
@@ -5,6 +5,7 @@ export function recordBoostEvent(
 ): void {
 	// eslint-disable-next-line camelcase
 	if ( ! ( 'boost_version' in eventProp ) && 'version' in Jetpack_Boost ) {
+		// eslint-disable-next-line camelcase
 		eventProp.boost_version = Jetpack_Boost.version;
 	}
 
diff --git a/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts b/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
index 9e931710023bb..a76d34c2321d6 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/generate-critical-css.ts
@@ -76,12 +76,12 @@ export default async function generateCriticalCss(
 	hasGenerateRun = true;
 	let cancelling = false;
 
-	if ( reset ) {
-		await clearDismissedRecommendations();
-		updateGenerateStatus( true, 0 );
-	}
-
 	try {
+		if ( reset ) {
+			await clearDismissedRecommendations();
+			updateGenerateStatus( true, 0 );
+		}
+
 		// Fetch a list of provider keys and URLs while loading the Critical CSS lib.
 		const cssStatus = await requestGeneration( reset, isShowstopperRetry );
 
diff --git a/projects/plugins/boost/app/assets/src/js/utils/load-critical-css-library.ts b/projects/plugins/boost/app/assets/src/js/utils/load-critical-css-library.ts
index 366c27df0f3dc..c0f7b43742607 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/load-critical-css-library.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/load-critical-css-library.ts
@@ -15,6 +15,7 @@ export async function loadCriticalCssLibrary(): Promise< void > {
 
 	loadLibraryPromise = new Promise< void >( ( resolve, reject ) => {
 		const scriptUrl =
+			// eslint-disable-next-line camelcase
 			Jetpack_Boost.site.assetPath + '/critical-css-gen.js?ver=' + Jetpack_Boost.version;
 		const scriptTag = document.createElement( 'script' );
 		scriptTag.src = scriptUrl;
diff --git a/projects/plugins/boost/app/assets/src/js/utils/remove-admin-notices.ts b/projects/plugins/boost/app/assets/src/js/utils/remove-admin-notices.ts
index df7502bb5ce5d..7338403ee25d1 100644
--- a/projects/plugins/boost/app/assets/src/js/utils/remove-admin-notices.ts
+++ b/projects/plugins/boost/app/assets/src/js/utils/remove-admin-notices.ts
@@ -4,6 +4,7 @@
  * @param {string} moduleSlug Module Slug
  */
 export function removeShownAdminNotices( moduleSlug: string ): void {
+	// eslint-disable-next-line camelcase
 	for ( const adminNoticeId of Jetpack_Boost.shownAdminNoticeIds ) {
 		if ( adminNoticeId.includes( moduleSlug ) ) {
 			const notice = document.getElementById( adminNoticeId );
diff --git a/projects/plugins/boost/app/class-jetpack-boost.php b/projects/plugins/boost/app/class-jetpack-boost.php
index cbef9b8fcd3f3..02ac717a4041c 100644
--- a/projects/plugins/boost/app/class-jetpack-boost.php
+++ b/projects/plugins/boost/app/class-jetpack-boost.php
@@ -12,19 +12,17 @@
 
 namespace Automattic\Jetpack_Boost;
 
-use Automattic\Jetpack\Config as Jetpack_Config;
 use Automattic\Jetpack_Boost\Admin\Admin;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_Storage;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Regenerate_Admin_Notice;
+use Automattic\Jetpack_Boost\Features\Optimizations\Optimizations;
 use Automattic\Jetpack_Boost\Lib\Analytics;
 use Automattic\Jetpack_Boost\Lib\CLI;
-use Automattic\Jetpack_Boost\Lib\Config;
 use Automattic\Jetpack_Boost\Lib\Connection;
-use Automattic\Jetpack_Boost\Lib\Speed_Score_History;
-use Automattic\Jetpack_Boost\Lib\Viewport;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Critical_CSS;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Regenerate_Admin_Notice;
-use Automattic\Jetpack_Boost\Modules\Lazy_Images\Lazy_Images;
-use Automattic\Jetpack_Boost\Modules\Module;
-use Automattic\Jetpack_Boost\Modules\Render_Blocking_JS\Render_Blocking_JS;
+use Automattic\Jetpack_Boost\Lib\Setup;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Optimization_Status;
+use Automattic\Jetpack_Boost\REST_API\REST_API;
 
 /**
  * The core plugin class.
@@ -40,28 +38,6 @@
  */
 class Jetpack_Boost {
 
-	const MODULES = array(
-		Critical_CSS::MODULE_SLUG       => Critical_CSS::class,
-		Lazy_Images::MODULE_SLUG        => Lazy_Images::class,
-		Render_Blocking_JS::MODULE_SLUG => Render_Blocking_JS::class,
-	);
-
-	/**
-	 * Default enabled modules.
-	 */
-	const ENABLED_MODULES_DEFAULT = array();
-
-	/**
-	 * Default available modules.
-	 */
-	const AVAILABLE_MODULES_DEFAULT = array(
-		Critical_CSS::MODULE_SLUG,
-		Render_Blocking_JS::MODULE_SLUG,
-		Lazy_Images::MODULE_SLUG,
-	);
-
-	const CURRENT_CONFIG_ID = 'default';
-
 	/**
 	 * The unique identifier of this plugin.
 	 *
@@ -78,21 +54,6 @@ class Jetpack_Boost {
 	 */
 	private $version;
 
-	/**
-	 * The config
-	 *
-	 * @since    1.0.0
-	 * @var      Config|null $config The configuration object
-	 */
-	private $config;
-
-	/**
-	 * Store all plugin module instances here
-	 *
-	 * @var array
-	 */
-	private $modules = array();
-
 	/**
 	 * The Jetpack Boost Connection manager instance.
 	 *
@@ -127,20 +88,12 @@ public function __construct() {
 			\WP_CLI::add_command( 'jetpack-boost', $cli_instance );
 		}
 
-		// Initialize the config module separately.
-		$this->init_config();
-
-		$this->prepare_modules();
+		$optimizations = new Optimizations();
+		Setup::add( $optimizations );
 
 		// Initialize the Admin experience.
-		$this->init_admin();
-
-		// Module readiness filter.
-		add_action( 'wp_head', array( $this, 'display_meta_field_module_ready' ) );
-
-		add_action( 'init', array( $this, 'initialize_modules' ) );
+		$this->init_admin( $optimizations );
 		add_action( 'init', array( $this, 'init_textdomain' ) );
-		add_action( 'init', array( $this, 'register_cache_clear_actions' ) );
 
 		add_action( 'handle_theme_change', array( $this, 'handle_theme_change' ) );
 
@@ -156,307 +109,23 @@ private function register_deactivation_hook() {
 		register_deactivation_hook( $plugin_file, array( $this, 'deactivate' ) );
 	}
 
-	/**
-	 * Wipe all cached values.
-	 */
-	public function clear_cache() {
-		do_action( 'jetpack_boost_clear_cache' );
-	}
-
 	/**
 	 * Plugin deactivation handler. Clear cache, and reset admin notices.
 	 */
 	public function deactivate() {
 		do_action( 'jetpack_boost_deactivate' );
-
-		$this->clear_cache();
-		Admin::clear_dismissed_notices();
-	}
-
-	/**
-	 * Plugin uninstallation handler. Delete all settings and cache.
-	 */
-	public function uninstall() {
-		do_action( 'jetpack_boost_uninstall' );
-
-		Speed_Score_History::clear_all();
-		$this->clear_cache();
-		delete_option( apply_filters( 'jetpack_boost_options_store_key_name', 'jetpack_boost_config' ) );
-	}
-
-	/**
-	 * Handlers for clearing module caches go here, so that caches get cleared even if the module is not enabled.
-	 */
-	public function register_cache_clear_actions() {
-		add_action( 'jetpack_boost_clear_cache', array( $this, 'record_clear_cache_event' ) );
-	}
-
-	/**
-	 * Record the clear cache event.
-	 */
-	public function record_clear_cache_event() {
+		do_action( 'jetpack_boost_clear_cache' );
 		Analytics::record_user_event( 'clear_cache' );
-	}
-
-	/**
-	 * Initialize modules.
-	 *
-	 * Note: this method ignores the nonce verification linter rule, as jb-disable-modules is intended to work
-	 * without a nonce.
-	 *
-	 * phpcs:disable WordPress.Security.NonceVerification.Recommended
-	 */
-	public function prepare_modules() {
-		$available_modules = $this->get_available_modules();
-
-		$forced_disabled_modules = array();
-
-		// Get the lists of modules explicitly disabled from the 'jb-disable-modules' query string.
-		// The parameter is a comma separated value list of module slug.
-		if ( ! empty( $_GET['jb-disable-modules'] ) ) {
-			// phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-			// phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$forced_disabled_modules = array_map( 'sanitize_key', explode( ',', $_GET['jb-disable-modules'] ) );
-		}
-
-		foreach ( self::MODULES as $module_slug => $module_class ) {
-			// Don't register modules that have been forcibly disabled from the url 'jb-disable-modules' query string parameter.
-			if ( in_array( $module_slug, $forced_disabled_modules, true ) || in_array( 'all', $forced_disabled_modules, true ) ) {
-				continue;
-			}
-
-			// All Jetpack Boost modules should extend Module class.
-			if ( ! is_subclass_of( $module_class, Module::class ) ) {
-				continue;
-			}
-
-			// Don't register modules that aren't available.
-			if ( ! in_array( $module_slug, $available_modules, true ) ) {
-				continue;
-			}
-
-			$module                        = new $module_class();
-			$this->modules[ $module_slug ] = $module;
-		}
-
-		do_action( 'jetpack_boost_modules_loaded' );
-	}
-
-	/**
-	 * Initialize modules when WordPress is ready
-	 */
-	public function initialize_modules() {
-		foreach ( $this->modules as $module_slug => $module ) {
-			if ( true === $this->get_module_status( $module_slug ) ) {
-				$module->initialize();
-			}
-		}
-	}
-
-	/**
-	 * Returns the list of available modules.
-	 *
-	 * @return array The available modules.
-	 */
-	public function get_available_modules() {
-		$available_modules = self::AVAILABLE_MODULES_DEFAULT;
-
-		// Add the Lazy Images module if Jetpack Lazy Images module is enabled.
-		if ( Lazy_Images::is_jetpack_lazy_images_module_enabled() ) {
-			$available_modules = array_unique( array_merge( self::AVAILABLE_MODULES_DEFAULT, array( Lazy_Images::MODULE_SLUG ) ) );
-		}
-
-		return apply_filters(
-			'jetpack_boost_modules',
-			$available_modules
-		);
-	}
-
-	/**
-	 * Returns an array of active modules.
-	 */
-	public function get_active_modules() {
-		// Cache active modules.
-		static $active_modules = null;
-		if ( null !== $active_modules ) {
-			return $active_modules;
-		}
-
-		return array_filter(
-			$this->modules,
-			function ( $module, $module_slug ) {
-				return true === $this->get_module_status( $module_slug );
-			},
-			ARRAY_FILTER_USE_BOTH
-		);
-	}
-
-	/**
-	 * Returns the status of a given module.
-	 *
-	 * @param string $module_slug The module's slug.
-	 *
-	 * @return bool The enablement status of the module.
-	 */
-	public function get_module_status( $module_slug ) {
-		$default_module_status = in_array( $module_slug, self::ENABLED_MODULES_DEFAULT, true );
-
-		return apply_filters( 'jetpack_boost_module_enabled', $default_module_status, $module_slug );
-	}
-
-	/**
-	 * Check if a module is enabled.
-	 *
-	 * @param boolean $is_enabled  Default value.
-	 * @param string  $module_slug The module we are checking.
-	 *
-	 * @return mixed|null
-	 */
-	public function is_module_enabled( $is_enabled, $module_slug ) {
-		do_action( 'jetpack_boost_pre_is_module_enabled', $is_enabled, $module_slug );
-
-		return $this->config()->get_value( "$module_slug/enabled", $is_enabled );
-	}
-
-	/**
-	 * Set status of a module.
-	 *
-	 * @param boolean $is_enabled  Default value.
-	 * @param string  $module_slug The module we are checking.
-	 */
-	public function set_module_status( $is_enabled, $module_slug ) {
-		do_action( 'jetpack_boost_pre_set_module_status', $is_enabled, $module_slug );
-		Analytics::record_user_event(
-			'set_module_status',
-			array(
-				'module' => $module_slug,
-				'status' => $is_enabled,
-			)
-		);
-		$this->config()->set_value( "$module_slug/enabled", $is_enabled, true );
-	}
-
-	/**
-	 * Get critical CSS viewport sizes.
-	 *
-	 * @param mixed $default The default value.
-	 *
-	 * @return mixed|null
-	 */
-	public function get_critical_css_viewport_sizes( $default ) {
-		return $this->config()->get_value( 'critical-css/settings/viewport_sizes', $default );
-	}
-
-	/**
-	 * Get critical CSS default viewports.
-	 *
-	 * @param mixed $default The default value.
-	 *
-	 * @return mixed|null
-	 */
-	public function get_critical_css_default_viewports( $default ) {
-		return $this->config()->get_value( 'critical-css/settings/default_viewports', $default );
-	}
-
-	/**
-	 * Get critical CSS ignore rules.
-	 *
-	 * @param mixed $default The default value.
-	 *
-	 * @return mixed|null
-	 */
-	public function get_critical_css_ignore_rules( $default ) {
-		return $this->config()->get_value( 'critical-css/settings/css-ignore-rules', $default );
-	}
-
-	/**
-	 * Returns configuration array.
-	 *
-	 * @return Config Configuration array.
-	 */
-	public function config() {
-		if ( ! $this->config ) {
-			do_action( 'jetpack_boost_pre_get_config' );
-			$this->config = Config::get( self::CURRENT_CONFIG_ID ); // under the hood, this actually fetches from an option, not the config cache.
-		}
-
-		return apply_filters( 'jetpack_boost_config', $this->config );
-	}
-
-	/**
-	 * Initialize config system.
-	 *
-	 * @todo This should be replaced by a proper configuration implementation eventually.
-	 */
-	public function init_config() {
-		add_action( 'switch_blog', array( $this, 'clear_memoized_config' ) );
-		add_filter( 'jetpack_boost_module_enabled', array( $this, 'is_module_enabled' ), 0, 2 );
-		add_filter( 'jetpack_boost_critical_css_viewport_sizes', array( $this, 'get_critical_css_viewport_sizes' ) );
-		add_filter( 'jetpack_boost_critical_css_default_viewports', array( $this, 'get_critical_css_default_viewports' ) );
-		add_filter( 'jetpack_boost_critical_css_ignore_rules', array( $this, 'get_critical_css_ignore_rules' ) );
-	}
-
-	/**
-	 * Clear the memoized config, executed on `switch_blog`
-	 */
-	public function clear_memoized_config() {
-		$this->config = null;
-	}
-
-	/**
-	 * Returns a default config array.
-	 *
-	 * @return array Default config.
-	 */
-	public static function get_default_config_array() {
-		return apply_filters(
-			'jetpack_boost_config_array',
-			array(
-				Render_Blocking_JS::MODULE_SLUG => array(
-					'enabled' => false,
-				),
-				Critical_CSS::MODULE_SLUG       => array(
-					'enabled'  => false,
-					'settings' => array(
-						'viewport_sizes'    => Viewport::DEFAULT_VIEWPORT_SIZES,
-						'default_viewports' => Viewport::DEFAULT_VIEWPORTS,
-						'css-ignore-rules'  => array(
-							// TODO: Define if we need any default CSS ignore rules
-							// Example regex, exclude all css where there is a url inside.
-							'url\(',
-						),
-					),
-				),
-				Lazy_Images::MODULE_SLUG        => array(
-					'enabled' => false,
-				),
-				'show_rating_prompt'            => true,
-			)
-		);
+		Admin::clear_dismissed_notices();
 	}
 
 	/**
 	 * Initialize the admin experience.
 	 */
-	public function init_admin() {
-		if ( ! apply_filters( 'jetpack_boost_connection_bypass', false ) ) {
-			$jetpack_config = new Jetpack_Config();
-			$jetpack_config->ensure(
-				'connection',
-				array(
-					'slug'     => 'jetpack-boost',
-					'name'     => 'Jetpack Boost',
-					'url_info' => '', // Optional, URL of the plugin.
-				)
-			);
-		}
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( __FILE__ ) . 'admin/class-admin.php';
-
-		new Admin( $this );
+	public function init_admin( $modules ) {
+		REST_API::register( Optimization_Status::class );
+		$this->connection->ensure_connection();
+		new Admin( $modules );
 	}
 
 	/**
@@ -470,15 +139,6 @@ public function init_textdomain() {
 		);
 	}
 
-	/**
-	 * Registers the `jetpack_boost_url_ready` filter which allows modules to provide their readiness status.
-	 */
-	public function display_meta_field_module_ready() {
-		?>
-		<meta name="jetpack-boost-ready" content="<?php echo apply_filters( 'jetpack_boost_url_ready', true ) ? 'true' : 'false'; ?>" />
-		<?php
-	}
-
 	/**
 	 * The name of the plugin used to uniquely identify it within the context of
 	 * WordPress and to define internationalization functionality.
@@ -500,25 +160,6 @@ public function get_version() {
 		return $this->version;
 	}
 
-	/**
-	 * Returns a list of admin notices to show. Asks each module to provide admin notices the user needs to see.
-	 *
-	 * @return \Automattic\Jetpack_Boost\Admin\Admin_Notice[]
-	 */
-	public function get_admin_notices() {
-		$all_notices = array();
-
-		foreach ( $this->get_active_modules() as $module ) {
-			$module_notices = $module->get_admin_notices();
-
-			if ( ! empty( $module_notices ) ) {
-				$all_notices = array_merge( $all_notices, $module_notices );
-			}
-		}
-
-		return $all_notices;
-	}
-
 	/**
 	 * Handle an environment change to set the correct status to the Critical CSS request.
 	 * This is done here so even if the Critical CSS module is switched off we can
@@ -528,4 +169,28 @@ public function handle_theme_change() {
 		Admin::clear_dismissed_notice( Regenerate_Admin_Notice::SLUG );
 		\update_option( Critical_CSS::RESET_REASON_STORAGE_KEY, Regenerate_Admin_Notice::REASON_THEME_CHANGE, false );
 	}
+
+	/**
+	 * Plugin uninstallation handler. Delete all settings and cache.
+	 */
+	public function uninstall() {
+
+		global $wpdb;
+
+		// When uninstalling, make sure all deactivation cleanups have run as well.
+		$this->deactivate();
+
+		// Delete all Jetpack Boost options.
+		$wpdb->query(
+			"
+			DELETE
+			FROM    `$wpdb->options`
+			WHERE   `option_name` LIKE jetpack_boost_%
+		"
+		);
+
+		// Delete stored Critical CSS.
+		( new Critical_CSS_Storage() )->clear();
+
+	}
 }
diff --git a/projects/plugins/boost/app/contracts/Feature.php b/projects/plugins/boost/app/contracts/Feature.php
new file mode 100644
index 0000000000000..33edf2c86b622
--- /dev/null
+++ b/projects/plugins/boost/app/contracts/Feature.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Contracts;
+
+/**
+ * Every plugin feature that's large enough
+ * to need setup also needs a slug
+ */
+interface Feature extends Has_Setup, Has_Slug {
+
+}
diff --git a/projects/plugins/boost/app/contracts/Has_Setup.php b/projects/plugins/boost/app/contracts/Has_Setup.php
new file mode 100644
index 0000000000000..948f0227dceeb
--- /dev/null
+++ b/projects/plugins/boost/app/contracts/Has_Setup.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Contracts;
+
+/**
+ * A class that has a setup step that's supposed to be executed only once.
+ */
+interface Has_Setup {
+
+	/**
+	 * This class has a setup method that should be
+	 * run only once per the request lifecycle.
+	 *
+	 * This is a good place to attach hooks
+	 * or perform other tasks that need
+	 * to be performed once.
+	 *
+	 * @return mixed
+	 */
+	public function setup();
+
+	/**
+	 * Return a string - which action should the setup method be run on?
+	 * Typically, this should return `init` or `admin_init`
+	 *
+	 * @return string
+	 */
+	public function setup_trigger();
+}
diff --git a/projects/plugins/boost/app/contracts/Has_Slug.php b/projects/plugins/boost/app/contracts/Has_Slug.php
new file mode 100644
index 0000000000000..632526ec46162
--- /dev/null
+++ b/projects/plugins/boost/app/contracts/Has_Slug.php
@@ -0,0 +1,6 @@
+<?php
+namespace Automattic\Jetpack_Boost\Contracts;
+
+interface Has_Slug {
+	public function get_slug();
+}
diff --git a/projects/plugins/boost/app/features/optimizations/Optimization.php b/projects/plugins/boost/app/features/optimizations/Optimization.php
new file mode 100644
index 0000000000000..45a720f0e7343
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/Optimization.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations;
+
+use Automattic\Jetpack_Boost\Contracts\Feature;
+use Automattic\Jetpack_Boost\Lib\Status;
+
+class Optimization {
+	/**
+	 * @var Status
+	 */
+	public $status;
+
+	/**
+	 * @var Feature
+	 */
+	public $feature;
+
+	public function __construct( Feature $feature ) {
+		$this->feature = $feature;
+		$this->status  = new Status( $feature->get_slug() );
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/Optimizations.php b/projects/plugins/boost/app/features/optimizations/Optimizations.php
new file mode 100644
index 0000000000000..a933dbeb54edd
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/Optimizations.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations;
+
+use Automattic\Jetpack_Boost\Contracts\Has_Setup;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
+use Automattic\Jetpack_Boost\Features\Optimizations\Lazy_Images\Lazy_Images;
+use Automattic\Jetpack_Boost\Features\Optimizations\Render_Blocking_JS\Render_Blocking_JS;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Has_Endpoints;
+
+class Optimizations implements Has_Setup {
+
+	/**
+	 * @var Optimization[] - Optimization modules
+	 */
+	protected $features = array();
+
+	/**
+	 * Initialize modules.
+	 *
+	 * Note: this method ignores the nonce verification linter rule, as jb-disable-modules is intended to work
+	 * without a nonce.
+	 */
+	public function __construct() {
+
+		$features = array(
+			new Critical_CSS(),
+			new Lazy_Images(),
+			new Render_Blocking_JS(),
+		);
+
+		foreach ( $features as $feature ) {
+			$slug                    = $feature->get_slug();
+			$this->features[ $slug ] = new Optimization( $feature );
+		}
+	}
+
+	public function available_modules() {
+		$forced_disabled_modules = $this->get_disabled_modules();
+
+		if ( empty( $forced_disabled_modules ) ) {
+			return $this->features;
+		}
+
+		if ( array( 'all' ) === $forced_disabled_modules ) {
+			return array();
+		}
+
+		$available_modules = array();
+		foreach ( $this->features as $slug => $feature ) {
+			if ( ! in_array( $slug, $forced_disabled_modules, true ) ) {
+				$available_modules[ $slug ] = $feature;
+			}
+		}
+
+		return $available_modules;
+	}
+
+	public function have_enabled_modules() {
+		return count( $this->get_status() ) > 0;
+	}
+
+	public function get_status() {
+		$status = array();
+		foreach ( $this->features as $slug => $optimization ) {
+			$status[ $slug ] = $optimization->status->is_enabled();
+		}
+		return $status;
+	}
+
+	public function register_endpoints( $feature ) {
+		if ( ! $feature instanceof Has_Endpoints ) {
+			return false;
+		}
+
+		if ( empty( $feature->get_endpoints() ) ) {
+			return false;
+		}
+
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function setup() {
+
+		foreach ( $this->available_modules() as $slug => $optimization ) {
+
+			if ( ! $optimization->status->is_enabled() ) {
+				continue;
+			}
+
+			$optimization->feature->setup();
+			$this->register_endpoints( $optimization->feature );
+
+			do_action( "jetpack_boost_{$slug}_initialized", $this );
+
+		}
+	}
+
+	/**
+	 * Get the lists of modules explicitly disabled from the 'jb-disable-modules' query string.
+	 * The parameter is a comma separated value list of module slug.
+	 *
+	 * @return array
+	 */
+
+	public function get_disabled_modules() {
+		// phpcs:disable WordPress.Security.NonceVerification.Recommended
+		if ( ! empty( $_GET['jb-disable-modules'] ) ) {
+			// phpcs:disable WordPress.Security.NonceVerification.Recommended
+			// phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
+			// phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+			return array_map( 'sanitize_key', explode( ',', $_GET['jb-disable-modules'] ) );
+		}
+
+		return array();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function setup_trigger() {
+		return 'plugins_loaded';
+	}
+
+}
diff --git a/projects/plugins/boost/app/modules/critical-css/class-admin-bar-css-compat.php b/projects/plugins/boost/app/features/optimizations/critical-css/Admin_Bar_Compatibilty.php
similarity index 75%
rename from projects/plugins/boost/app/modules/critical-css/class-admin-bar-css-compat.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/Admin_Bar_Compatibilty.php
index 5d7924ac6bf13..a2f18f83e04c0 100644
--- a/projects/plugins/boost/app/modules/critical-css/class-admin-bar-css-compat.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Admin_Bar_Compatibilty.php
@@ -1,24 +1,11 @@
 <?php
-/**
- * Admin bar CSS compatibility
- *
- * @link       https://automattic.com
- * @since      1.0.0
- * @package    automattic/jetpack-boost
- */
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS;
-
-/**
- * Class Admin_Bar_Css_Compat
- */
-class Admin_Bar_Css_Compat {
+class Admin_Bar_Compatibilty {
 
 	/**
 	 * Enforces the admin bar stylesheet to load late and synchronously
 	 * when the admin bar is present on the page.
-	 *
-	 * @return void
 	 */
 	public static function init() {
 
@@ -26,14 +13,14 @@ public static function init() {
 		remove_action( 'wp_body_open', 'wp_admin_bar_render', '0' );
 
 		add_filter( 'jetpack_boost_async_style', array( __CLASS__, 'enable_asynchronous_admin_bar' ), 10, 2 );
-		add_action( 'wp_head', array( __CLASS__, 'dequeue_admin_bar' ), 0 );
 		add_action( 'wp_before_admin_bar_render', array( __CLASS__, 'force_admin_bar_stylesheet' ) );
+		add_action( 'wp_head', array( __CLASS__, 'dequeue_admin_bar' ), 0 );
 	}
 
 	/**
 	 * Load the admin bar CSS synchronously.
 	 *
-	 * @param bool   $is_async Whether or not it is async.
+	 * @param bool   $is_async Whether admin bar is async.
 	 * @param string $handle   Asset handle.
 	 *
 	 * @return bool
@@ -50,7 +37,6 @@ public static function enable_asynchronous_admin_bar( $is_async, $handle ) {
 	/**
 	 * Dequeue the admin bar stylesheet, so that it's not printed early.
 	 *
-	 * @used-by admin_bar_css_compat
 	 * @see     wp_head
 	 */
 	public static function dequeue_admin_bar() {
@@ -60,7 +46,6 @@ public static function dequeue_admin_bar() {
 	/**
 	 * Force the admin bar stylesheet to print right before the admin bar markup.
 	 *
-	 * @used-by admin_bar_css_compat
 	 * @see     wp_before_admin_bar_render
 	 */
 	public static function force_admin_bar_stylesheet() {
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
new file mode 100644
index 0000000000000..25110ab06d7be
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
+
+use Automattic\Jetpack_Boost\Contracts\Feature;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate\Generator;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Source_Providers;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Has_Endpoints;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Generator_Error;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Generator_Request;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Generator_Status;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Generator_Success;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Recommendations_Dismiss;
+use Automattic\Jetpack_Boost\REST_API\Endpoints\Recommendations_Reset;
+use Automattic\Jetpack_Boost\REST_API\REST_API;
+
+class Critical_CSS implements Feature, Has_Endpoints {
+
+	const RESET_REASON_STORAGE_KEY = 'jb-generate-critical-css-reset-reason';
+
+	/**
+	 * Critical CSS storage class instance.
+	 *
+	 * @var Critical_CSS_Storage
+	 */
+	protected $storage;
+
+	/**
+	 * Critical CSS Provider Paths.
+	 *
+	 * @var Source_Providers
+	 */
+	protected $paths;
+
+	/**
+	 * Prepare module. This is run irrespective of the module activation status.
+	 */
+	public function __construct() {
+
+		$this->storage = new Critical_CSS_Storage();
+		$this->paths   = new Source_Providers();
+
+	}
+
+	/**
+	 * This is only run if Critical CSS module has been activated.
+	 */
+	public function setup() {
+		// Touch to setup the post type. This is a temporary hack.
+		// This should instantiate a new Post_Type_Storage class,
+		// so that Critical_CSS class is responsible
+		// for setting up the storage.
+		$recommendations = new Recommendations();
+		$recommendations->attach_hooks();
+
+		add_action( 'wp', array( $this, 'display_critical_css' ) );
+
+		if ( Generator::is_generating_critical_css() ) {
+			add_action( 'wp_head', array( $this, 'display_generate_meta' ), 0 );
+			$this->force_logged_out_render();
+		}
+
+		add_action( 'handle_theme_change', array( $this, 'clear_critical_css' ) );
+		add_action( 'jetpack_boost_clear_cache', array( $this, 'clear_critical_css' ) );
+		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_critical_css_constants' ) );
+
+		REST_API::register( $this->get_endpoints() );
+		return true;
+	}
+
+	public function get_slug() {
+		return 'critical-css';
+	}
+
+	/**
+	 * Renders a <meta> tag used to verify this is a valid page to generate Critical CSS with.
+	 */
+	public function display_generate_meta() {
+		?>
+		<meta name="jb-generate-critical-css" content="true"/>
+		<?php
+	}
+
+	public function display_critical_css() {
+
+		// Don't look for Critical CSS in the dashboard.
+		if ( is_admin() ) {
+			return;
+		}
+		// Don't display Critical CSS when generating Critical CSS.
+		if ( Generator::is_generating_critical_css() ) {
+			return;
+		}
+
+		// Don't show Critical CSS in customizer previews.
+		if ( is_customize_preview() ) {
+			return;
+		}
+
+		// Get the Critical CSS to show.
+		$critical_css = $this->paths->get_current_request_css();
+		if ( ! $critical_css ) {
+			return;
+		}
+
+		$display = new Display_Critical_CSS( $critical_css );
+		add_action( 'wp_head', array( $display, 'display_critical_css' ), 0 );
+		add_filter( 'style_loader_tag', array( $display, 'asynchronize_stylesheets' ), 10, 4 );
+		add_action( 'wp_footer', array( $display, 'onload_flip_stylesheets' ) );
+	}
+
+	/**
+	 * Clear Critical CSS.
+	 */
+	public function clear_critical_css() {
+		// Mass invalidate all cached values.
+		// ^^ Not true anymore. Mass invalidate __some__ cached values.
+		$this->storage->clear();
+		Critical_CSS_State::reset();
+	}
+
+	/**
+	 * Force the current page to render as viewed by a logged out user. Useful when generating
+	 * Critical CSS.
+	 */
+	private function force_logged_out_render() {
+		$current_user_id = get_current_user_id();
+
+		if ( 0 !== $current_user_id ) {
+			// Force current user to 0 to ensure page is rendered as a non-logged-in user.
+			wp_set_current_user( 0 );
+
+			// Turn off display of admin bar.
+			add_filter( 'show_admin_bar', '__return_false', PHP_INT_MAX );
+		}
+	}
+
+	/**
+	 * Override; returns an admin notice to show if there was a reset reason.
+	 *
+	 * @TODO:
+	 *      There should be an Admin_Notice class
+	 *      To create a notice, (new Admin_Notice())->create("notice text");
+	 *      To view notices: (new Admin_Notice())->get_all();
+	 * @return null|\Automattic\Jetpack_Boost\Admin\Admin_Notice[]
+	 */
+	public function get_admin_notices() {
+		$reason = \get_option( self::RESET_REASON_STORAGE_KEY );
+
+		if ( ! $reason ) {
+			return array();
+		}
+
+		return array( new Regenerate_Admin_Notice( $reason ) );
+	}
+
+	/**
+	 * Clear Critical CSS reset reason option.
+	 *
+	 * @TODO: Admin notices need to be moved elsewhere.
+	 *        Note: Looks like we need a way to <construct> and <destroy> options throughout the app.
+	 *        This is why it's currently awkwardly using a static method with a constant
+	 *        If we could trust classes to use constructors properly - without performing actions
+	 *        Then we could easily (and cheaply) instantiate all Boost objects
+	 *        and kindly ask them to delete themselves
+	 */
+	public static function clear_reset_reason() {
+		\delete_option( self::RESET_REASON_STORAGE_KEY );
+	}
+
+	/**
+	 * Add Critical CSS related constants to be passed to JavaScript only if the module is enabled.
+	 *
+	 * @param array $constants Constants to be passed to JavaScript.
+	 *
+	 * @return array
+	 */
+	public function add_critical_css_constants( $constants ) {
+		// Information about the current status of Critical CSS / generation.
+		$generator                      = new Generator();
+		$constants['criticalCssStatus'] = $generator->get_local_critical_css_generation_info();
+
+		return $constants;
+	}
+
+	/**
+	 * @TODO: Facepalm. PHP Typehinting is broken.
+	 * @return Endpoint[]
+	 *
+	 */
+	public function get_endpoints() {
+		return array(
+			Generator_Status::class,
+			Generator_Request::class,
+			Generator_Success::class,
+			Recommendations_Dismiss::class,
+			Recommendations_Reset::class,
+			Generator_Error::class,
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function setup_trigger() {
+		return 'init';
+	}
+}
diff --git a/projects/plugins/boost/app/modules/critical-css/class-critical-css-state.php b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_State.php
similarity index 97%
rename from projects/plugins/boost/app/modules/critical-css/class-critical-css-state.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_State.php
index 1768bd0227abc..e5867d9887da1 100644
--- a/projects/plugins/boost/app/modules/critical-css/class-critical-css-state.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_State.php
@@ -7,10 +7,9 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
 
 use Automattic\Jetpack_Boost\Lib\Transient;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Provider;
 
 /**
  * Critical CSS State
@@ -203,11 +202,6 @@ public function get_core_providers_status( $keys ) {
 	protected function get_provider_sources( $providers ) {
 		$sources = array();
 
-		/**
-		 * Provider.
-		 *
-		 * @var $provider Provider
-		 */
 		foreach ( $providers as $provider ) {
 			$provider_name = $provider::get_provider_name();
 
@@ -382,7 +376,7 @@ public function get_percent_complete() {
 	/**
 	 * Reset the Critical CSS state.
 	 */
-	public function reset() {
+	public static function reset() {
 		Transient::delete( self::KEY );
 	}
 
diff --git a/projects/plugins/boost/app/modules/critical-css/class-critical-css-storage.php b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_Storage.php
similarity index 94%
rename from projects/plugins/boost/app/modules/critical-css/class-critical-css-storage.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_Storage.php
index 29f233f445fe5..820b560ac3de3 100644
--- a/projects/plugins/boost/app/modules/critical-css/class-critical-css-storage.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Critical_CSS_Storage.php
@@ -7,7 +7,7 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
 
 use Automattic\Jetpack_Boost\Lib\Storage_Post_Type;
 
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Display_Critical_CSS.php b/projects/plugins/boost/app/features/optimizations/critical-css/Display_Critical_CSS.php
new file mode 100644
index 0000000000000..35cf33817306c
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Display_Critical_CSS.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Class that's responsible for rendering
+ * Critical CSS on the site front-end.
+ */
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
+
+class Display_Critical_CSS {
+
+	/**
+	 * @var string The Critical CSS to display.
+	 */
+	protected $css;
+
+	/**
+	 * @param $css
+	 */
+	public function __construct( $css ) {
+		$this->css = $css;
+	}
+
+	/**
+	 * Converts existing screen CSS to be asynchronously loaded.
+	 *
+	 * @param string $html   The link tag for the enqueued style.
+	 * @param string $handle The style's registered handle.
+	 * @param string $href   The stylesheet's source URL.
+	 * @param string $media  The stylesheet's media attribute.
+	 *
+	 * @return string
+	 * @see style_loader_tag
+	 */
+	public function asynchronize_stylesheets(
+		$html,
+		$handle,
+		$href,
+		$media
+	) {
+		// If there is no critical CSS, do not alter the stylesheet loading.
+		if ( false === $this->css ) {
+			return $html;
+		}
+
+		$available_methods = array(
+			'async'    => 'media="not all" data-media="' . $media . '" onload="this.media=this.dataset.media; delete this.dataset.media; this.removeAttribute( \'onload\' );"',
+			'deferred' => 'media="not all" data-media="' . $media . '"',
+		);
+
+		/**
+		 * Loading method for stylesheets.
+		 *
+		 * Filter the loading method for each stylesheet for the screen with following values:
+		 *     async    - Stylesheets are loaded asynchronously.
+		 *                Styles are applied once the stylesheet is loaded completely without render blocking.
+		 *     deferred - Loading of stylesheets are deferred until the window load event.
+		 *                Styles from all the stylesheets are applied at once after the page load.
+		 *
+		 * Stylesheet loading behaviour is not altered for any other value such as false or 'default'.
+		 * Stylesheet loading is instant and the process blocks the page rendering.
+		 *     Eg: add_filter( 'jetpack_boost_async_style', '__return_false' );
+		 *
+		 * @param string $handle The style's registered handle.
+		 * @param string $media  The stylesheet's media attribute.
+		 *
+		 * @see   onload_flip_stylesheets for how stylesheets loading is deferred.
+		 *
+		 * @todo  Retrieve settings from database, either via auto-configuration or UI option.
+		 */
+		$method = apply_filters( 'jetpack_boost_async_style', 'async', $handle, $media );
+
+		// If the loading method is not allowed, do not alter the stylesheet loading.
+		if ( ! isset( $available_methods[ $method ] ) ) {
+			return $html;
+		}
+
+		$html_no_script = '<noscript>' . $html . '</noscript>';
+
+		// Update the stylesheet markup for allowed methods.
+		$html = preg_replace( '~media=(\'[^\']+\')|("[^"]+")~', $available_methods[ $method ], $html );
+
+		// Append to the HTML stylesheet tag the same untouched HTML stylesheet tag within the noscript tag
+		// to support the rendering of the stylesheet when JavaScript is disabled.
+		return $html_no_script . $html;
+	}
+
+	/**
+	 * Prints the critical CSS to the page.
+	 */
+	public function display_critical_css() {
+		$critical_css = $this->css;
+
+		if ( false === $critical_css ) {
+			return false;
+		}
+
+		echo '<style id="jetpack-boost-critical-css">';
+
+		// Ensure no </style> tag (or any HTML tags) in output.
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo wp_strip_all_tags( $critical_css );
+
+		echo '</style>';
+	}
+
+	/**
+	 * Add a small piece of JavaScript to the footer, which on load flips all
+	 * linked stylesheets from media="not all" to "all", and switches the
+	 * Critical CSS <style> block to media="not all" to deactivate it.
+	 */
+	public function onload_flip_stylesheets() {
+		/*
+			Unminified version of footer script.
+
+		?>
+			<script>
+				window.addEventListener( 'load', function() {
+
+					// Flip all media="not all" links to media="all".
+					document.querySelectorAll( 'link' ).forEach(
+						function( link ) {
+							if ( link.media === 'not all' && link.dataset.media ) {
+								link.media = link.dataset.media;
+								delete link.dataset.media;
+							}
+						}
+					);
+
+					// Turn off Critical CSS style block with media="not all".
+					var element = document.getElementById( 'jetpack-boost-critical-css' );
+					if ( element ) {
+						element.media = 'not all';
+					}
+
+				} );
+			</script>
+		<?php
+		*/
+
+		// Minified version of footer script. See above comment for unminified version.
+		?>
+		<script>window.addEventListener( 'load', function() {
+				document.querySelectorAll( 'link' ).forEach( function( e ) {'not all' === e.media && e.dataset.media && ( e.media = e.dataset.media, delete e.dataset.media );} );
+				var e = document.getElementById( 'jetpack-boost-critical-css' );
+				e && ( e.media = 'not all' );
+			} );</script>
+		<?php
+	}
+}
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/Recommendations.php b/projects/plugins/boost/app/features/optimizations/critical-css/Recommendations.php
new file mode 100644
index 0000000000000..0800aece00d66
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Recommendations.php
@@ -0,0 +1,32 @@
+<?php
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
+
+use Automattic\Jetpack_Boost\Lib\Collection;
+
+class Recommendations {
+
+	protected $dismissed_recommendations;
+
+	public function __construct() {
+		$this->dismissed_recommendations = new Collection( 'jetpack_boost_dismissed_recommendations' );
+	}
+
+	public function attach_hooks() {
+		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_boost_js_constants' ) );
+	}
+
+	public function add_boost_js_constants( $constants ) {
+		$constants['criticalCssDismissedRecommendations'] = $this->dismissed_recommendations->get();
+
+		return $constants;
+	}
+
+	public function dismiss( $recommendation_for_provider ) {
+		$this->dismissed_recommendations->append( $recommendation_for_provider );
+	}
+
+	public function reset() {
+		$this->dismissed_recommendations->delete();
+	}
+
+}
diff --git a/projects/plugins/boost/app/modules/critical-css/class-regenerate-admin-notice.php b/projects/plugins/boost/app/features/optimizations/critical-css/Regenerate_Admin_Notice.php
similarity index 95%
rename from projects/plugins/boost/app/modules/critical-css/class-regenerate-admin-notice.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/Regenerate_Admin_Notice.php
index 09739928f7e63..84b5497845a9d 100644
--- a/projects/plugins/boost/app/modules/critical-css/class-regenerate-admin-notice.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/Regenerate_Admin_Notice.php
@@ -6,13 +6,10 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS;
 
 use Automattic\Jetpack_Boost\Admin\Admin_Notice;
 
-/**
- * Class Regenerate_Admin_Notice
- */
 class Regenerate_Admin_Notice extends Admin_Notice {
 
 	const SLUG = 'critical-css-regenerate';
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/generate/Generator.php b/projects/plugins/boost/app/features/optimizations/critical-css/generate/Generator.php
new file mode 100644
index 0000000000000..5acd7c63037cd
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/generate/Generator.php
@@ -0,0 +1,246 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_State;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Source_Providers;
+use Automattic\Jetpack_Boost\Lib\Nonce;
+
+class Generator {
+
+	const GENERATE_QUERY_ACTION = 'jb-generate-critical-css';
+	const GENERATE_PROXY_NONCE  = 'jb-generate-proxy-nonce';
+	const CSS_CALLBACK_ACTION   = 'jb-critical-css-callback';
+
+	/**
+	 * Provider keys which are present in "core" WordPress. If any of these fail to generate,
+	 * the whole process should be considered broken.
+	 */
+	const CORE_PROVIDER_KEYS = array(
+		'core_front_page',
+		'core_posts_page',
+		'singular_page',
+		'singular_post',
+		'singular_product',
+	);
+
+	public $state;
+
+	public function __construct() {
+		$this->state = new Critical_CSS_State();
+		$this->paths = new Source_Providers();
+		if ( $this->state->is_empty() && ! wp_doing_ajax() && ! wp_doing_cron() ) {
+			$this->state->create_request( $this->paths->get_providers() );
+		}
+
+		if ( is_admin() ) {
+			add_action( 'wp_ajax_boost_proxy_css', array( $this, 'handle_css_proxy' ) );
+		}
+
+	}
+
+	/**
+	 * Get Critical CSS status.
+	 */
+	public function get_critical_css_status() {
+		if ( $this->state->is_empty() ) {
+			return array( 'status' => Critical_CSS_State::NOT_GENERATED );
+		}
+
+		if ( $this->state->is_pending() ) {
+			return array(
+				'status'                 => Critical_CSS_State::REQUESTING,
+				'percent_complete'       => $this->state->get_percent_complete(),
+				'success_count'          => $this->state->get_providers_success_count(),
+				'pending_provider_keys'  => $this->state->get_provider_urls(),
+				'provider_success_ratio' => $this->state->get_provider_success_ratios(),
+			);
+		}
+
+		if ( $this->state->is_fatal_error() ) {
+			return array(
+				'status'       => Critical_CSS_State::FAIL,
+				'status_error' => $this->state->get_state_error(),
+			);
+		}
+
+		$providers_errors    = $this->state->get_providers_errors();
+		$provider_key_labels = array_combine(
+			array_keys( $providers_errors ),
+			array_map( array( $this, 'describe_provider_key' ), array_keys( $providers_errors ) )
+		);
+
+		return array(
+			'status'                => Critical_CSS_State::SUCCESS,
+			'success_count'         => $this->state->get_providers_success_count(),
+			'core_providers'        => self::CORE_PROVIDER_KEYS,
+			'core_providers_status' => $this->state->get_core_providers_status( self::CORE_PROVIDER_KEYS ),
+			'providers_errors'      => $providers_errors,
+			'provider_key_labels'   => $provider_key_labels,
+			'created'               => $this->state->get_created_time(),
+		);
+	}
+
+	/**
+	 * Given a provider key, find the provider which owns the key. Returns false
+	 * if no Provider is found.
+	 *
+	 * @param string $provider_key Provider key.
+	 *
+	 * @return Provider|false|string
+	 */
+	public function find_provider_for( $provider_key ) {
+		foreach ( $this->paths->get_providers() as $provider ) {
+			if ( $provider::owns_key( $provider_key ) ) {
+				return $provider;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns a descriptive label for a provider key, or the raw provider key
+	 * if none found.
+	 *
+	 * @param string $provider_key Provider key.
+	 *
+	 * @return mixed
+	 */
+	public function describe_provider_key( $provider_key ) {
+		$provider = $this->find_provider_for( $provider_key );
+		if ( ! $provider ) {
+			return $provider_key;
+		}
+
+		/**
+		 * Provider key.
+		 *
+		 * @param string $provider_key
+		 */
+		return $provider::describe_key( $provider_key );
+	}
+
+	/**
+	 * Returns true if this pageload is generating Critical CSS, based on GET
+	 * parameters and headers.
+	 *
+	 * phpcs:disable WordPress.Security.NonceVerification.Recommended
+	 */
+	public static function is_generating_critical_css() {
+		static $is_generating = null;
+		if ( null !== $is_generating ) {
+			return $is_generating;
+		}
+
+		// Accept nonce via HTTP headers or GET parameters.
+		$generate_nonce = null;
+		if ( ! empty( $_GET[ self::GENERATE_QUERY_ACTION ] ) ) {
+			$generate_nonce = sanitize_key(
+				$_GET[ self::GENERATE_QUERY_ACTION ]
+			);
+		} elseif ( ! empty( $_SERVER['HTTP_X_GENERATE_CRITICAL_CSS'] ) ) {
+			$generate_nonce = sanitize_key(
+				$_SERVER['HTTP_X_GENERATE_CRITICAL_CSS']
+			);
+		}
+
+		// If GET parameter or header set, we are trying to generate.
+		$is_generating = ! empty( $generate_nonce );
+
+		// Die if the nonce is invalid.
+		if ( $is_generating && ! Nonce::verify( $generate_nonce, self::GENERATE_QUERY_ACTION ) ) {
+			die();
+		}
+
+		return $is_generating;
+	}
+	// phpcs:enable WordPress.Security.NonceVerification.Recommended
+
+	/**
+	 * AJAX handler to handle proxying of external CSS resources.
+	 */
+	public function handle_css_proxy() {
+		// Verify valid nonce.
+		if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), self::GENERATE_PROXY_NONCE ) ) {
+			wp_die( '', 400 );
+		}
+
+		// Make sure currently logged in as admin.
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_die( '', 400 );
+		}
+
+		// Reject any request made when not generating.
+		if ( ! $this->state->is_pending() ) {
+			wp_die( '', 400 );
+		}
+
+		// Validate URL and fetch.
+		$proxy_url = filter_var( wp_unslash( $_POST['proxy_url'] ), FILTER_VALIDATE_URL );
+		if ( ! wp_http_validate_url( $proxy_url ) ) {
+			die( 'Invalid URL' );
+		}
+
+		$response = wp_remote_get( $proxy_url );
+		if ( is_wp_error( $response ) ) {
+			// TODO: Nicer error handling.
+			die( 'error' );
+		}
+
+		header( 'Content-type: text/css' );
+
+		// Outputting proxied CSS contents unescaped.
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo wp_strip_all_tags( $response['body'] );
+
+		die();
+	}
+
+	public function make_generation_request() {
+		$this->state->create_request( $this->paths->get_providers() );
+	}
+
+	/**
+	 * Get a Critical CSS status block, adding in local generation nonces (if applicable).
+	 * i.e.: Call this method to supply enough Critical CSS status to kick off local generation,
+	 * such as in response to a request-generate API call or during page initialization.
+	 */
+	public function get_local_critical_css_generation_info() {
+		$status = $this->get_critical_css_status();
+
+		// Add viewport sizes.
+		$status['viewports'] = array(
+			0 => array(
+				'type'   => 'phone',
+				'width'  => 414,
+				'height' => 896,
+			),
+			1 => array(
+				'type'   => 'tablet',
+				'width'  => 1200,
+				'height' => 800,
+			),
+			2 => array(
+				'type'   => 'desktop',
+				'width'  => 1920,
+				'height' => 1080,
+			),
+		);
+
+		// Add a userless nonce to use when requesting pages for Critical CSS generation (i.e.: To turn off admin features).
+		$status['generation_nonce'] = Nonce::create( self::GENERATE_QUERY_ACTION );
+
+		// Add a user-bound nonce to use when proxying CSS for Critical CSS generation.
+		$status['proxy_nonce'] = wp_create_nonce( self::GENERATE_PROXY_NONCE );
+
+		// Add a passthrough block to include in all response callbacks.
+		$status['callback_passthrough'] = array(
+			'_nonce' => Nonce::create( self::CSS_CALLBACK_ACTION ),
+		);
+
+		return $status;
+	}
+
+}
diff --git a/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/Source_Providers.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/Source_Providers.php
new file mode 100644
index 0000000000000..7f34d7ecaf39e
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/Source_Providers.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_Storage;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Archive_Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Post_ID_Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Singular_Post_Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\Taxonomy_Provider;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers\WP_Core_Provider;
+
+class Source_Providers {
+
+	/**
+	 * Variable used to cache the CSS string during the page request.
+	 * This is here because `get_critical_css` is called multiple
+	 * times in `style_loader_tag` hook (on each CSS file).
+	 *
+	 * @var null|false|string
+	 */
+	protected $request_cached_css;
+
+	/**
+	 * Stores the Critical CSS key used for rendering the current page if any.
+	 *
+	 * @var null|string
+	 */
+	protected $current_critical_css_key;
+
+	/**
+	 * List of all the Critical CSS Types.
+	 *
+	 * The order is important because searching for critical CSS will stop as soon as a value is found.
+	 * So finding Critical CSS by post ID is attempted before searching for a common Singular Post critical CSS.
+	 *
+	 * @var Provider[]
+	 */
+	protected $providers = array(
+		Post_ID_Provider::class,
+		WP_Core_Provider::class,
+		Singular_Post_Provider::class,
+		Archive_Provider::class,
+		Taxonomy_Provider::class,
+	);
+
+	public function get_providers() {
+		return $this->providers;
+	}
+
+	/**
+	 * Get all critical CSS storage keys that are available for the current request.
+	 * Caches the result.
+	 *
+	 * @return array
+	 */
+	public function get_current_request_css_keys() {
+		static $keys = null;
+		if ( null !== $keys ) {
+			return $keys;
+		}
+
+		$keys = array();
+
+		foreach ( $this->providers as $provider ) {
+			$provider_keys = $provider::get_current_storage_keys();
+			if ( empty( $provider_keys ) ) {
+				continue;
+			}
+			$keys = array_merge( $keys, $provider_keys );
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * Get critical CSS for the current request.
+	 *
+	 * @return string|false
+	 */
+	public function get_current_request_css() {
+		if ( null !== $this->request_cached_css ) {
+			return $this->request_cached_css;
+		}
+
+		$storage = new Critical_CSS_Storage();
+		$data    = $storage->get_css( $this->get_current_request_css_keys() );
+		if ( false === $data ) {
+			return false;
+		}
+
+		$this->request_cached_css       = $data['css'];
+		$this->current_critical_css_key = $data['key'];
+
+		return $this->request_cached_css;
+	}
+
+}
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-archive-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Archive_Provider.php
similarity index 95%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-archive-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Archive_Provider.php
index 1c4b44025af5f..cc0dad60c1490 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-archive-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Archive_Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class Archive_Provider
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-post-id-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Post_ID_Provider.php
similarity index 96%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-post-id-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Post_ID_Provider.php
index 20437953058b2..0323de6e32866 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-post-id-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Post_ID_Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class Post_ID_Provider
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Provider.php
similarity index 94%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Provider.php
index b1899d92b7abc..495c411d4f78d 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class Provider
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-singular-post-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Singular_Post_Provider.php
similarity index 97%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-singular-post-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Singular_Post_Provider.php
index e511643ee5c56..3b96fe4f79056 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-singular-post-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Singular_Post_Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class Singular_Post_Provider
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-taxonomy-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Taxonomy_Provider.php
similarity index 97%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-taxonomy-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Taxonomy_Provider.php
index be965dde3f2f1..2800f6000efe8 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-taxonomy-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/Taxonomy_Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class Taxonomy_Provider
diff --git a/projects/plugins/boost/app/modules/critical-css/providers/class-wp-core-provider.php b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/WP_Core_Provider.php
similarity index 95%
rename from projects/plugins/boost/app/modules/critical-css/providers/class-wp-core-provider.php
rename to projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/WP_Core_Provider.php
index 134876d8e2872..8de6684fa5eef 100644
--- a/projects/plugins/boost/app/modules/critical-css/providers/class-wp-core-provider.php
+++ b/projects/plugins/boost/app/features/optimizations/critical-css/source-providers/providers/WP_Core_Provider.php
@@ -5,7 +5,7 @@
  * @package automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Source_Providers\Providers;
 
 /**
  * Class WP_Core_Provider.
diff --git a/projects/plugins/boost/app/modules/index.php b/projects/plugins/boost/app/features/optimizations/index.php
similarity index 100%
rename from projects/plugins/boost/app/modules/index.php
rename to projects/plugins/boost/app/features/optimizations/index.php
diff --git a/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php b/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php
new file mode 100644
index 0000000000000..3b352fbe27099
--- /dev/null
+++ b/projects/plugins/boost/app/features/optimizations/lazy-images/class-lazy-images.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Lazy_Images;
+
+use Automattic\Jetpack\Jetpack_Lazy_Images;
+use Automattic\Jetpack_Boost\Contracts\Feature;
+
+class Lazy_Images implements Feature {
+
+	public function setup() {
+		add_action( 'wp', array( Jetpack_Lazy_Images::class, 'instance' ) );
+	}
+
+	public function get_slug() {
+		return 'lazy-images';
+	}
+
+	public function setup_trigger() {
+		return 'init';
+	}
+}
diff --git a/projects/plugins/boost/app/modules/render-blocking-js/class-render-blocking-js.php b/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
similarity index 96%
rename from projects/plugins/boost/app/modules/render-blocking-js/class-render-blocking-js.php
rename to projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
index 1f610d8247d08..083122c553320 100644
--- a/projects/plugins/boost/app/modules/render-blocking-js/class-render-blocking-js.php
+++ b/projects/plugins/boost/app/features/optimizations/render-blocking-js/class-render-blocking-js.php
@@ -7,18 +7,15 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Render_Blocking_JS;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Render_Blocking_JS;
 
+use Automattic\Jetpack_Boost\Contracts\Feature;
 use Automattic\Jetpack_Boost\Lib\Output_Filter;
-use Automattic\Jetpack_Boost\Modules\Module;
 
 /**
  * Class Render_Blocking_JS
  */
-class Render_Blocking_JS extends Module {
-
-	const MODULE_SLUG = 'render-blocking-js';
-
+class Render_Blocking_JS implements Feature {
 	/**
 	 * Holds the script tags removed from the output buffer.
 	 *
@@ -56,10 +53,7 @@ class Render_Blocking_JS extends Module {
 	 */
 	private $is_opened_script = false;
 
-	/**
-	 * Code to run when module is started
-	 */
-	protected function on_initialize() {
+	public function setup() {
 		$this->output_filter = new Output_Filter();
 
 		// Set up the ignore attribute value.
@@ -301,4 +295,13 @@ public function is_opened_script( $buffer ) {
 		 */
 		return $opening_tags_count > $closing_tags_count;
 	}
+
+	public function get_slug() {
+		return 'render-blocking-js';
+	}
+
+	public function setup_trigger() {
+		return 'init';
+	}
+
 }
diff --git a/projects/plugins/boost/app/lib/class-speed-score.php b/projects/plugins/boost/app/features/speed-score/Speed_Score.php
similarity index 93%
rename from projects/plugins/boost/app/lib/class-speed-score.php
rename to projects/plugins/boost/app/features/speed-score/Speed_Score.php
index afde8f94e811f..6da79ec3528f3 100644
--- a/projects/plugins/boost/app/lib/class-speed-score.php
+++ b/projects/plugins/boost/app/features/speed-score/Speed_Score.php
@@ -7,29 +7,18 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Lib;
+namespace Automattic\Jetpack_Boost\Features\Speed_Score;
 
-use Automattic\Jetpack_Boost\Jetpack_Boost;
+use Automattic\Jetpack_Boost\Features\Optimizations\Optimizations;
+use Automattic\Jetpack_Boost\Lib\Utils;
 
 /**
  * Class Speed_Score
  */
 class Speed_Score {
 
-	/**
-	 * Main plugin instance.
-	 *
-	 * @var Jetpack_Boost Plugin.
-	 */
-	private $jetpack_boost;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Jetpack_Boost $jetpack_boost Main plugin instance.
-	 */
-	public function __construct( Jetpack_Boost $jetpack_boost ) {
-		$this->jetpack_boost = $jetpack_boost;
+	public function __construct( Optimizations $modules ) {
+		$this->modules = $modules;
 
 		add_action( 'rest_api_init', array( $this, 'register_rest_routes' ) );
 		add_action( 'jetpack_boost_clear_cache', array( $this, 'clear_speed_score_request_cache' ) );
@@ -100,7 +89,7 @@ public function dispatch_speed_score_request( $request ) {
 		$score_request = $this->get_score_request_by_url( $url );
 		if ( empty( $score_request ) || ! $score_request->is_pending() ) {
 			// Create and store the Speed Score request.
-			$active_modules = array_keys( $this->jetpack_boost->get_active_modules() );
+			$active_modules = array_keys( array_filter( $this->modules->get_status(), 'strlen' ) );
 			$score_request  = new Speed_Score_Request( $url, $active_modules );
 			$score_request->store( 1800 ); // Keep the request for 30 minutes even if no one access the results.
 
@@ -196,7 +185,7 @@ private function maybe_dispatch_no_boost_score_request( $url ) {
 		if (
 			// If there isn't already a pending request.
 			( empty( $score_request ) || ! $score_request->is_pending() )
-			&& ! empty( $this->jetpack_boost->get_active_modules() )
+			&& $this->modules->have_enabled_modules()
 			&& (
 				null === $latest_history
 				|| $latest_history['timestamp'] < strtotime( '- 24 hours' ) // Refetch if it is older than a day.
@@ -261,7 +250,7 @@ public function clear_speed_score_request_cache() {
 	/**
 	 * Prepare the speed score response.
 	 *
-	 * @param string              $url URL of the speed is requested for.
+	 * @param string              $url                    URL of the speed is requested for.
 	 * @param Speed_Score_Request $score_request          Speed score request.
 	 * @param Speed_Score_Request $score_request_no_boost Speed score request without boost enabled.
 	 *
@@ -284,7 +273,7 @@ private function prepare_speed_score_response( $url, $score_request, $score_requ
 
 			// Only include noBoost scores if at least one modules is enabled.
 			$latest_history = $history->latest();
-			if ( ! empty( $this->jetpack_boost->get_active_modules() ) ) {
+			if ( ! empty( $this->modules->available_modules() ) ) {
 				$response['scores']['noBoost'] = $history_no_boost->latest_scores();
 			}
 
diff --git a/projects/plugins/boost/app/lib/class-speed-score-history.php b/projects/plugins/boost/app/features/speed-score/Speed_Score_History.php
similarity index 81%
rename from projects/plugins/boost/app/lib/class-speed-score-history.php
rename to projects/plugins/boost/app/features/speed-score/Speed_Score_History.php
index 3e48d1cfabcbd..1191613b6c99c 100644
--- a/projects/plugins/boost/app/lib/class-speed-score-history.php
+++ b/projects/plugins/boost/app/features/speed-score/Speed_Score_History.php
@@ -6,7 +6,7 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Lib;
+namespace Automattic\Jetpack_Boost\Features\Speed_Score;
 
 /**
  * Class Speed_Score_History
@@ -107,32 +107,4 @@ public function push( $entry ) {
 		$this->entries   = array_slice( $this->entries, - static::LIMIT );
 		update_option( $this->get_option_name(), $this->entries );
 	}
-
-	/**
-	 * Remove all speed score history.
-	 */
-	public static function clear_all() {
-		global $wpdb;
-
-		/**
-		 * The prefix used in option_name.
-		 */
-		$option_prefix = static::OPTION_PREFIX;
-
-		/**
-		 * LIKE search pattern for the delete query.
-		 */
-		$prefix_search_pattern = $wpdb->esc_like( $option_prefix ) . '%';
-
-		$wpdb->query(
-			$wpdb->prepare(
-				"
-					DELETE
-					FROM    $wpdb->options
-					WHERE   `option_name` LIKE %s
-				",
-				$prefix_search_pattern
-			)
-		);
-	}
 }
diff --git a/projects/plugins/boost/app/lib/class-speed-score-request.php b/projects/plugins/boost/app/features/speed-score/Speed_Score_Request.php
similarity index 81%
rename from projects/plugins/boost/app/lib/class-speed-score-request.php
rename to projects/plugins/boost/app/features/speed-score/Speed_Score_Request.php
index 16d99d59bcc3e..139072e8192ce 100644
--- a/projects/plugins/boost/app/lib/class-speed-score-request.php
+++ b/projects/plugins/boost/app/features/speed-score/Speed_Score_Request.php
@@ -7,7 +7,11 @@
  * @package    automattic/jetpack-boost
  */
 
-namespace Automattic\Jetpack_Boost\Lib;
+namespace Automattic\Jetpack_Boost\Features\Speed_Score;
+
+use Automattic\Jetpack_Boost\Lib\Cacheable;
+use Automattic\Jetpack_Boost\Lib\Url;
+use Automattic\Jetpack_Boost\Lib\Utils;
 
 /**
  * Class Speed_Score_Request
@@ -46,6 +50,13 @@ class Speed_Score_Request extends Cacheable {
 	 */
 	private $status;
 
+	/**
+	 * Number of retries attempted.
+	 *
+	 * @var int $retry_count Number of times this Speed Score request has been retried.
+	 */
+	private $retry_count;
+
 	/**
 	 * The error returned
 	 *
@@ -70,6 +81,7 @@ public function __construct( $url, $active_modules = array(), $created = null, $
 		$this->created        = is_null( $created ) ? microtime( true ) : $created;
 		$this->status         = $status;
 		$this->error          = $error;
+		$this->retry_count    = 0;
 	}
 
 	/**
@@ -85,9 +97,8 @@ public static function generate_cache_id_from_url( $url ) {
 
 	/**
 	 * Convert this object to a plain array for JSON serialization.
-	 *
-	 * @return array The object as an array.
 	 */
+	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {
 		return array(
 			'id'             => $this->get_cache_id(),
@@ -96,6 +107,7 @@ public function jsonSerialize() {
 			'created'        => $this->created,
 			'status'         => $this->status,
 			'error'          => $this->error,
+			'retry_count'    => $this->retry_count,
 		);
 	}
 
@@ -119,6 +131,10 @@ public static function jsonUnserialize( $data ) {
 			$object->set_cache_id( $data['id'] );
 		}
 
+		if ( ! empty( $data['retry_count'] ) ) {
+			$object->retry_count = intval( $data['retry_count'] );
+		}
+
 		return $object;
 	}
 
@@ -196,6 +212,11 @@ public function poll_update() {
 		);
 
 		if ( is_wp_error( $response ) ) {
+			// Special case: If the request is not found, restart it.
+			if ( 'not_found' === $response->get_error_code() ) {
+				return $this->restart();
+			}
+
 			return $response;
 		}
 
@@ -203,11 +224,8 @@ public function poll_update() {
 			case 'pending':
 				// The initial job probalby failed, dispatch again if so.
 				if ( $this->created <= strtotime( '-15 mins' ) ) {
-					$this->execute();
-					$this->created = time();
-					$this->store();
+					return $this->restart();
 				}
-
 				break;
 
 			case 'error':
@@ -237,6 +255,34 @@ public function poll_update() {
 		return true;
 	}
 
+	/**
+	 * Restart this request; useful when WPCOM doesn't recognize the request or it times out.
+	 */
+	private function restart() {
+		// Enforce a maximum number of restarts.
+		if ( $this->retry_count > 2 ) {
+			$this->status = 'error';
+			$this->error  = 'Maximum number of retries exceeded';
+			$this->store();
+
+			return new \WP_Error(
+				'error',
+				$this->error
+			);
+		}
+
+		$result = $this->execute();
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+
+		$this->created = time();
+		$this->retry_count++;
+		$this->store();
+
+		return true;
+	}
+
 	/**
 	 * Save the speed score record to history.
 	 *
diff --git a/projects/plugins/boost/app/lib/Setup.php b/projects/plugins/boost/app/lib/Setup.php
new file mode 100644
index 0000000000000..7e2d3098ceb1b
--- /dev/null
+++ b/projects/plugins/boost/app/lib/Setup.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Lib;
+
+use Automattic\Jetpack_Boost\Contracts\Has_Setup;
+
+class Setup {
+
+	protected static $instances = array();
+
+	/**
+	 * This method takes a `Has_Setup` instance and registers the setup action.
+	 * In addition, it will keep track of all the instances passed to it,
+	 *
+	 * This is useful if a plugin needs the instance
+	 * to modify the behavior at a certain hook that
+	 * Jetpack Boost is using.
+	 *
+	 * The use case would be something like this:
+	 * ```
+	 *      $instance = my_get_instance_method( Setup::get_instances() );
+	 *      remove_action( 'wp_footer', array( $instance, 'foobar' ) );
+	 * ```
+	 *
+	 * @param Has_Setup $instance
+	 *
+	 * @return void
+	 */
+	public static function add( Has_Setup $instance ) {
+		$action = $instance->setup_trigger();
+
+		self::$instances[] = $instance;
+		add_action( $action, array( $instance, 'setup' ) );
+	}
+
+	public function get_instances() {
+		return self::$instances;
+	}
+}
diff --git a/projects/plugins/boost/app/lib/Status.php b/projects/plugins/boost/app/lib/Status.php
new file mode 100644
index 0000000000000..e3b18066a44c3
--- /dev/null
+++ b/projects/plugins/boost/app/lib/Status.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Lib;
+
+class Status {
+
+	protected $slug;
+
+	public function __construct( $slug ) {
+		$this->slug = 'jetpack_boost_status_' . $slug;
+	}
+
+	public function is_enabled() {
+		return '1' === get_option( $this->slug );
+	}
+
+	public function update( $new_status ) {
+
+		if ( update_option( $this->slug, (bool) $new_status ) ) {
+			// Only record analytics event if the config update succeeds.
+			$this->track_module_status( (bool) $new_status );
+			return true;
+		}
+		return false;
+	}
+
+	protected function track_module_status( $status ) {
+		Analytics::record_user_event(
+			'set_module_status',
+			array(
+				'module' => $this->slug,
+				'status' => $status,
+			)
+		);
+	}
+
+}
diff --git a/projects/plugins/boost/app/lib/class-cli.php b/projects/plugins/boost/app/lib/class-cli.php
index 5f62685d8e494..6453dd0211c2b 100644
--- a/projects/plugins/boost/app/lib/class-cli.php
+++ b/projects/plugins/boost/app/lib/class-cli.php
@@ -23,6 +23,8 @@ class CLI {
 	 */
 	private $jetpack_boost;
 
+	const MAKE_E2E_TESTS_WORK_MODULES = array( 'critical-css', 'lazy-images', 'render-blocking-js' );
+
 	/**
 	 * CLI constructor.
 	 *
@@ -32,16 +34,6 @@ public function __construct( $jetpack_boost ) {
 		$this->jetpack_boost = $jetpack_boost;
 	}
 
-	/**
-	 * Reset settings command.
-	 *
-	 * @subcommand reset-settings
-	 */
-	public function reset_settings() {
-		$this->jetpack_boost->config()->reset();
-		\WP_CLI::success( 'Reset settings successfully' );
-	}
-
 	/**
 	 * Manage Jetpack Boost Modules
 	 *
@@ -72,9 +64,9 @@ public function module( $args ) {
 
 		if ( isset( $args[1] ) ) {
 			$module_slug = $args[1];
-			if ( ! in_array( $module_slug, Jetpack_Boost::AVAILABLE_MODULES_DEFAULT, true ) ) {
+			if ( ! in_array( $module_slug, self::MAKE_E2E_TESTS_WORK_MODULES, true ) ) {
 				\WP_CLI::error(
-					/* translators: %s refers to the module slug like 'critical-css' */
+				/* translators: %s refers to the module slug like 'critical-css' */
 					sprintf( __( "The '%s' module slug is invalid", 'jetpack-boost' ), $module_slug )
 				);
 			}
@@ -85,10 +77,10 @@ public function module( $args ) {
 
 		switch ( $action ) {
 			case 'activate':
-				$this->set_module_status( $module_slug, 'active' );
+				$this->set_module_status( $module_slug, true );
 				break;
 			case 'deactivate':
-				$this->set_module_status( $module_slug, 'inactive' );
+				$this->set_module_status( $module_slug, false );
 				break;
 		}
 	}
@@ -100,10 +92,8 @@ public function module( $args ) {
 	 * @param string $status      Module status.
 	 */
 	private function set_module_status( $module_slug, $status ) {
-		$enable = 'active' === $status;
-
-		$this->jetpack_boost->set_module_status( $enable, $module_slug );
-		$status_label = $enable ? __( 'activated', 'jetpack-boost' ) : __( 'deactivated', 'jetpack-boost' );
+		( new Status( $module_slug ) )->update( $status );
+		$status_label = $status ? __( 'activated', 'jetpack-boost' ) : __( 'deactivated', 'jetpack-boost' );
 
 		/* translators: The %1$s refers to the module slug, %2$s refers to the module state (either activated or deactivated)*/
 		\WP_CLI::success(
@@ -142,7 +132,7 @@ public function connection( $args ) {
 				if ( true === $result ) {
 					\WP_CLI::success( __( 'Boost is connected to WP.com', 'jetpack-boost' ) );
 				} else {
-					\WP_CLI::Error( __( 'Boost could not be connected to WP.com', 'jetpack-boost' ) );
+					\WP_CLI::error( __( 'Boost could not be connected to WP.com', 'jetpack-boost' ) );
 				}
 				break;
 			case 'deactivate':
@@ -177,7 +167,6 @@ public function connection( $args ) {
 	public function reset() {
 		$this->jetpack_boost->deactivate();
 		$this->jetpack_boost->uninstall();
-		$this->jetpack_boost->config()->reset();
 		\WP_CLI::success( 'Reset successfully' );
 	}
 }
diff --git a/projects/plugins/boost/app/lib/class-collection.php b/projects/plugins/boost/app/lib/class-collection.php
new file mode 100644
index 0000000000000..7158851614f4c
--- /dev/null
+++ b/projects/plugins/boost/app/lib/class-collection.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\Lib;
+
+/**
+ * A collection of WordPress options that's stored as a single ar
+ */
+class Collection {
+
+	private $key;
+
+	/**
+	 * Collections imply that they may carry more data than regular options,
+	 * This might unnecessarily slow down sites.
+	 * Disable autoloading by default.
+	 *
+	 * @see autoload() to enable autoloading.
+	 */
+	private $autoload = false;
+
+	/**
+	 * @param string $key Collection key.
+	 */
+	public function __construct( $key ) {
+		$this->key = $key;
+	}
+
+	/*
+	 * Allow autoloading collections
+	 */
+	public function autoload() {
+		$this->autoload = true;
+		return $this;
+	}
+
+	/**
+	 * Get the whole collection
+	 *
+	 * @return array
+	 */
+	public function get() {
+		$result = get_option( $this->key, array() );
+		if ( is_array( $result ) ) {
+			return $result;
+		}
+		return array();
+	}
+
+	/**
+	 * Append a single item to the collection
+	 *
+	 * @param $item
+	 *
+	 * @return bool
+	 */
+	public function append( $item ) {
+		$items = $this->get();
+
+		if ( ! in_array( $item, $items, true ) ) {
+			$items[] = $item;
+			return update_option( $this->key, $items, $this->autoload );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Delete the whole collection
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		return delete_option( $this->key );
+	}
+}
diff --git a/projects/plugins/boost/app/lib/class-config.php b/projects/plugins/boost/app/lib/class-config.php
deleted file mode 100644
index 5740a1a3de78b..0000000000000
--- a/projects/plugins/boost/app/lib/class-config.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Configuration Manager for Jetpack Boost.
- *
- * @link       https://automattic.com
- * @since      1.0.0
- * @package    automattic/jetpack-boost
- */
-
-namespace Automattic\Jetpack_Boost\Lib;
-
-use Automattic\Jetpack_Boost\Jetpack_Boost;
-
-require_once __DIR__ . '/class-cacheable.php';
-
-/**
- * Class Config
- *
- * Value object for configuration.
- *
- * When caching, this serializes the whole Jetpack Boost configuration for the site and generates an ID.
- *
- * If an empty ID is supplied, it stores and saves in the options table.
- *
- * This ID can be used to respond to requests using a specific configuration, without affecting the whole
- * configuration of the site.
- *
- * @todo Impose a schema
- */
-class Config extends Cacheable {
-	/**
-	 * The nested configuration array.
-	 *
-	 * @var mixed $config The config.
-	 */
-	private $data;
-
-	/**
-	 * The option name to store this config in.
-	 *
-	 * @var string $option_name The option name.
-	 */
-	private $option_name;
-
-	/**
-	 * Create the config object.
-	 *
-	 * @param mixed $data        The config.
-	 * @param null  $option_name The option name.
-	 */
-	public function __construct( $data, $option_name = null ) {
-		$this->data        = $data;
-		$this->option_name = $option_name;
-	}
-
-	/**
-	 * Convert this object to a plain array for JSON serialization.
-	 *
-	 * @return array The object as an array.
-	 */
-	public function jsonSerialize() {
-		return array_merge( array( 'id' => $this->get_cache_id() ), $this->data );
-	}
-
-	/**
-	 * This is intended to be the reverse of JsonSerializable->jsonSerialize.
-	 *
-	 * @param mixed $data The data to turn into an object.
-	 *
-	 * @return Config
-	 */
-	public static function jsonUnserialize( $data ) {
-		$object = new Config( $data );
-		if ( ! empty( $data['id'] ) ) {
-			$object->set_cache_id( $data['id'] );
-		}
-
-		return $object;
-	}
-
-	/**
-	 * Generate a cache key for the given config ID.
-	 *
-	 * @return string
-	 */
-	protected static function cache_prefix() {
-		return 'jetpack_boost_config_';
-	}
-
-	/**
-	 * Check is config data is empty.
-	 *
-	 * @return bool
-	 */
-	public function is_empty() {
-		return empty( $this->data );
-	}
-
-	/**
-	 * Gets a value from the configuration. Allows for config traversal and supports default values.
-	 *
-	 * @param string $key     Key name, sub-items separated by '/'.
-	 * @param mixed  $default Default value to be returned when no config value is found.
-	 *
-	 * @return mixed Value from config.
-	 */
-	public function get_value( $key, $default = null ) {
-		$path = array_filter( explode( '/', $key ) );
-
-		$config = $this->data;
-
-		foreach ( $path as $config_key ) {
-			if ( ! isset( $config[ $config_key ] ) ) {
-				return $default;
-			}
-			$config = &$config[ $config_key ];
-		}
-
-		return $config;
-	}
-
-	/**
-	 * Sets a value in the configuration. Allows for config traversal with slashes.
-	 *
-	 * @param string $key         Key name, sub-items separated by '/'.
-	 * @param mixed  $value       The value to set.
-	 * @param bool   $auto_create Whether or not to auto create the value.
-	 *
-	 * @return bool The value that was set.
-	 * @throws \Error Throw an error if value is not in array.
-	 */
-	public function set_value( $key, $value, $auto_create = false ) {
-		$temp = &$this->data;
-		$path = array_filter( explode( '/', $key ) );
-
-		foreach ( $path as $key_part ) {
-			if ( ! is_array( $temp ) ) {
-				throw new \Error( "$key_part does not point to array in $key" );
-			}
-			if ( $auto_create && ! isset( $temp[ $key_part ] ) ) {
-				$temp[ $key_part ] = array();
-			}
-			$temp = &$temp[ $key_part ];
-		}
-
-		$temp = $value;
-
-		return $this->store_in_option();
-	}
-
-	/**
-	 * Store the object.
-	 *
-	 * @param int $expiry Expiry in seconds.
-	 *
-	 * @return mixed|void
-	 */
-	public function store( $expiry = self::DEFAULT_EXPIRY ) {
-		if ( Jetpack_Boost::CURRENT_CONFIG_ID === $this->config_id ) {
-			$this->store_in_option();
-		}
-
-		return parent::store( $expiry );
-	}
-
-	/**
-	 * Fetch an object with the given ID.
-	 *
-	 * @param string $id The object ID.
-	 *
-	 * @return \WP_Error|mixed
-	 */
-	public static function get( $id ) {
-		if ( Jetpack_Boost::CURRENT_CONFIG_ID === $id ) {
-			$option_name = apply_filters( 'jetpack_boost_options_store_key_name', 'jetpack_boost_config' );
-
-			return self::get_from_option( $option_name );
-		}
-
-		return parent::get( $id );
-	}
-
-	/**
-	 * Extra functions to store and retrieve in the options table.
-	 */
-
-	/**
-	 * Store this configuration in an option.
-	 *
-	 * @return bool
-	 * @throws \Error Error if the option name is not set.
-	 */
-	private function store_in_option() {
-		// @todo - serialize as JSON to match cache entries?
-		if ( ! $this->option_name ) {
-			throw new \Error( 'Cannot save config that was not loaded from an option' );
-		}
-
-		return update_option( $this->option_name, $this->data, false );
-	}
-
-	/**
-	 * Fetch this configuration from an option.
-	 *
-	 * @param string $option_name The option to store it in.
-	 *
-	 * @return Config
-	 */
-	private static function get_from_option( $option_name ) {
-		$option_value = \get_option( $option_name, array() );
-
-		// @todo - unserialize from JSON to match cache entries?
-		return new Config( $option_value, $option_name );
-	}
-
-	/**
-	 * Set data.
-	 *
-	 * @param mixed $data Data.
-	 *
-	 * @return bool
-	 */
-	public function set_data( $data ) {
-		$this->data = $data;
-
-		return $this->store_in_option();
-	}
-
-	/**
-	 * Reset all settings to defaults.
-	 */
-	public function reset() {
-		$this->set_data( Jetpack_Boost::get_default_config_array() );
-	}
-
-	/**
-	 * Get the data.
-	 *
-	 * @return mixed
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-}
diff --git a/projects/plugins/boost/app/lib/class-connection.php b/projects/plugins/boost/app/lib/class-connection.php
index b156b8a118223..7bb8b46a1bfd1 100644
--- a/projects/plugins/boost/app/lib/class-connection.php
+++ b/projects/plugins/boost/app/lib/class-connection.php
@@ -9,6 +9,7 @@
 
 namespace Automattic\Jetpack_Boost\Lib;
 
+use Automattic\Jetpack\Config as Jetpack_Config;
 use Automattic\Jetpack\Connection\Manager;
 use Automattic\Jetpack\Terms_Of_Service;
 
@@ -291,4 +292,18 @@ public function can_manage_connection() {
 	public static function rest_authorization_required_code() {
 		return is_user_logged_in() ? 403 : 401;
 	}
+
+	public function ensure_connection() {
+		if ( ! apply_filters( 'jetpack_boost_connection_bypass', false ) ) {
+			$jetpack_config = new Jetpack_Config();
+			$jetpack_config->ensure(
+				'connection',
+				array(
+					'slug'     => 'jetpack-boost',
+					'name'     => 'Jetpack Boost',
+					'url_info' => '', // Optional, URL of the plugin.
+				)
+			);
+		}
+	}
 }
diff --git a/projects/plugins/boost/app/modules/class-module.php b/projects/plugins/boost/app/modules/class-module.php
deleted file mode 100644
index c329d5f58ee30..0000000000000
--- a/projects/plugins/boost/app/modules/class-module.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * All Jetpack Boost modules are required to extend this class.
- *
- * @link       https://automattic.com
- * @since      1.0.0
- * @package    automattic/jetpack-boost
- */
-
-namespace Automattic\Jetpack_Boost\Modules;
-
-/**
- * Class Module
- */
-abstract class Module {
-
-	/**
-	 * Keep track of whether or not the current Module has been initialized
-	 *
-	 * @var bool
-	 */
-	protected $is_initialized = false;
-
-	/**
-	 * Action(s) to perform when module is activated.
-	 * Required for modules that extend this class.
-	 *
-	 * @return bool
-	 */
-	abstract protected function on_initialize();
-
-	/**
-	 * Modules extending this class will auto-register routes
-	 * using `register_rest_routes` method if it's available.
-	 */
-	public function __construct() {
-		if ( $this->has_rest_routes() ) {
-			add_action( 'rest_api_init', array( $this, 'register_rest_routes' ) );
-		}
-
-		add_action( 'jetpack_boost_deactivate', array( $this, 'on_deactivate' ) );
-		add_action( 'jetpack_boost_uninstall', array( $this, 'on_uninstall' ) );
-	}
-
-	/**
-	 * Initialize the module and track its state.
-	 */
-	final public function initialize() {
-		// Assume initialization has succeeded unless `false` is returned.
-		$this->is_initialized = ( false !== $this->on_initialize() );
-	}
-
-	/**
-	 * Check if this module has been activated.
-	 *
-	 * @return bool
-	 */
-	final public function is_initialized() {
-		return $this->is_initialized;
-	}
-
-	/**
-	 * Run actions on plugin deactivation.
-	 *
-	 * Override this method in a specific module class to run deactivation
-	 * tasks hooked to jetpack_boost_deactivate action.
-	 *
-	 * @see Module::__construct()
-	 * @see Jetpack_Boost::deactivate()
-	 */
-	public function on_deactivate() {}
-
-	/**
-	 * Run actions on plugin uninstall.
-	 *
-	 * Override this method in a specific module class to run uninstall
-	 * tasks hooked to jetpack_boost_uninstall action.
-	 *
-	 * @see Module::__construct()
-	 * @see Jetpack_Boost::uninstall()
-	 */
-	public function on_uninstall() {}
-
-	/**
-	 * Check if the module extending this class is registering routes.
-	 *
-	 * If `register_rest_routes` method exists, it will automatically
-	 * be called on `rest_api_init` action
-	 *
-	 * @return bool
-	 */
-	final public function has_rest_routes() {
-		return method_exists( $this, 'register_rest_routes' );
-	}
-
-	/**
-	 * Check if this module should be enabled in the REST API.
-	 *
-	 * @used-by register_rest_route() permission_callback hook
-	 * @return bool|\WP_Error
-	 */
-	final public function rest_is_module_available() {
-		if ( false === $this->is_initialized() ) {
-			return new \WP_Error( __( 'Sorry, this module is not active', 'jetpack-boost' ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Overrideable method for fetching an array of admin notices to display.
-	 * Each admin notice should be a child class of Admin_Notice.
-	 *
-	 * @return null|\Automattic\Jetpack_Boost\Admin\Admin_Notice[]
-	 */
-	public function get_admin_notices() {
-		return null;
-	}
-}
diff --git a/projects/plugins/boost/app/modules/critical-css/class-critical-css.php b/projects/plugins/boost/app/modules/critical-css/class-critical-css.php
deleted file mode 100644
index ec91848968d08..0000000000000
--- a/projects/plugins/boost/app/modules/critical-css/class-critical-css.php
+++ /dev/null
@@ -1,997 +0,0 @@
-<?php
-/**
- * Implements the Critical CSS functionality.
- *
- * @link       https://automattic.com
- * @since      1.0.0
- * @package    automattic/jetpack-boost
- */
-
-namespace Automattic\Jetpack_Boost\Modules\Critical_CSS;
-
-use Automattic\Jetpack_Boost\Lib\Nonce;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Archive_Provider;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Post_ID_Provider;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Provider;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Singular_Post_Provider;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\Taxonomy_Provider;
-use Automattic\Jetpack_Boost\Modules\Critical_CSS\Providers\WP_Core_Provider;
-use Automattic\Jetpack_Boost\Modules\Module;
-
-/**
- * Class Critical_CSS.
- */
-class Critical_CSS extends Module {
-
-	const MODULE_SLUG                           = 'critical-css';
-	const GENERATE_QUERY_ACTION                 = 'jb-generate-critical-css';
-	const GENERATE_PROXY_NONCE                  = 'jb-generate-proxy-nonce';
-	const CSS_CALLBACK_ACTION                   = 'jb-critical-css-callback';
-	const RESET_REASON_STORAGE_KEY              = 'jb-generate-critical-css-reset-reason';
-	const DISMISSED_RECOMMENDATIONS_STORAGE_KEY = 'jb-critical-css-dismissed-recommendations';
-	const DISMISS_CSS_RECOMMENDATIONS_NONCE     = 'dismiss_notice';
-
-	/**
-	 * Viewport sizes for this module.
-	 */
-	const VIEWPORT_SIZES = array(
-		0 => array(
-			'type'   => 'phone',
-			'width'  => 414,
-			'height' => 896,
-		),
-		1 => array(
-			'type'   => 'tablet',
-			'width'  => 1200,
-			'height' => 800,
-		),
-		2 => array(
-			'type'   => 'desktop',
-			'width'  => 1920,
-			'height' => 1080,
-		),
-	);
-
-	/**
-	 * Provider keys which are present in "core" WordPress. If any of these fail to generate,
-	 * the whole process should be considered broken.
-	 */
-	const CORE_PROVIDER_KEYS = array(
-		'core_front_page',
-		'core_posts_page',
-		'singular_page',
-		'singular_post',
-		'singular_product',
-	);
-
-	/**
-	 * List of all the Critical CSS Types.
-	 *
-	 * The order is important because searching for critical CSS will stop as soon as a value is found.
-	 * So finding Critical CSS by post ID is attempted before searching for a common Singular Post critical CSS.
-	 *
-	 * @var Provider[]
-	 */
-	protected $providers = array(
-		Post_ID_Provider::class,
-		WP_Core_Provider::class,
-		Singular_Post_Provider::class,
-		Archive_Provider::class,
-		Taxonomy_Provider::class,
-	);
-	/**
-	 * Stores the Critical CSS key used for rendering the current page if any.
-	 *
-	 * @var null|string
-	 */
-	protected $current_critical_css_key;
-
-	/**
-	 * Variable used to cache the CSS string during the page request.
-	 * This is here because `get_critical_css` is called multiple
-	 * times in `style_loader_tag` hook (on each CSS file).
-	 *
-	 * @var null|false|string
-	 */
-	protected $request_cached_css;
-
-	/**
-	 * Critical CSS storage class instance.
-	 *
-	 * @var Critical_CSS_Storage
-	 */
-	protected $storage;
-
-	/**
-	 * Critical CSS state class instance.
-	 *
-	 * @var Critical_CSS_State
-	 */
-	protected $state;
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		add_filter( 'jetpack_boost_js_constants', array( $this, 'always_add_critical_css_constants' ) );
-	}
-
-	/**
-	 * This is only run if Critical CSS module has been activated.
-	 *
-	 * @return bool
-	 */
-	protected function on_initialize() {
-		// Touch to set-up the post type. This is a temporary hack.
-		// This should instantiate a new Post_Type_Storage class,
-		// so that Critical_CSS class is responsible
-		// for setting up the storage.
-		$this->storage = new Critical_CSS_Storage();
-		$this->state   = new Critical_CSS_State();
-		if ( $this->state->is_empty() && ! wp_doing_ajax() && ! wp_doing_cron() ) {
-			$this->state->create_request( $this->providers );
-		}
-
-		// Update ready flag used to indicate Boost optimizations are warmed up in metatag.
-		add_filter( 'jetpack_boost_url_ready', array( $this, 'is_ready_filter' ), 10, 1 );
-
-		if ( $this->should_display_critical_css() ) {
-			Admin_Bar_Css_Compat::init();
-
-			add_action( 'wp_head', array( $this, 'display_critical_css' ), 0 );
-			add_filter( 'style_loader_tag', array( $this, 'asynchronize_stylesheets' ), 10, 4 );
-			add_action( 'wp_footer', array( $this, 'onload_flip_stylesheets' ) );
-		}
-
-		if ( $this->is_generating_critical_css() ) {
-			add_action( 'wp_head', array( $this, 'display_generate_meta' ), 0 );
-			$this->force_logged_out_render();
-		}
-
-		add_action( 'handle_theme_change', array( $this, 'clear_critical_css' ) );
-		add_action( 'jetpack_boost_clear_cache', array( $this, 'clear_critical_css' ) );
-		add_filter( 'jetpack_boost_js_constants', array( $this, 'add_critical_css_constants' ) );
-
-		if ( is_admin() ) {
-			add_action( 'wp_ajax_dismiss_recommendations', array( $this, 'dismiss_recommendations' ) );
-			add_action( 'wp_ajax_reset_dismissed_recommendations', array( $this, 'reset_dismissed_recommendations' ) );
-			add_action( 'wp_ajax_boost_proxy_css', array( $this, 'handle_css_proxy' ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Run on plugin uninstall
-	 */
-	public function on_uninstall() {
-		self::clear_reset_reason();
-		self::clear_dismissed_recommendations();
-	}
-
-	/**
-	 * Register the Critical CSS related REST routes.
-	 *
-	 * @return bool
-	 */
-	public function register_rest_routes() {
-		/**
-		 * Store and retrieve critical css status.
-		 */
-		register_rest_route(
-			JETPACK_BOOST_REST_NAMESPACE,
-			JETPACK_BOOST_REST_PREFIX . '/critical-css/status',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'api_get_critical_css_status' ),
-					'permission_callback' => array( $this, 'current_user_can_modify_critical_css' ),
-				),
-			)
-		);
-
-		// Register Critical CSS generate route.
-		register_rest_route(
-			JETPACK_BOOST_REST_NAMESPACE,
-			JETPACK_BOOST_REST_PREFIX . '/critical-css/request-generate',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'critical_css_request_generate_handler' ),
-				'permission_callback' => array( $this, 'current_user_can_modify_critical_css' ),
-			)
-		);
-
-		// Register Critical CSS success callback route.
-		register_rest_route(
-			JETPACK_BOOST_REST_NAMESPACE,
-			JETPACK_BOOST_REST_PREFIX . '/critical-css/(?P<cacheKey>.+)/success',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'generate_success_handler' ),
-				'permission_callback' => '__return_true',
-			)
-		);
-
-		// Register Critical CSS error callback route.
-		register_rest_route(
-			JETPACK_BOOST_REST_NAMESPACE,
-			JETPACK_BOOST_REST_PREFIX . '/critical-css/(?P<cacheKey>.+)/error',
-			array(
-				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'generate_error_handler' ),
-				'permission_callback' => '__return_true',
-			)
-		);
-
-		return true;
-	}
-
-	/**
-	 * Handler for PUT '/critical-css/(?P<cacheKey>.+)/success'.
-	 *
-	 * @param \WP_REST_Request $request The request object.
-	 *
-	 * @return \WP_REST_Response|\WP_Error The response.
-	 * @todo: Figure out what to do in the JavaScript when responding with the error status.
-	 */
-	public function generate_success_handler( $request ) {
-		$this->ensure_module_initialized();
-
-		$cache_key = $request['cacheKey'];
-
-		if ( ! $cache_key ) {
-			// Set status to error, because the data is invalid.
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'missing_cache_key',
-				)
-			);
-		}
-
-		$params = $request->get_params();
-
-		if ( empty( $params['passthrough'] ) || empty( $params['passthrough']['_nonce'] ) ) {
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'missing_nonce',
-				)
-			);
-		}
-
-		$cache_key_nonce = $params['passthrough']['_nonce'];
-
-		if ( ! Nonce::verify( $cache_key_nonce, self::CSS_CALLBACK_ACTION ) ) {
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'invalid_nonce',
-				)
-			);
-		}
-
-		if ( ! isset( $params['data'] ) ) {
-			// Set status to error, because the data is invalid.
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'invalid_data',
-				)
-			);
-		}
-
-		$this->storage->store_css( $cache_key, $params['data'] );
-		$this->state->set_source_success( $cache_key );
-		self::clear_reset_reason();
-		self::clear_dismissed_recommendations();
-
-		// Set status to success to indicate the critical CSS data has been stored on the server.
-		return rest_ensure_response(
-			array(
-				'status'        => 'success',
-				'code'          => 'processed',
-				'status_update' => $this->get_critical_css_status(),
-			)
-		);
-	}
-
-	/**
-	 * Handler for PUT '/critical-css/(?P<cacheKey>.+)/error'.
-	 *
-	 * @param \WP_REST_Request $request The request object.
-	 *
-	 * @return \WP_REST_Response|\WP_Error The response.
-	 * @todo: Figure out what to do in the JavaScript when responding with the error status.
-	 */
-	public function generate_error_handler( $request ) {
-		$this->ensure_module_initialized();
-
-		$cache_key = $request['cacheKey'];
-		$params    = $request->get_params();
-
-		if ( empty( $params['passthrough'] ) || empty( $params['passthrough']['_nonce'] ) ) {
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'missing_nonce',
-				)
-			);
-		}
-
-		$cache_key_nonce = $params['passthrough']['_nonce'];
-
-		if ( ! Nonce::verify( $cache_key_nonce, self::CSS_CALLBACK_ACTION ) ) {
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'invalid_nonce',
-				)
-			);
-		}
-
-		if ( ! isset( $params['data'] ) ) {
-			// Set status to error, because the data is missing.
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'missing_data',
-				)
-			);
-		}
-
-		$data = $params['data'];
-
-		if ( ! isset( $data['show_stopper'] ) ) {
-			// Set status to error, because the data is invalid.
-			return rest_ensure_response(
-				array(
-					'status' => 'error',
-					'code'   => 'invalid_data',
-				)
-			);
-		}
-
-		// TODO: Log errors to a remote service.
-
-		if ( true === $data['show_stopper'] ) {
-			// TODO: Review it seems a bit cumbersome the validation of the data structure here.
-			if ( ! isset( $data['error'] ) ) {
-				// Set status to error, because the data is invalid.
-				return rest_ensure_response(
-					array(
-						'status' => 'error',
-						'code'   => 'invalid_data',
-					)
-				);
-			}
-
-			$this->state->set_as_failed( $data['error'] );
-			$this->storage->clear();
-		} else {
-			// TODO: Review it seems a bit cumbersome the validation of the data structure here.
-			if ( ! isset( $data['urls'] ) ) {
-				// Set status to error, because the data is invalid.
-				return rest_ensure_response(
-					array(
-						'status' => 'error',
-						'code'   => 'invalid_data',
-					)
-				);
-			}
-
-			// otherwise, store the error at the provider level, allowing the UI to display them with all details.
-			$this->state->set_source_error( $cache_key, $data['urls'] );
-		}
-
-		// Set status to success to indicate the critical CSS error has been stored on the server.
-		return rest_ensure_response(
-			array(
-				'status'        => 'success',
-				'code'          => 'processed',
-				'status_update' => $this->get_critical_css_status(),
-			)
-		);
-	}
-
-	/**
-	 * Check that user can modify Critical CSS.
-	 *
-	 * @return bool
-	 */
-	public function current_user_can_modify_critical_css() {
-		return $this->rest_is_module_available() && current_user_can( 'manage_options' );
-	}
-
-	/**
-	 * Get all critical CSS storage keys that are available for the current request.
-	 * Caches the result.
-	 *
-	 * @return array
-	 */
-	public function get_current_request_css_keys() {
-		static $keys = null;
-		if ( null !== $keys ) {
-			return $keys;
-		}
-
-		$keys = array();
-
-		foreach ( $this->providers as $provider ) {
-			$provider_keys = $provider::get_current_storage_keys();
-			if ( empty( $provider_keys ) ) {
-				continue;
-			}
-			$keys = array_merge( $keys, $provider_keys );
-		}
-
-		return $keys;
-	}
-
-	/**
-	 * Renders a <meta> tag used to verify this is a valid page to generate Critical CSS with.
-	 */
-	public function display_generate_meta() {
-		?>
-		<meta name="jb-generate-critical-css" content="true" />
-		<?php
-	}
-
-	/**
-	 * Returns true if this pageload is generating Critical CSS, based on GET
-	 * parameters and headers.
-	 *
-	 * phpcs:disable WordPress.Security.NonceVerification.Recommended
-	 */
-	public function is_generating_critical_css() {
-		static $is_generating = null;
-		if ( null !== $is_generating ) {
-			return $is_generating;
-		}
-
-		// Accept nonce via HTTP headers or GET parameters.
-		$generate_nonce = null;
-		if ( ! empty( $_GET[ self::GENERATE_QUERY_ACTION ] ) ) {
-			$generate_nonce = sanitize_key(
-				$_GET[ self::GENERATE_QUERY_ACTION ]
-			);
-		} elseif ( ! empty( $_SERVER['HTTP_X_GENERATE_CRITICAL_CSS'] ) ) {
-			$generate_nonce = sanitize_key(
-				$_SERVER['HTTP_X_GENERATE_CRITICAL_CSS']
-			);
-		}
-
-		// If GET parameter or header set, we are trying to generate.
-		$is_generating = ! empty( $generate_nonce );
-
-		// Die if the nonce is invalid.
-		if ( $is_generating && ! Nonce::verify( $generate_nonce, self::GENERATE_QUERY_ACTION ) ) {
-			die();
-		}
-
-		return $is_generating;
-	}
-	// phpcs:enable WordPress.Security.NonceVerification.Recommended
-
-	/**
-	 * Add Critical CSS related constants to be passed to JavaScript whether or not the module is enabled.
-	 *
-	 * @param array $constants Constants to be passed to JavaScript.
-	 *
-	 * @return array
-	 */
-	public function always_add_critical_css_constants( $constants ) {
-		$constants['criticalCssDismissRecommendationsNonce'] = wp_create_nonce( self::DISMISS_CSS_RECOMMENDATIONS_NONCE );
-
-		return $constants;
-	}
-
-	/**
-	 * Add Critical CSS related constants to be passed to JavaScript only if the module is enabled.
-	 *
-	 * @param array $constants Constants to be passed to JavaScript.
-	 *
-	 * @return array
-	 */
-	public function add_critical_css_constants( $constants ) {
-		// Information about the current status of Critical CSS / generation.
-		$constants['criticalCssStatus']                   = $this->get_local_critical_css_generation_info();
-		$constants['criticalCssDismissedRecommendations'] = \get_option( self::DISMISSED_RECOMMENDATIONS_STORAGE_KEY, array() );
-
-		return $constants;
-	}
-
-	/**
-	 * Get a Critical CSS status block, adding in local generation nonces (if applicable).
-	 * i.e.: Call this method to supply enough Critical CSS status to kick off local generation,
-	 * such as in response to a request-generate API call or during page initialization.
-	 */
-	private function get_local_critical_css_generation_info() {
-		$status = $this->get_critical_css_status();
-
-		// Add viewport sizes.
-		$status['viewports'] = self::VIEWPORT_SIZES;
-
-		// Add a userless nonce to use when requesting pages for Critical CSS generation (i.e.: To turn off admin features).
-		$status['generation_nonce'] = Nonce::create( self::GENERATE_QUERY_ACTION );
-
-		// Add a user-bound nonce to use when proxying CSS for Critical CSS generation.
-		$status['proxy_nonce'] = wp_create_nonce( self::GENERATE_PROXY_NONCE );
-
-		// Add a passthrough block to include in all response callbacks.
-		$status['callback_passthrough'] = array(
-			'_nonce' => Nonce::create( self::CSS_CALLBACK_ACTION ),
-		);
-
-		return $status;
-	}
-
-	/**
-	 * Get Critical CSS status.
-	 */
-	public function get_critical_css_status() {
-		if ( $this->state->is_empty() ) {
-			return array( 'status' => Critical_CSS_State::NOT_GENERATED );
-		}
-
-		if ( $this->state->is_pending() ) {
-			return array(
-				'status'                 => Critical_CSS_State::REQUESTING,
-				'percent_complete'       => $this->state->get_percent_complete(),
-				'success_count'          => $this->state->get_providers_success_count(),
-				'pending_provider_keys'  => $this->state->get_provider_urls(),
-				'provider_success_ratio' => $this->state->get_provider_success_ratios(),
-			);
-		}
-
-		if ( $this->state->is_fatal_error() ) {
-			return array(
-				'status'       => Critical_CSS_State::FAIL,
-				'status_error' => $this->state->get_state_error(),
-			);
-		}
-
-		$providers_errors    = $this->state->get_providers_errors();
-		$provider_key_labels = array_combine(
-			array_keys( $providers_errors ),
-			array_map( array( $this, 'describe_provider_key' ), array_keys( $providers_errors ) )
-		);
-
-		return array(
-			'status'                => Critical_CSS_State::SUCCESS,
-			'success_count'         => $this->state->get_providers_success_count(),
-			'core_providers'        => self::CORE_PROVIDER_KEYS,
-			'core_providers_status' => $this->state->get_core_providers_status( self::CORE_PROVIDER_KEYS ),
-			'providers_errors'      => $providers_errors,
-			'provider_key_labels'   => $provider_key_labels,
-			'created'               => $this->state->get_created_time(),
-		);
-	}
-
-	/**
-	 * REST API endpoint to get local critical css status.
-	 *
-	 * @return \WP_Error|\WP_HTTP_Response|\WP_REST_Response
-	 */
-	public function api_get_critical_css_status() {
-		return rest_ensure_response( $this->get_critical_css_status() );
-	}
-
-	/**
-	 * Request generate Critical CSS.
-	 *
-	 * @param \WP_REST_Request $request The request object.
-	 *
-	 * @return \WP_Error|\WP_HTTP_Response|\WP_REST_Response
-	 */
-	public function critical_css_request_generate_handler( $request ) {
-		$reset = ! empty( $request['reset'] );
-
-		$this->ensure_module_initialized();
-
-		$cleared_critical_css_reason = \get_option( self::RESET_REASON_STORAGE_KEY );
-		if ( $reset || $cleared_critical_css_reason ) {
-			// Create a new Critical CSS Request block to track creation request.
-			$this->storage->clear();
-			$this->state->create_request( $this->providers );
-			self::clear_reset_reason();
-			self::clear_dismissed_recommendations();
-		}
-
-		return rest_ensure_response(
-			array(
-				'status'        => 'success',
-				'status_update' => $this->get_local_critical_css_generation_info(),
-			)
-		);
-	}
-
-	/**
-	 * Clear Critical CSS.
-	 */
-	public function clear_critical_css() {
-		// Mass invalidate all cached values.
-		$this->storage->clear();
-		$this->state->reset();
-	}
-
-	/**
-	 * Get critical CSS for the current request.
-	 *
-	 * @return string|false
-	 */
-	public function get_critical_css() {
-		if ( null !== $this->request_cached_css ) {
-			return $this->request_cached_css;
-		}
-
-		$data = $this->storage->get_css( $this->get_current_request_css_keys() );
-		if ( false === $data ) {
-			return false;
-		}
-
-		$this->request_cached_css       = $data['css'];
-		$this->current_critical_css_key = $data['key'];
-
-		return $this->request_cached_css;
-	}
-
-	/**
-	 * Converts existing screen CSS to be asynchronously loaded.
-	 *
-	 * @param string $html   The link tag for the enqueued style.
-	 * @param string $handle The style's registered handle.
-	 * @param string $href   The stylesheet's source URL.
-	 * @param string $media  The stylesheet's media attribute.
-	 *
-	 * @return string|string[]|null
-	 * @see style_loader_tag
-	 */
-	public function asynchronize_stylesheets( $html, $handle, $href, $media ) {
-		// If is AMP, do not alter the stylesheet loading.
-		if ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) {
-			return $html;
-		}
-
-		// If there is no critical CSS, do not alter the stylesheet loading.
-		if ( false === $this->get_critical_css() ) {
-			return $html;
-		}
-
-		$available_methods = array(
-			'async'    => 'media="not all" data-media="' . $media . '" onload="this.media=this.dataset.media; delete this.dataset.media; this.removeAttribute( \'onload\' );"',
-			'deferred' => 'media="not all" data-media="' . $media . '"',
-		);
-
-		/**
-		 * Loading method for stylesheets.
-		 *
-		 * Filter the loading method for each stylesheet for the screen with following values:
-		 *     async    - Stylesheets are loaded asynchronously.
-		 *                Styles are applied once the stylesheet is loaded completely without render blocking.
-		 *     deferred - Loading of stylesheets are deferred until the window load event.
-		 *                Styles from all the stylesheets are applied at once after the page load.
-		 *
-		 * Stylesheet loading behaviour is not altered for any other value such as false or 'default'.
-		 * Stylesheet loading is instant and the process blocks the page rendering.
-		 *     Eg: add_filter( 'jetpack_boost_async_style', '__return_false' );
-		 *
-		 * @see onload_flip_stylesheets for how stylesheets loading is deferred.
-		 *
-		 * @param string $handle The style's registered handle.
-		 * @param string $media  The stylesheet's media attribute.
-		 *
-		 * @todo  Retrieve settings from database, either via auto-configuration or UI option.
-		 */
-		$method = apply_filters( 'jetpack_boost_async_style', 'async', $handle, $media );
-
-		// If the loading method is not allowed, do not alter the stylesheet loading.
-		if ( ! isset( $available_methods[ $method ] ) ) {
-			return $html;
-		}
-
-		$html_no_script = '<noscript>' . $html . '</noscript>';
-
-		// Update the stylesheet markup for allowed methods.
-		$html = preg_replace( '~media=(\'[^\']+\')|("[^"]+")~', $available_methods[ $method ], $html );
-
-		// Append to the HTML stylesheet tag the same untouched HTML stylesheet tag within the noscript tag
-		// to support the rendering of the stylesheet when JavaScript is disabled.
-		return $html_no_script . $html;
-	}
-
-	/**
-	 * Returns true if the current page render should try to display Critical CSS.
-	 */
-	public function should_display_critical_css() {
-		// Don't display Critical CSS when generating Critical CSS.
-		if ( $this->is_generating_critical_css() ) {
-			return false;
-		}
-
-		// Don't show Critical CSS in customizer previews.
-		if ( is_customize_preview() ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Prints the critical CSS to the page.
-	 */
-	public function display_critical_css() {
-		if ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) {
-			return false;
-		}
-
-		$critical_css = $this->get_critical_css();
-
-		if ( false === $critical_css ) {
-			return false;
-		}
-
-		echo '<style id="jetpack-boost-critical-css">';
-
-		// Ensure no </style> tag (or any HTML tags) in output.
-		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo wp_strip_all_tags( $critical_css );
-
-		echo '</style>';
-	}
-
-	/**
-	 * Check if the current URL is warmed up. For this module, "warmed up" means that
-	 * either Critical CSS has been generated for this page, or this page is not
-	 * eligible to have Critical CSS generated for it.
-	 *
-	 * @param bool $ready Injected filter value.
-	 *
-	 * @return bool
-	 */
-	public function is_ready_filter( $ready ) {
-		if ( ! $ready ) {
-			return $ready;
-		}
-
-		// If this page has no provider keys, it is ineligible for Critical CSS.
-		$keys = $this->get_current_request_css_keys();
-		if ( count( $keys ) === 0 ) {
-			return true;
-		}
-
-		// Return "ready" if Critical CSS has been generated.
-		return ! empty( $this->get_critical_css() );
-	}
-
-	/**
-	 * Force the current page to render as viewed by a logged out user. Useful when generating
-	 * Critical CSS.
-	 */
-	private function force_logged_out_render() {
-		$current_user_id = get_current_user_id();
-
-		if ( 0 !== $current_user_id ) {
-			// Force current user to 0 to ensure page is rendered as a non-logged-in user.
-			wp_set_current_user( 0 );
-
-			// Turn off display of admin bar.
-			add_filter( 'show_admin_bar', '__return_false', PHP_INT_MAX );
-		}
-	}
-
-	/**
-	 * AJAX handler to handle proxying of external CSS resources.
-	 */
-	public function handle_css_proxy() {
-		// Verify valid nonce.
-		if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( $_POST['nonce'] ), self::GENERATE_PROXY_NONCE ) ) {
-			wp_die( '', 400 );
-		}
-
-		// Make sure currently logged in as admin.
-		if ( ! $this->current_user_can_modify_critical_css() ) {
-			wp_die( '', 400 );
-		}
-
-		// Reject any request made when not generating.
-		if ( ! $this->state->is_pending() ) {
-			wp_die( '', 400 );
-		}
-
-		// Validate URL and fetch.
-		$proxy_url = filter_var( wp_unslash( $_POST['proxy_url'] ), FILTER_VALIDATE_URL );
-		if ( ! wp_http_validate_url( $proxy_url ) ) {
-			die( 'Invalid URL' );
-		}
-
-		$response = wp_remote_get( $proxy_url );
-		if ( is_wp_error( $response ) ) {
-			// TODO: Nicer error handling.
-			die( 'error' );
-		}
-
-		header( 'Content-type: text/css' );
-
-		// Outputting proxied CSS contents unescaped.
-		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		echo wp_strip_all_tags( $response['body'] );
-
-		die();
-	}
-
-	/**
-	 * API helper for ensuring this module is enabled before allowing an API
-	 * endpoint to continue. Will die if this module is not initialized, with
-	 * a status message indicating so.
-	 */
-	public function ensure_module_initialized() {
-		if ( ! $this->is_initialized() ) {
-			wp_send_json( array( 'status' => 'module-unavailable' ) );
-		}
-	}
-
-	/**
-	 * Add a small piece of JavaScript to the footer, which on load flips all
-	 * linked stylesheets from media="not all" to "all", and switches the
-	 * Critical CSS <style> block to media="not all" to deactivate it.
-	 */
-	public function onload_flip_stylesheets() {
-		/*
-			Unminified version of footer script.
-
-		?>
-			<script>
-				window.addEventListener( 'load', function() {
-
-					// Flip all media="not all" links to media="all".
-					document.querySelectorAll( 'link' ).forEach(
-						function( link ) {
-							if ( link.media === 'not all' && link.dataset.media ) {
-								link.media = link.dataset.media;
-								delete link.dataset.media;
-							}
-						}
-					);
-
-					// Turn off Critical CSS style block with media="not all".
-					var element = document.getElementById( 'jetpack-boost-critical-css' );
-					if ( element ) {
-						element.media = 'not all';
-					}
-
-				} );
-			</script>
-		<?php
-		*/
-
-		// Minified version of footer script. See above comment for unminified version.
-		?>
-		<script>window.addEventListener('load', function() {
-				document.querySelectorAll('link').forEach(function(e) {'not all' === e.media && e.dataset.media && (e.media=e.dataset.media,delete e.dataset.media)});
-				var e = document.getElementById('jetpack-boost-critical-css');
-				e && (e.media = 'not all');
-			});</script>
-		<?php
-	}
-
-	/**
-	 * Override; returns an admin notice to show if there was a reset reason.
-	 *
-	 * @return null|\Automattic\Jetpack_Boost\Admin\Admin_Notice[]
-	 */
-	public function get_admin_notices() {
-		$reason = \get_option( self::RESET_REASON_STORAGE_KEY );
-
-		if ( ! $reason ) {
-			return null;
-		}
-
-		return array( new Regenerate_Admin_Notice( $reason ) );
-	}
-
-	/**
-	 * Clear Critical CSS reset reason option.
-	 */
-	public static function clear_reset_reason() {
-		\delete_option( self::RESET_REASON_STORAGE_KEY );
-	}
-
-	/**
-	 * Clear Critical CSS dismissed recommendations option.
-	 */
-	public static function clear_dismissed_recommendations() {
-		\delete_option( self::DISMISSED_RECOMMENDATIONS_STORAGE_KEY );
-	}
-
-	/**
-	 * Given a provider key, find the provider which owns the key. Returns false
-	 * if no Provider is found.
-	 *
-	 * @param string $provider_key Provider key.
-	 *
-	 * @return Provider|false|string
-	 */
-	public function find_provider_for( $provider_key ) {
-		foreach ( $this->providers as $provider ) {
-			if ( $provider::owns_key( $provider_key ) ) {
-				return $provider;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns a descriptive label for a provider key, or the raw provider key
-	 * if none found.
-	 *
-	 * @param string $provider_key Provider key.
-	 *
-	 * @return mixed
-	 */
-	public function describe_provider_key( $provider_key ) {
-		$provider = $this->find_provider_for( $provider_key );
-		if ( ! $provider ) {
-			return $provider_key;
-		}
-
-		/**
-		 * Provider key.
-		 *
-		 * @param string $provider_key
-		 */
-		return $provider::describe_key( $provider_key );
-	}
-
-	/**
-	 * Dismiss Critical CSS recommendations.
-	 */
-	public function dismiss_recommendations() {
-		if ( check_ajax_referer( self::DISMISS_CSS_RECOMMENDATIONS_NONCE, 'nonce' ) && current_user_can( 'manage_options' ) ) {
-			$response = array(
-				'status' => 'ok',
-			);
-		} else {
-			$error = new \WP_Error( 'authorization', __( 'You do not have permission to take this action.', 'jetpack-boost' ) );
-			wp_send_json_error( $error, 403 );
-		}
-
-		$provider_key = $_POST['providerKey'] ? filter_var( $_POST['providerKey'], FILTER_SANITIZE_STRING ) : '';
-		if ( empty( $provider_key ) ) {
-			$response['status'] = 'error';
-			echo wp_json_encode( $response );
-			wp_die();
-		}
-		$dismissed_recommendations = \get_option( self::DISMISSED_RECOMMENDATIONS_STORAGE_KEY, array() );
-
-		if ( ! in_array( $provider_key, $dismissed_recommendations, true ) ) {
-			$dismissed_recommendations[] = $provider_key;
-			\update_option( self::DISMISSED_RECOMMENDATIONS_STORAGE_KEY, $dismissed_recommendations );
-		}
-
-		echo wp_json_encode( $response );
-		wp_die();
-	}
-
-	/**
-	 * Reset dismissed Critical CSS recommendations.
-	 */
-	public function reset_dismissed_recommendations() {
-		if ( check_ajax_referer( self::DISMISS_CSS_RECOMMENDATIONS_NONCE, 'nonce' ) && current_user_can( 'manage_options' ) ) {
-			$response = array(
-				'status' => 'ok',
-			);
-		} else {
-			$error = new \WP_Error( 'authorization', __( 'You do not have permission to take this action.', 'jetpack-boost' ) );
-			wp_send_json_error( $error, 403 );
-		}
-
-		self::clear_dismissed_recommendations();
-
-		echo wp_json_encode( $response );
-		wp_die();
-	}
-}
diff --git a/projects/plugins/boost/app/modules/lazy-images/class-lazy-images.php b/projects/plugins/boost/app/modules/lazy-images/class-lazy-images.php
deleted file mode 100644
index 9d6253db4f64c..0000000000000
--- a/projects/plugins/boost/app/modules/lazy-images/class-lazy-images.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Implements the Lazy Images feature.
- *
- * @link       https://automattic.com
- * @since      1.0.0
- * @package    automattic/jetpack-boost
- */
-
-namespace Automattic\Jetpack_Boost\Modules\Lazy_Images;
-
-use Automattic\Jetpack\Jetpack_Lazy_Images;
-use Automattic\Jetpack_Boost\Modules\Module;
-use Jetpack;
-
-/**
- * Class Lazy_Images
- */
-class Lazy_Images extends Module {
-
-	const MODULE_SLUG = 'lazy-images';
-
-	/**
-	 * Jetpack Boost plugin instance.
-	 *
-	 * @var \Automattic\Jetpack_Boost\Jetpack_Boost
-	 */
-	protected $jetpack_boost_plugin;
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		add_action( 'jetpack_boost_loaded', array( $this, 'set_jetpack_boost_plugin_instance' ), 10, 1 );
-		add_action( 'jetpack_loaded', array( $this, 'enable_jetpack_lazy_images_module' ) );
-		add_filter( 'jetpack_boost_module_enabled', array( $this, 'set_default_module_status' ), 10, 2 );
-		add_action( 'jetpack_boost_pre_set_module_status', array( $this, 'set_jetpack_lazy_images_module_status' ), 10, 2 );
-		add_action( 'jetpack_boost_pre_is_module_enabled', array( $this, 'enable_module' ), 10, 2 );
-		add_action( 'jetpack_activate_module', array( $this, 'action_jetpack_activate_module' ), 10, 2 );
-		add_action( 'jetpack_deactivate_module', array( $this, 'action_jetpack_deactivate_module' ), 10, 2 );
-	}
-
-	/**
-	 * Check whether the Jetpack Lazy Images module is enabled.
-	 */
-	public static function is_jetpack_lazy_images_module_enabled() {
-		return class_exists( 'Jetpack' ) && Jetpack::is_module_active( self::MODULE_SLUG );
-	}
-
-	/**
-	 * Set the Jetpack Boost plugin instance so this module can get access to the plugin config methods.
-	 *
-	 * @param \Automattic\Jetpack_Boost\Jetpack_Boost $jetpack_boost_plugin * Jetpack Boost plugin instance.
-	 */
-	public function set_jetpack_boost_plugin_instance( $jetpack_boost_plugin ) {
-		$this->jetpack_boost_plugin = $jetpack_boost_plugin;
-	}
-
-	/**
-	 * Allow enabling Jetpack Lazy Images module if the module is already enabled by Jetpack Boost.
-	 */
-	public function enable_jetpack_lazy_images_module() {
-		if ( $this->jetpack_boost_plugin->is_module_enabled( false, self::MODULE_SLUG ) && ! self::is_jetpack_lazy_images_module_enabled() ) {
-			Jetpack::activate_module( self::MODULE_SLUG, false, false );
-		}
-	}
-
-	/**
-	 * Set the default status for this module to true is the Jetpack Lazy Images module is already enabled.
-	 *
-	 * @param string $default_module_status Default module status.
-	 * @param string $module_slug           Module slug.
-	 *
-	 * @return bool
-	 */
-	public function set_default_module_status( $default_module_status, $module_slug ) {
-		if ( self::MODULE_SLUG === $module_slug && self::is_jetpack_lazy_images_module_enabled() ) {
-			return true;
-		}
-
-		return $default_module_status;
-	}
-
-	/**
-	 * Enable or disable the Jetpack Lazy Images module based on the status of this module and whether or not
-	 * the Jetpack Lazy Images module is already enabled/disabled.
-	 *
-	 * @param bool   $is_enabled  Whether or not the Jetpack Lazy Images module is enabled.
-	 * @param string $module_slug Module slug.
-	 */
-	public function set_jetpack_lazy_images_module_status( $is_enabled, $module_slug ) {
-		if ( ! class_exists( 'Jetpack' ) ) {
-			return;
-		}
-
-		if ( self::MODULE_SLUG === $module_slug && $is_enabled && ! self::is_jetpack_lazy_images_module_enabled() ) {
-			Jetpack::activate_module( self::MODULE_SLUG, false, false );
-		}
-
-		if ( self::MODULE_SLUG === $module_slug && ! $is_enabled && self::is_jetpack_lazy_images_module_enabled() ) {
-			Jetpack::deactivate_module( self::MODULE_SLUG );
-		}
-	}
-
-	/**
-	 * Enable this module in the Jetpack Boost plugin config if the Jetpack Lazy Images module is already enabled.
-	 *
-	 * @param bool   $is_enabled  Whether or not the Jetpack Lazy Images module is enabled.
-	 * @param string $module_slug Module slug.
-	 */
-	public function enable_module( $is_enabled, $module_slug ) {
-		if ( self::MODULE_SLUG === $module_slug && self::is_jetpack_lazy_images_module_enabled() ) {
-			$this->jetpack_boost_plugin->config()->set_value( "$module_slug/enabled", true, true );
-		}
-	}
-
-	/**
-	 * Allow to enable this module when Jetpack Lazy Images module is getting enabled.
-	 *
-	 * @param string $module Module slug.
-	 */
-	public function action_jetpack_activate_module( $module ) {
-		if ( self::MODULE_SLUG === $module ) {
-			$this->jetpack_boost_plugin->config()->set_value( self::MODULE_SLUG . '/enabled', true, true );
-		}
-	}
-
-	/**
-	 * Allow to disable this module when Jetpack Lazy Images module is getting disabled.
-	 *
-	 * @param string $module Module slug.
-	 */
-	public function action_jetpack_deactivate_module( $module ) {
-		if ( self::MODULE_SLUG === $module ) {
-			$this->jetpack_boost_plugin->config()->set_value( self::MODULE_SLUG . '/enabled', false, true );
-		}
-	}
-
-	/**
-	 * Code to run when module is started.
-	 */
-	protected function on_initialize() {
-		if ( ! self::is_jetpack_lazy_images_module_enabled() ) {
-			add_action( 'wp', array( Jetpack_Lazy_Images::class, 'instance' ) );
-		}
-	}
-}
diff --git a/projects/plugins/boost/app/rest-api/REST_API.php b/projects/plugins/boost/app/rest-api/REST_API.php
new file mode 100644
index 0000000000000..30b3254f95d7b
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/REST_API.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API;
+
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+
+class REST_API {
+
+	/**
+	 * @var Route[]
+	 */
+	protected $routes = array();
+
+	/**
+	 * @param Endpoint[] $routes
+	 */
+	public function __construct( $routes ) {
+		foreach ( $routes as $route_class ) {
+			$this->routes[] = new Route( $route_class );
+		}
+	}
+
+	public function register_rest_routes() {
+		foreach ( $this->routes as $route ) {
+			$route->register_rest_route();
+		}
+	}
+
+	/**
+	 * @param Endpoint|Endpoint[]|string $endpoints
+	 *
+	 * @return void
+	 */
+	public static function register( $endpoints ) {
+		// If endpoints are passed as a string,
+		// (array) will convert it to an array.
+		$rest_api = new REST_API( (array) $endpoints );
+		add_action( 'rest_api_init', array( $rest_api, 'register_rest_routes' ) );
+	}
+
+}
diff --git a/projects/plugins/boost/app/rest-api/Route.php b/projects/plugins/boost/app/rest-api/Route.php
new file mode 100644
index 0000000000000..40ef15118ecae
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/Route.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API;
+
+class Route {
+
+	/**
+	 * @var \Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint
+	 */
+	protected $endpoint;
+
+	protected $permissions;
+
+	public function __construct( $endpoint ) {
+		$this->endpoint    = new $endpoint();
+		$this->permissions = $this->endpoint->permissions();
+	}
+
+	public function register_rest_route() {
+		register_rest_route(
+			JETPACK_BOOST_REST_NAMESPACE,
+			JETPACK_BOOST_REST_PREFIX . '/' . $this->endpoint->name(),
+			array(
+				'methods'             => $this->endpoint->request_methods(),
+				'callback'            => array( $this->endpoint, 'response' ),
+				'permission_callback' => array( $this, 'verify_permissions' ),
+			)
+		);
+	}
+
+	/**
+	 * This method is going to run and try to verify that
+	 * all the permission callbacks are successful.
+	 *
+	 * If any of them fail - return false immediately.
+	 *
+	 * @param \WP_REST_Request $request
+	 *
+	 * @return bool
+	 */
+	public function verify_permissions( $request ) {
+		foreach ( $this->permissions as $permission ) {
+			if ( true !== $permission->verify( $request ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+}
diff --git a/projects/plugins/boost/app/rest-api/contracts/Endpoint.php b/projects/plugins/boost/app/rest-api/contracts/Endpoint.php
new file mode 100644
index 0000000000000..7ef90166fecdb
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/contracts/Endpoint.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Contracts;
+
+interface Endpoint {
+
+	public function name();
+
+	public function request_methods();
+
+	public function response( $request );
+
+	public function permissions();
+
+}
diff --git a/projects/plugins/boost/app/rest-api/contracts/Has_Endpoints.php b/projects/plugins/boost/app/rest-api/contracts/Has_Endpoints.php
new file mode 100644
index 0000000000000..25c77c691fc7f
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/contracts/Has_Endpoints.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Contracts;
+
+interface Has_Endpoints {
+
+	/**
+	 * @return Endpoint[]
+	 */
+	public function get_endpoints();
+}
diff --git a/projects/plugins/boost/app/rest-api/contracts/Permission.php b/projects/plugins/boost/app/rest-api/contracts/Permission.php
new file mode 100644
index 0000000000000..9340d135510c4
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/contracts/Permission.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Contracts;
+
+/**
+ * API Endpoints have permissions that are checked by WordPress on `permission_callback`.
+ *
+ * These permissions repeat themselves, for example:
+ *  * current_user_can
+ *  * wp_verify_nonce
+ *
+ * And in the case of nonces - they also need to interact with the rest of the application.
+ * Permission contract helps make the permission callbacks more predictable.
+ * This is especially necessary to deal with nonces
+ * (or more on that, read `permissions/Nonce.php`
+ */
+interface Permission {
+	/**
+	 * A method to verify whether this request
+	 * can be run in the current environment.
+	 *
+	 * @param \WP_REST_Request $request
+	 *
+	 * @return bool
+	 */
+	public function verify( $request );
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Error.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Error.php
new file mode 100644
index 0000000000000..8af97742627e8
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Error.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_Storage;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate\Generator;
+use Automattic\Jetpack_Boost\Lib\Nonce;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+
+class Generator_Error implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	/**
+	 * Handler for PUT '/critical-css/(?P<cacheKey>.+)/error'.
+	 *
+	 * @param \WP_REST_Request $request The request object.
+	 *
+	 * @return \WP_REST_Response|\WP_Error The response.
+	 * @todo: Figure out what to do in the JavaScript when responding with the error status.
+	 */
+	public function response( $request ) {
+
+		$cache_key = $request['cacheKey'];
+		$params    = $request->get_params();
+
+		if ( empty( $params['passthrough'] ) || empty( $params['passthrough']['_nonce'] ) ) {
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'missing_nonce',
+				)
+			);
+		}
+
+		$cache_key_nonce = $params['passthrough']['_nonce'];
+
+		if ( ! Nonce::verify( $cache_key_nonce, Generator::CSS_CALLBACK_ACTION ) ) {
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'invalid_nonce',
+				)
+			);
+		}
+
+		if ( ! isset( $params['data'] ) ) {
+			// Set status to error, because the data is missing.
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'missing_data',
+				)
+			);
+		}
+
+		$data = $params['data'];
+
+		if ( ! isset( $data['show_stopper'] ) ) {
+			// Set status to error, because the data is invalid.
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'invalid_data',
+				)
+			);
+		}
+
+		$storage   = new Critical_CSS_Storage();
+		$generator = new Generator();
+
+		if ( true === $data['show_stopper'] ) {
+			// TODO: Review it seems a bit cumbersome the validation of the data structure here.
+			if ( ! isset( $data['error'] ) ) {
+				// Set status to error, because the data is invalid.
+				return rest_ensure_response(
+					array(
+						'status' => 'error',
+						'code'   => 'invalid_data',
+					)
+				);
+			}
+
+			$generator->state->set_as_failed( $data['error'] );
+			$storage->clear();
+		} else {
+			// TODO: Review it seems a bit cumbersome the validation of the data structure here.
+			if ( ! isset( $data['urls'] ) ) {
+				// Set status to error, because the data is invalid.
+				return rest_ensure_response(
+					array(
+						'status' => 'error',
+						'code'   => 'invalid_data',
+					)
+				);
+			}
+
+			// otherwise, store the error at the provider level, allowing the UI to display them with all details.
+			$generator->state->set_source_error( $cache_key, $data['urls'] );
+		}
+
+		// Set status to success to indicate the critical CSS error has been stored on the server.
+		return rest_ensure_response(
+			array(
+				'status'        => 'success',
+				'code'          => 'processed',
+				'status_update' => $generator->get_critical_css_status(),
+			)
+		);
+	}
+
+	public function permissions() {
+		return array(
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		return 'critical-css/(?P<cacheKey>.+)/error';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php
new file mode 100644
index 0000000000000..304283ff743b2
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Request.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_Storage;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate\Generator;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+
+class Generator_Request implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	public function response( $request ) {
+		$reset = ! empty( $request['reset'] );
+
+		$cleared_critical_css_reason = \get_option( Critical_CSS::RESET_REASON_STORAGE_KEY );
+		$generator                   = new Generator();
+
+		if ( $reset || $cleared_critical_css_reason ) {
+
+			$storage         = new Critical_CSS_Storage();
+			$recommendations = new Recommendations();
+
+			// Create a new Critical CSS Request block to track creation request.
+			$storage->clear();
+			$generator->make_generation_request();
+			$recommendations->reset();
+			Critical_CSS::clear_reset_reason();
+		}
+
+		return rest_ensure_response(
+			array(
+				'status'        => 'success',
+				'status_update' => $generator->get_local_critical_css_generation_info(),
+			)
+		);
+	}
+
+	public function permissions() {
+		return array(
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		return 'critical-css/request-generate';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Status.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Status.php
new file mode 100644
index 0000000000000..36a164ada8525
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Status.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate\Generator;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+
+class Generator_Status implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::READABLE;
+	}
+
+	public function response( $_request ) {
+		$generator = new Generator();
+		return rest_ensure_response( $generator->get_critical_css_status() );
+	}
+
+	public function permissions() {
+		return array(
+			new Current_User_Admin(),
+		);
+	}
+	public function name() {
+		return 'status';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php b/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php
new file mode 100644
index 0000000000000..82f3cffdb492f
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Generator_Success.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Critical_CSS_Storage;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Generate\Generator;
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\Lib\Nonce;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+
+class Generator_Success implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	/**
+	 * Handler for PUT '/critical-css/(?P<cacheKey>.+)/success'.
+	 *
+	 * @param \WP_REST_Request $request The request object.
+	 *
+	 * @return \WP_REST_Response|\WP_Error The response.
+	 * @todo: Figure out what to do in the JavaScript when responding with the error status.
+	 */
+	public function response( $request ) {
+
+		$cache_key = $request['cacheKey'];
+
+		if ( ! $cache_key ) {
+			// Set status to error, because the data is invalid.
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'missing_cache_key',
+				)
+			);
+		}
+
+		$params = $request->get_params();
+
+		if ( empty( $params['passthrough'] ) || empty( $params['passthrough']['_nonce'] ) ) {
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'missing_nonce',
+				)
+			);
+		}
+
+		$cache_key_nonce = $params['passthrough']['_nonce'];
+
+		if ( ! Nonce::verify( $cache_key_nonce, Generator::CSS_CALLBACK_ACTION ) ) {
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'invalid_nonce',
+				)
+			);
+		}
+
+		if ( ! isset( $params['data'] ) ) {
+			// Set status to error, because the data is invalid.
+			return rest_ensure_response(
+				array(
+					'status' => 'error',
+					'code'   => 'invalid_data',
+				)
+			);
+		}
+
+		$storage         = new Critical_CSS_Storage();
+		$recommendations = new Recommendations();
+		$generator       = new Generator();
+
+		$storage->store_css( $cache_key, $params['data'] );
+		$generator->state->set_source_success( $cache_key );
+		$recommendations->reset();
+
+		Critical_CSS::clear_reset_reason();
+
+		// Set status to success to indicate the critical CSS data has been stored on the server.
+		return rest_ensure_response(
+			array(
+				'status'        => 'success',
+				'code'          => 'processed',
+				'status_update' => $generator->get_critical_css_status(),
+			)
+		);
+	}
+
+	public function permissions() {
+		return array(
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		return '/critical-css/(?P<cacheKey>.+)/success';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Optimization_Status.php b/projects/plugins/boost/app/rest-api/endpoints/Optimization_Status.php
new file mode 100644
index 0000000000000..67f4e01634ad2
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Optimization_Status.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Lib\Status;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+
+class Optimization_Status implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	public function response( $request ) {
+		$params = $request->get_json_params();
+
+		if ( ! isset( $params['status'] ) ) {
+			return new \WP_Error(
+				'jetpack_boost_error_missing_module_status_param',
+				__( 'Missing status param', 'jetpack-boost' )
+			);
+		}
+		$module_slug = $request['slug'];
+		$state       = new Status( $module_slug );
+
+		// @TODO: Validate that the module exists?
+
+		$new_status = (bool) $params['status'];
+		$success    = $state->update( (bool) $params['status'] );
+
+		return rest_ensure_response(
+			$success ? $new_status : ! $new_status
+		);
+	}
+
+	public function permissions() {
+		return array(
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		// @TODO: Rename module to optimization here as well?
+		return '/module/(?P<slug>[a-z\-]+)/status';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php
new file mode 100644
index 0000000000000..a48a72e73234a
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Dismiss.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Nonce;
+
+class Recommendations_Dismiss implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	public function response( $request ) {
+		$provider_key = filter_var( $request['providerKey'], FILTER_SANITIZE_STRING );
+		if ( empty( $provider_key ) ) {
+			wp_send_json_error();
+		}
+
+		$recommendations = new Recommendations();
+		$recommendations->dismiss( $provider_key );
+		wp_send_json_success();
+	}
+
+	public function permissions() {
+		return array(
+			new Nonce( $this->name() ),
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		return 'recommendations/dismiss';
+	}
+
+}
diff --git a/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php
new file mode 100644
index 0000000000000..bc3444e50bfcf
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/endpoints/Recommendations_Reset.php
@@ -0,0 +1,33 @@
+<?php
+namespace Automattic\Jetpack_Boost\REST_API\Endpoints;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\Recommendations;
+use Automattic\Jetpack_Boost\REST_API\Contracts\Endpoint;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Current_User_Admin;
+use Automattic\Jetpack_Boost\REST_API\Permissions\Nonce;
+
+class Recommendations_Reset implements Endpoint {
+
+	public function request_methods() {
+		return \WP_REST_Server::EDITABLE;
+	}
+
+	// $request is required to adhere to the contract.
+	//phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	public function response( $request ) {
+		$recommendations = new Recommendations();
+		$recommendations->reset();
+		wp_send_json_success();
+	}
+
+	public function permissions() {
+		return array(
+			new Nonce( $this->name() ),
+			new Current_User_Admin(),
+		);
+	}
+
+	public function name() {
+		return 'recommendations/reset';
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/permissions/Current_User_Admin.php b/projects/plugins/boost/app/rest-api/permissions/Current_User_Admin.php
new file mode 100644
index 0000000000000..e054cf06f35c9
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/permissions/Current_User_Admin.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Permissions;
+
+use Automattic\Jetpack_Boost\REST_API\Contracts\Permission;
+
+class Current_User_Admin implements Permission {
+
+	// $request is required to adhere to the contract.
+	//phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	public function verify( $request ) {
+		return current_user_can( 'manage_options' );
+	}
+}
diff --git a/projects/plugins/boost/app/rest-api/permissions/Nonce.php b/projects/plugins/boost/app/rest-api/permissions/Nonce.php
new file mode 100644
index 0000000000000..3ce214896cb61
--- /dev/null
+++ b/projects/plugins/boost/app/rest-api/permissions/Nonce.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Automattic\Jetpack_Boost\REST_API\Permissions;
+
+use Automattic\Jetpack_Boost\REST_API\Contracts\Permission;
+
+/**
+ * Nonces are tricky in REST.
+ *
+ * `rest_api_init` action is only tirgered when visiting an URL that looks like a REST Endopint.
+ * This means that if nonces are generated there, they won't be available in regular
+ * `init` or `admin_init` parts of the app. But that's exactly where we need them.
+ *
+ * So we need a way to both generate named nonces, but also know what nonces
+ * we have generated and pass them to the front-end of the application.
+ *
+ * To do this without scattering nonce names across the application,
+ * this class is using static properties while complying to with
+ * the Permission contract and keeping track of the nonces
+ * that have been generated, that way they can be
+ * retrieved later using:
+ *
+ * Nonce::get_generated_nonces()
+ */
+class Nonce implements Permission {
+
+	/**
+	 * WordPress calls nonce keys "actions"
+	 *
+	 * @var string The nonce key to validate
+	 */
+	private $action;
+
+	/**
+	 * @var string Key used by `verify` method to validate \WP_Request
+	 */
+	private $request_key;
+
+	/**
+	 * Whenever this class is invoked, it will statically save the generated nonce
+	 * So that they can be retrieved and passed to the admin UI
+	 *
+	 * @var array Associate array of nonces
+	 */
+	private static $saved_nonces = array();
+
+	public function __construct( $action, $request_key = 'nonce' ) {
+		$this->action      = $action;
+		$this->request_key = $request_key;
+		$this->generate_nonce( $action );
+	}
+
+	public function verify( $request ) {
+		if ( ! isset( $request[ $this->request_key ] ) ) {
+			return false;
+		}
+		return false !== wp_verify_nonce( $request[ $this->request_key ], $this->action );
+	}
+
+	public function generate_nonce() {
+		$nonce = wp_create_nonce( $this->action );
+		static::save_generated_nonce( $this->action, $nonce );
+
+		return $nonce;
+	}
+
+	/**
+	 * Keep track of the nonces created using this class.
+	 *
+	 * @param string $action - The action where this nonce is used.
+	 * @param string $nonce  - The nonce value.
+	 *
+	 * @return void
+	 */
+	private static function save_generated_nonce( $action, $nonce ) {
+		static::$saved_nonces[ $action ] = $nonce;
+	}
+
+	/**
+	 * @return array Array of saved [action => nonce] pairs.
+	 */
+	public static function get_generated_nonces() {
+		return static::$saved_nonces;
+	}
+
+}
diff --git a/projects/plugins/vaultpress/changelog/remove-special-cases-for-changelogger-in-changelogger b/projects/plugins/boost/changelog/add-anti-spam-my-jetpack
similarity index 100%
rename from projects/plugins/vaultpress/changelog/remove-special-cases-for-changelogger-in-changelogger
rename to projects/plugins/boost/changelog/add-anti-spam-my-jetpack
diff --git a/projects/plugins/boost/changelog/boost-fix-lazy-loading b/projects/plugins/boost/changelog/boost-fix-lazy-loading
new file mode 100644
index 0000000000000..bf8aea70db665
--- /dev/null
+++ b/projects/plugins/boost/changelog/boost-fix-lazy-loading
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Re-added Lazy image compatibility
diff --git a/projects/plugins/boost/changelog/e2e-merge-gh-actions b/projects/plugins/boost/changelog/e2e-merge-gh-actions
new file mode 100644
index 0000000000000..203de75fe5812
--- /dev/null
+++ b/projects/plugins/boost/changelog/e2e-merge-gh-actions
@@ -0,0 +1,4 @@
+Significance: major
+Type: changed
+
+E2E tests: merge Github workflows
diff --git a/projects/plugins/boost/changelog/fix-e2e-test-errors b/projects/plugins/boost/changelog/fix-e2e-test-errors
new file mode 100644
index 0000000000000..b529991f179ec
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-e2e-test-errors
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed e2e tests
diff --git a/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#5 b/projects/plugins/boost/changelog/renovate-major-eslint-packages
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-storybook-monorepo#5
rename to projects/plugins/boost/changelog/renovate-major-eslint-packages
diff --git a/projects/plugins/boost/changelog/renovate-major-eslint-packages#2 b/projects/plugins/boost/changelog/renovate-major-eslint-packages#2
new file mode 100644
index 0000000000000..7cc8bea27cf3c
--- /dev/null
+++ b/projects/plugins/boost/changelog/renovate-major-eslint-packages#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Added a bunch of missing eslint ignore directives.
diff --git a/projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/boost/changelog/renovate-wordpress-monorepo#3
similarity index 100%
rename from projects/js-packages/storybook/changelog/renovate-wordpress-monorepo#3
rename to projects/plugins/boost/changelog/renovate-wordpress-monorepo#3
diff --git a/projects/js-packages/storybook/changelog/fix-base-style-color b/projects/plugins/boost/changelog/update-better-structure-for-i18n-loader
similarity index 100%
rename from projects/js-packages/storybook/changelog/fix-base-style-color
rename to projects/plugins/boost/changelog/update-better-structure-for-i18n-loader
diff --git a/projects/plugins/boost/changelog/update-critical-css-recommendations b/projects/plugins/boost/changelog/update-critical-css-recommendations
new file mode 100644
index 0000000000000..c39ab215e74e0
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-critical-css-recommendations
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Move Critical CSS recommendation to it's own class.
diff --git a/projects/js-packages/storybook/changelog/fix-changelogger-prerelease-version-next b/projects/plugins/boost/changelog/update-move-i18n-loader-pkg-path-into-assets
similarity index 100%
rename from projects/js-packages/storybook/changelog/fix-changelogger-prerelease-version-next
rename to projects/plugins/boost/changelog/update-move-i18n-loader-pkg-path-into-assets
diff --git a/projects/plugins/boost/compatibility/amp.php b/projects/plugins/boost/compatibility/amp.php
new file mode 100644
index 0000000000000..11df100e21347
--- /dev/null
+++ b/projects/plugins/boost/compatibility/amp.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Compatibility for AMP.
+ *
+ * @package automattic/jetpack-boost
+ */
+
+namespace Automattic\Jetpack_Boost\Compatibility\Amp;
+
+use Automattic\Jetpack_Boost\Features\Optimizations\Critical_CSS\CriticalCSS;
+
+/**
+ * Class AMP.
+ */
+class Amp {
+	/**
+	 * CriticalCSS module instance.
+	 *
+	 * @var CriticalCSS
+	 */
+	private static $critical_css;
+
+	/**
+	 * Init AMP compatibility actions after modules are initialized.
+	 *
+	 * @param CriticalCSS $module CriticalCSS Module instance.
+	 */
+	public static function init_compatibility( $module ) {
+		self::$critical_css = $module;
+
+		add_action( 'wp', array( __CLASS__, 'disable_critical_css' ), 0 );
+	}
+
+	/**
+	 * Disable Critical CSS display.
+	 */
+	public static function disable_critical_css() {
+		if ( amp_is_request() ) {
+			remove_action( 'wp', array( self::$critical_css, 'display_critical_css' ) );
+		}
+	}
+}
+
+add_action( 'jetpack_boost_critical-css_initialized', array( __NAMESPACE__ . '\Amp', 'init_compatibility' ) );
diff --git a/projects/plugins/boost/compatibility/boost-1.3.1.php b/projects/plugins/boost/compatibility/boost-1.3.1.php
new file mode 100644
index 0000000000000..df264dcbc1667
--- /dev/null
+++ b/projects/plugins/boost/compatibility/boost-1.3.1.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Seamlessly migrate to the new options format. Even if no admin hooks are fired as the plugin is updated,
+ * the visitor will never notice a difference, because we'll use the old options in the background.
+ */
+function jetpack_boost_131_option_fallback( $default, $option ) {
+	$old_config = get_option( 'jetpack_boost_config' );
+	if ( ! $old_config ) {
+		return $default;
+	}
+
+	$key = str_replace( 'jetpack_boost_state_', '', $option );
+	if ( ! isset( $old_config[ $key ] ) || ! isset( $old_config[ $key ]['enabled'] ) ) {
+		return $default;
+	}
+
+	return (string) $old_config[ $key ]['enabled'];
+}
+
+add_filter( 'default_option_jetpack_boost_state_critical-css', 'jetpack_boost_131_option_fallback', 10, 2 );
+add_filter( 'default_option_jetpack_boost_state_lazy-images', 'jetpack_boost_131_option_fallback', 10, 2 );
+add_filter( 'default_option_jetpack_boost_state_render-blocking-js', 'jetpack_boost_131_option_fallback', 10, 2 );
+
+/**
+ * When something interacts with boost option toggles,
+ * silently migrate the options to the new format,
+ * that way the code above is never run.
+ */
+
+function jetpack_boost_131_option_migration() {
+
+	/**
+	 * This function is hooked into add_option
+	 * and also is using add_option
+	 *
+	 * That can cause quite a bit of recursion.
+	 * Use static variables to guard that.
+	 */
+	static $has_run = false;
+	if ( false !== $has_run ) {
+		return;
+	}
+	$has_run = true;
+
+	$old_config = get_option( 'jetpack_boost_config' );
+
+	if ( ! $old_config ) {
+		return;
+	}
+
+	$migration_keys = array( 'critical-css', 'lazy-images', 'render-blocking-js' );
+	foreach ( $migration_keys as $migration_key ) {
+		if ( ! isset( $old_config[ $migration_key ] ) || ! isset( $old_config[ $migration_key ]['enabled'] ) ) {
+			continue;
+		}
+		add_option( "jetpack_boost_state_{$migration_key}", $old_config[ $migration_key ]['enabled'] );
+	}
+
+	delete_option( 'jetpack_boost_config' );
+}
+
+add_action( 'add_option_jetpack_boost_state_critical-css', 'jetpack_boost_131_option_migration', 10, 0 );
+add_action( 'add_option_jetpack_boost_state_lazy-images', 'jetpack_boost_131_option_migration', 10, 0 );
+add_action( 'add_option_jetpack_boost_state_render-blocking-js', 'jetpack_boost_131_option_migration', 10, 0 );
diff --git a/projects/plugins/boost/compatibility/jetpack.php b/projects/plugins/boost/compatibility/jetpack.php
index e90b1a526b772..becbd737ef57d 100644
--- a/projects/plugins/boost/compatibility/jetpack.php
+++ b/projects/plugins/boost/compatibility/jetpack.php
@@ -35,3 +35,33 @@ function exclude_jetpack_likes_scripts_defer( $exclusions ) {
 }
 
 add_filter( 'jetpack_boost_render_blocking_js_exclude_handles', __NAMESPACE__ . '\exclude_jetpack_likes_scripts_defer', 10, 1 );
+
+/**
+ * Use Jetpack options as the single source of truth,
+ * when Jetpack is active
+ *
+ * @return string
+ */
+function lazy_images_override_status() {
+	return (string) \Jetpack::is_module_active( 'lazy-images' );
+}
+
+add_filter( 'default_option_jetpack_boost_status_lazy-images', __NAMESPACE__ . '\lazy_images_override_status' );
+add_filter( 'option_jetpack_boost_status_lazy-images', __NAMESPACE__ . '\lazy_images_override_status' );
+
+/**
+ * Forward all lazy image settings changes to Jetpack
+ * when interacting with Jetpack Boost dashboard.
+ */
+function lazy_images_sync_status( $_unused, $new_value ) {
+	if ( $new_value ) {
+		\Jetpack::activate_module( 'lazy-images', false, false );
+	} else {
+		\Jetpack::deactivate_module( 'lazy-images' );
+	}
+
+	return $new_value;
+}
+
+add_action( 'add_option_jetpack_boost_status_lazy-images', __NAMESPACE__ . '\lazy_images_sync_status', 10, 2 );
+add_action( 'update_option_jetpack_boost_status_lazy-images', __NAMESPACE__ . '\lazy_images_sync_status', 10, 2 );
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index 01a6e09566b96..d0c551e472cb6 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -14,10 +14,10 @@
 	"prefer-stable": true,
 	"require": {
 		"ext-json": "*",
-		"automattic/jetpack-assets": "1.16.x-dev",
+		"automattic/jetpack-assets": "1.17.x-dev",
 		"automattic/jetpack-admin-ui": "0.2.x-dev",
 		"automattic/jetpack-autoloader": "2.10.x-dev",
-		"automattic/jetpack-composer-plugin": "1.0.x-dev",
+		"automattic/jetpack-composer-plugin": "1.1.x-dev",
 		"automattic/jetpack-config": "1.6.x-dev",
 		"automattic/jetpack-connection": "1.36.x-dev",
 		"automattic/jetpack-device-detection": "1.4.x-dev",
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index aa9a990c99a43..12c88dc4afcb6 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/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": "ad338ddf5d51f846c3f1d6786c732788",
+    "content-hash": "bf84051ff242fd51a306b1a6eed5ce99",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -60,7 +60,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "e9c471e1ac68c4dd7cf656fd17a4b96fdc4c6ff1"
+                "reference": "bbb92b9b9852760e84b7aaee877ee081616efcb3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
@@ -71,6 +71,7 @@
             "extra": {
                 "autotagger": true,
                 "mirror-repo": "Automattic/jetpack-admin-ui",
+                "textdomain": "jetpack-admin-ui",
                 "changelogger": {
                     "link-template": "https://github.com/Automattic/jetpack-admin-ui/compare/${old}...${new}"
                 },
@@ -115,7 +116,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "558a4eabba5541257e2b496aeba6da3a06e169f5"
+                "reference": "810134d18a0baedd94aae5398f2f506f213bac7b"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6"
@@ -135,7 +136,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "1.16.x-dev"
+                    "dev-master": "1.17.x-dev"
                 }
             },
             "autoload": {
@@ -147,11 +148,21 @@
                 ]
             },
             "scripts": {
+                "build-development": [
+                    "pnpm run build"
+                ],
+                "build-production": [
+                    "pnpm run build-production"
+                ],
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
                 "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
+                    "pnpm run test-coverage"
+                ],
+                "test-js": [
+                    "pnpm run test"
                 ],
                 "test-php": [
                     "@composer phpunit"
@@ -228,7 +239,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "d9a79b97dbf363bdffb2f748e0dbed8216753c36"
+                "reference": "c3fc0e4cf179c619f896174a6c9db8e70cff74c3"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -247,7 +258,7 @@
                 },
                 "autotagger": true,
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -525,10 +536,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/lazy-images",
-                "reference": "65185b85f48c44181ed99a1d31cdbd2c8d68e796"
+                "reference": "c7115dc7f2f073b53f98584382773bb8db0ca68b"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-constants": "^1.6"
             },
             "require-dev": {
@@ -834,10 +845,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/tracking",
-                "reference": "ed6f897aaaa8e843271556d271e6c7a829cb8727"
+                "reference": "60dd2a4462221bcc460aadf9f86daeb308fd8027"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-options": "^1.14",
                 "automattic/jetpack-status": "^1.10",
                 "automattic/jetpack-terms-of-service": "^1.9"
@@ -945,16 +956,16 @@
     "packages-dev": [
         {
             "name": "antecedent/patchwork",
-            "version": "2.1.17",
+            "version": "2.1.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antecedent/patchwork.git",
-                "reference": "df5aba175a44c2996ced4edf8ec9f9081b5348c0"
+                "reference": "94fe587cb0a6c1695b1ddc650e877231be80b8bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/df5aba175a44c2996ced4edf8ec9f9081b5348c0",
-                "reference": "df5aba175a44c2996ced4edf8ec9f9081b5348c0",
+                "url": "https://api.github.com/repos/antecedent/patchwork/zipball/94fe587cb0a6c1695b1ddc650e877231be80b8bc",
+                "reference": "94fe587cb0a6c1695b1ddc650e877231be80b8bc",
                 "shasum": ""
             },
             "require": {
@@ -987,9 +998,9 @@
             ],
             "support": {
                 "issues": "https://github.com/antecedent/patchwork/issues",
-                "source": "https://github.com/antecedent/patchwork/tree/2.1.17"
+                "source": "https://github.com/antecedent/patchwork/tree/2.1.19"
             },
-            "time": "2021-10-21T14:22:43+00:00"
+            "time": "2022-01-20T04:47:04+00:00"
         },
         {
             "name": "automattic/jetpack-changelogger",
@@ -1299,16 +1310,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.4.4",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346"
+                "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
-                "reference": "e01123a0e847d52d186c5eb4b9bf58b0c6d00346",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
+                "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac",
                 "shasum": ""
             },
             "require": {
@@ -1365,9 +1376,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.4.4"
+                "source": "https://github.com/mockery/mockery/tree/1.5.0"
             },
-            "time": "2021-09-13T15:28:59+00:00"
+            "time": "2022-01-20T13:18:17+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -2141,16 +2152,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.11",
+            "version": "9.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2406855036db1102126125537adb1406f7242fdd"
+                "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd",
-                "reference": "2406855036db1102126125537adb1406f7242fdd",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/93d4bf4c37aec6384bb9e5d390d9049a463a7256",
+                "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256",
                 "shasum": ""
             },
             "require": {
@@ -2228,7 +2239,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.12"
             },
             "funding": [
                 {
@@ -2240,31 +2251,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-25T07:07:57+00:00"
+            "time": "2022-01-21T05:54:47+00:00"
         },
         {
             "name": "psr/container",
-            "version": "2.0.2",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
-                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -2291,9 +2297,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-11-05T16:47:00+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "roots/wordpress",
@@ -2305,8 +2311,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress/zipball/refs/tags/5.8.3",
-                "reference": "5.8.3"
+                "url": "https://api.github.com/repos/WordPress/WordPress/zipball/refs/tags/5.8.3"
             },
             "require": {
                 "php": ">=5.3.2",
@@ -3490,25 +3495,25 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced"
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3537,7 +3542,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -3553,7 +3558,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-01T23:48:49+00:00"
+            "time": "2021-07-12T14:48:14+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4111,21 +4116,22 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.0.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603"
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603",
-                "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
-                "psr/container": "^2.0"
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -4136,7 +4142,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4173,7 +4179,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -4189,37 +4195,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T17:53:12+00:00"
+            "time": "2021-11-04T16:48:04+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.2",
+            "version": "v5.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "bae261d0c3ac38a1f802b4dfed42094296100631"
+                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/bae261d0c3ac38a1f802b4dfed42094296100631",
-                "reference": "bae261d0c3ac38a1f802b4dfed42094296100631",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
+                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": ">=3.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -4258,7 +4265,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.2"
+                "source": "https://github.com/symfony/string/tree/v5.4.2"
             },
             "funding": [
                 {
@@ -4274,7 +4281,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-16T22:13:01+00:00"
+            "time": "2021-12-16T21:52:00+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md b/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md
index 11698f30b2e3a..6475124a504f8 100644
--- a/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md
+++ b/projects/plugins/boost/docs/DEVELOPEMENT_GUIDE.md
@@ -124,14 +124,14 @@ The bare-bones module template can look like:
  * @since      1.0.0
  */
 
-namespace Automattic\Jetpack_Boost\Modules\Foo;
+namespace Automattic\Jetpack_Boost\Features\Optimizations\Foo;
 
-use Automattic\Jetpack_Boost\Modules\Module;
+use Automattic\Jetpack_Boost\Features\Optimizations\State;
 
 /**
  * Class Foo
  */
-class Foo extends Module {
+class Foo extends State {
 
 	/**
 	 * Code to run when module is started
diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php
index 23be25904bde2..f5addcfc0b335 100644
--- a/projects/plugins/boost/jetpack-boost.php
+++ b/projects/plugins/boost/jetpack-boost.php
@@ -142,6 +142,10 @@ function include_compatibility_files() {
 	if ( class_exists( '\Elementor\TemplateLibrary\Source_Local' ) ) {
 		require_once __DIR__ . '/compatibility/elementor.php';
 	}
+
+	if ( function_exists( 'amp_is_request' ) ) {
+		require_once __DIR__ . '/compatibility/amp.php';
+	}
 }
 
 add_action( 'plugins_loaded', __NAMESPACE__ . '\include_compatibility_files' );
@@ -154,3 +158,8 @@ function jetpack_boost_uninstall() {
 	$boost = new Jetpack_Boost();
 	$boost->uninstall();
 }
+
+/**
+ * Previous version compatibility files
+ */
+require_once __DIR__ . '/compatibility/boost-1.3.1.php';
diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
index e3c5b69e79386..aed1c21dfdb1b 100644
--- a/projects/plugins/boost/package.json
+++ b/projects/plugins/boost/package.json
@@ -6,8 +6,8 @@
 		"test": "tests"
 	},
 	"dependencies": {
-		"@wordpress/components": "19.1.6",
-		"@wordpress/element": "4.0.4",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/element": "4.1.0",
 		"jetpack-boost-critical-css-gen": "github:automattic/jetpack-boost-critical-css-gen#release-0.0.2"
 	},
 	"devDependencies": {
@@ -18,10 +18,10 @@
 		"@rollup/plugin-typescript": "8.2.5",
 		"@sveltejs/eslint-config": "github:sveltejs/eslint-config",
 		"@tsconfig/svelte": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "4.33.0",
-		"@typescript-eslint/parser": "4.33.0",
-		"@wordpress/e2e-test-utils": "5.4.10",
-		"@wordpress/i18n": "4.2.4",
+		"@typescript-eslint/eslint-plugin": "5.10.2",
+		"@typescript-eslint/parser": "5.10.2",
+		"@wordpress/e2e-test-utils": "6.0.0",
+		"@wordpress/i18n": "4.3.0",
 		"eslint-plugin-import": "2.25.4",
 		"eslint-plugin-svelte3": "3.2.1",
 		"node-wp-i18n": "1.2.6",
@@ -50,10 +50,10 @@
 		"reformat-files": "../../../tools/js-tools/node_modules/.bin/prettier --ignore-path ../../../.eslintignore --write --plugin-search-dir=. ./**/*.{svelte,js,ts,json}",
 		"lint": "pnpm run reformat-files && echo 'Running eslint...' && ../../../tools/js-tools/node_modules/.bin/eslint app/assets/src/js tests/e2e --fix && echo '✔ prettier and eslint ran successfully.'",
 		"clear-dist": "rm -rf app/assets/dist/*",
-		"test-e2e:start": "pnpm --prefix tests/e2e run tunnel-on && pnpm --prefix tests/e2e run env-start",
-		"test-e2e:run": "pnpm --prefix tests/e2e run test-e2e",
-		"test-e2e:stop": "pnpm --prefix tests/e2e run tunnel-off && pnpm --prefix tests/e2e run env-stop",
-		"test-e2e:decrypt-config": "pnpm --prefix tests/e2e run test-decrypt-config"
+		"test-e2e:start": "pnpm --prefix tests/e2e run tunnel:up && pnpm --prefix tests/e2e run env:up",
+		"test-e2e:run": "pnpm --prefix tests/e2e run test:run",
+		"test-e2e:stop": "pnpm --prefix tests/e2e run tunnel:down && pnpm --prefix tests/e2e run env:down",
+		"test-e2e:decrypt-config": "pnpm --prefix tests/e2e run config:decrypt"
 	},
 	"private": true,
 	"repository": {
diff --git a/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js b/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
index cd6bbf9366dba..bdd520031657f 100644
--- a/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
+++ b/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
@@ -11,6 +11,7 @@ export function boostPrerequisitesBuilder( page ) {
 		modules: { active: undefined, inactive: undefined },
 		connected: undefined,
 		jetpackDeactivated: undefined,
+		mockSpeedScore: undefined,
 	};
 
 	return {
@@ -30,6 +31,10 @@ export function boostPrerequisitesBuilder( page ) {
 			state.testPostTitles = testPostTitles;
 			return this;
 		},
+		withSpeedScoreMocked( shouldMockSpeedScore ) {
+			state.mockSpeedScore = shouldMockSpeedScore;
+			return this;
+		},
 		withCleanEnv() {
 			state.clean = true;
 			return this;
@@ -46,6 +51,7 @@ async function buildPrerequisites( state, page ) {
 		connected: () => ensureConnectedState( state.connected, page ),
 		testPostTitles: () => ensureTestPosts( state.testPostTitles ),
 		clean: () => ensureCleanState( state.clean ),
+		mockSpeedScore: () => ensureMockSpeedScoreState( state.mockSpeedScore ),
 	};
 
 	logger.prerequisites( JSON.stringify( state, null, 2 ) );
@@ -75,6 +81,18 @@ export async function ensureModulesState( modules ) {
 		logger.prerequisites( 'Cannot find list of modules to deactivate!' );
 	}
 }
+
+export async function ensureMockSpeedScoreState( mockSpeedScore ) {
+	if ( mockSpeedScore ) {
+		logger.prerequisites( 'Mocking Speed Score' );
+		// Enable the speed score mock plugin.
+		await execWpCommand( 'plugin activate e2e-mock-speed-score-api' );
+	} else {
+		logger.prerequisites( 'Unmocking Speed Score' );
+		await execWpCommand( 'plugin deactivate e2e-mock-speed-score-api' );
+	}
+}
+
 export async function activateModules( modules ) {
 	for ( const module of modules ) {
 		logger.prerequisites( `Activating module ${ module }` );
@@ -113,7 +131,6 @@ export async function connect( page ) {
 	// as a localhost site. The only solution is to do it via the site itself running under the localtunnel.
 	const jetpackBoostPage = await JetpackBoostPage.visit( page );
 	await jetpackBoostPage.connect();
-	await jetpackBoostPage.waitForApiResponse( 'connection' );
 	await jetpackBoostPage.isOverallScoreHeaderShown();
 }
 
diff --git a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
index 6b2d9bf2e0745..d15f2479a8b1a 100644
--- a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
+++ b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
@@ -6,6 +6,7 @@ const apiEndpointsRegex = {
 	'lazy-images-status': /jetpack-boost\/v1\/module\/lazy-images\/status/,
 	'render-blocking-js-status': /jetpack-boost\/v1\/module\/render-blocking-js\/status/,
 	'speed-scores-update': /jetpack-boost\/v1\/speed-scores\/\w*\/update/,
+	connection: /jetpack-boost\/v1\/connection/,
 };
 
 export default class JetpackBoostPage extends WpPage {
@@ -14,15 +15,38 @@ export default class JetpackBoostPage extends WpPage {
 		super( page, { expectedSelectors: [ '#jb-settings' ], url } );
 	}
 
+	/**
+	 * Tries to connect Jetpack Boost to WordPress.com, and waits for the connection API call to complete.
+	 */
 	async connect() {
 		const button = await this.page.$( '.jb-connection button' );
 		await button.click();
+		await this.waitForApiResponse( 'connection' );
 	}
 
-	async isFreshlyConnected() {
-		await this.connect();
-		await this.waitForApiResponse( 'connection' );
-		return await this.isSiteScoreLoading();
+	/**
+	 * Check if the site looks disconnected from WordPress.com based on elements on the dashboard page.
+	 * Specifically checks for a "Connect" button.
+	 *
+	 * @return {boolean}  - True if the dashboard looks disconnected. (Not offline mode)
+	 */
+	async isAwaitingConnection() {
+		return await this.isElementVisible( '.jb-connection button' );
+	}
+
+	/**
+	 * Check if the site looks connected to WordPress.com based on elements on the dashboard page.
+	 * Looks for a "Site Score" area, which is not in "offline" mode.
+	 *
+	 * @return {boolean} - True if the dashboard looks connected to WordPRess.com.
+	 */
+	async isConnected() {
+		const [ showingScoreArea, isOffline ] = await Promise.all( [
+			this.isElementVisible( '.jb-site-score' ),
+			this.isElementVisible( '.jb-site-score__offline' ),
+		] );
+
+		return showingScoreArea && ! isOffline;
 	}
 
 	async isOverallScoreHeaderShown() {
@@ -62,6 +86,7 @@ export default class JetpackBoostPage extends WpPage {
 		);
 		await this.page.waitForSelector( '.jb-score-bar__score', {
 			state: 'visible',
+			timeout: 40 * 1000,
 		} );
 		return Number( await speedBar.$eval( '.jb-score-bar__score', e => e.textContent ) );
 	}
diff --git a/projects/plugins/boost/tests/e2e/lib/setupTests.js b/projects/plugins/boost/tests/e2e/lib/setupTests.js
index 6386417e40396..f382e81623ccc 100644
--- a/projects/plugins/boost/tests/e2e/lib/setupTests.js
+++ b/projects/plugins/boost/tests/e2e/lib/setupTests.js
@@ -6,6 +6,10 @@ export default async function () {
 	const browser = await chromium.launch();
 	const page = await browser.newPage();
 	await prerequisitesBuilder( page ).withLoggedIn( true ).withActivePlugins( [ 'boost' ] ).build();
-	await boostPrerequisitesBuilder( page ).withCleanEnv( true ).withConnection( true ).build();
+	await boostPrerequisitesBuilder( page )
+		.withCleanEnv( true )
+		.withSpeedScoreMocked( true )
+		.withConnection( true )
+		.build();
 	await page.close();
 }
diff --git a/projects/plugins/boost/tests/e2e/package.json b/projects/plugins/boost/tests/e2e/package.json
index ef2a62a3626b8..a7296393f58b5 100644
--- a/projects/plugins/boost/tests/e2e/package.json
+++ b/projects/plugins/boost/tests/e2e/package.json
@@ -14,28 +14,29 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
+		"build": "pnpx jetpack build plugins/jetpack plugins/boost -v --no-pnpm-install --production",
 		"clean": "rm -rf output",
+		"config:decrypt": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
 		"distclean": "rm -rf node_modules",
-		"env-start": "e2e-env start --activate-plugins boost",
-		"env-stop": "e2e-env stop",
-		"env-reset": "e2e-env reset --activate-plugins boost",
-		"tunnel-on": "tunnel up",
-		"tunnel-reset": "tunnel reset",
-		"tunnel-off": "tunnel down",
-		"tunnel-write-logs": "tunnel logs output/logs/tunnel.log",
+		"env:up": "e2e-env start --activate-plugins boost",
+		"env:down": "e2e-env stop",
+		"env:reset": "e2e-env reset --activate-plugins boost",
+		"tunnel:up": "tunnel up",
+		"tunnel:reset": "tunnel reset",
+		"tunnel:down": "tunnel down",
+		"tunnel:write-logs": "tunnel logs output/logs/tunnel.log",
 		"pretest-e2e": "pnpm run clean",
-		"test-e2e": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results playwright test --config=./playwright.config.cjs",
-		"test-decrypt-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local.cjs",
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results playwright test --config=./playwright.config.cjs",
 		"slack": "NODE_CONFIG_DIR='./config' slack",
 		"preinstall": "pnpm --prefix ../../../../../tools/e2e-commons install"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.17.1",
-		"@wordpress/eslint-plugin": "9.3.0",
+		"@wordpress/eslint-plugin": "10.0.0",
 		"allure-playwright": "2.0.0-beta.14",
 		"config": "^3.3.6",
-		"eslint": "7.32.0",
-		"eslint-plugin-playwright": "0.6.0",
+		"eslint": "8.8.0",
+		"eslint-plugin-playwright": "0.8.0",
 		"jetpack-cli": "link:../../../../../tools/cli",
 		"jetpack-e2e-commons": "link:../../../../../tools/e2e-commons"
 	},
@@ -44,5 +45,11 @@
 		"pnpm": "^6.23.6",
 		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
 	},
-	"browserslist": []
+	"browserslist": [],
+	"ci": {
+		"targets": [
+			"plugins/boost",
+			"tools/e2e-commons"
+		]
+	}
 }
diff --git a/projects/plugins/boost/tests/e2e/plugins/e2e-mock-speed-score-api.php b/projects/plugins/boost/tests/e2e/plugins/e2e-mock-speed-score-api.php
new file mode 100644
index 0000000000000..13804db1196f2
--- /dev/null
+++ b/projects/plugins/boost/tests/e2e/plugins/e2e-mock-speed-score-api.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Plugin Name: Boost E2E Speed Score Mocker
+ * Plugin URI: https://github.com/automattic/jetpack
+ * Author: Heart of Gold
+ * Version: 1.0.0
+ * Text Domain: jetpack
+ *
+ * @package automattic/jetpack
+ */
+
+add_filter( 'pre_http_request', 'e2e_mock_speed_score_api', 1, 3 );
+
+/**
+ * Intercept WPCOM request to generate Speed Scores and reply with mocked data
+ * Useful when not explicitly testing speed scores, as they are heavy to generate.
+ *
+ * @param false  $default_action - Return unmodified to continue with http request unmodified.
+ * @param array  $args - HTTP request arguments.
+ * @param string $target - HTTP request target / URL.
+ */
+function e2e_mock_speed_score_api( $default_action, $args, $target ) {
+	// Ignore requests which are not to the Jetpack Speed Score API.
+	if ( ! preg_match( '#wpcom/v2/sites/\d+/jetpack-boost/speed-scores#', $target ) ) {
+		return $default_action;
+	}
+
+	// Return generic success message when new speed score requested.
+	if ( 'POST' === $args['method'] ) {
+		return e2e_mock_speed_score_api_response(
+			array(
+				'status' => 'pending',
+			)
+		);
+	}
+
+	// Return successful speed score message when polling.
+	if ( 'GET' === $args['method'] ) {
+		// Return a lower mock-score when generating with no Boost modules enabled (determined by URL arguments).
+		$modules_disabled = strpos( $target, 'jb-disable-modules' ) !== false;
+
+		return e2e_mock_speed_score_api_response(
+			array(
+				'status' => 'success',
+				'scores' => array(
+					'mobile'  => $modules_disabled ? 60 : 80,
+					'desktop' => $modules_disabled ? 70 : 90,
+				),
+			)
+		);
+	}
+
+	return $default_action;
+}
+
+/**
+ * Return a mocked Speed Score request.
+ *
+ * @param array $body - Array data to return as mocked response body.
+ */
+function e2e_mock_speed_score_api_response( $body ) {
+	return array(
+		'response' => array(
+			'code' => 200,
+		),
+		'body'     => wp_json_encode( $body ),
+	);
+}
diff --git a/projects/plugins/boost/tests/e2e/pnpm-lock.yaml b/projects/plugins/boost/tests/e2e/pnpm-lock.yaml
index da956be3b305d..76839979a6271 100644
--- a/projects/plugins/boost/tests/e2e/pnpm-lock.yaml
+++ b/projects/plugins/boost/tests/e2e/pnpm-lock.yaml
@@ -5,36 +5,37 @@ importers:
   .:
     specifiers:
       '@playwright/test': 1.17.1
-      '@wordpress/eslint-plugin': 9.3.0
+      '@wordpress/eslint-plugin': 10.0.0
       allure-playwright: 2.0.0-beta.14
       config: ^3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.6.0
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0
       jetpack-cli: link:../../../../../tools/cli
       jetpack-e2e-commons: link:../../../../../tools/e2e-commons
     devDependencies:
       '@playwright/test': 1.17.1
-      '@wordpress/eslint-plugin': 9.3.0_eslint@7.32.0
+      '@wordpress/eslint-plugin': 10.0.0_eslint@8.8.0
       allure-playwright: 2.0.0-beta.14
       config: 3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.6.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0_eslint@8.8.0
       jetpack-cli: link:../../../../../tools/cli
       jetpack-e2e-commons: link:../../../../../tools/e2e-commons
 
 packages:
 
-  /@babel/code-frame/7.12.11:
-    resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
+  /@babel/code-frame/7.16.0:
+    resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==}
+    engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.16.0
     dev: true
 
-  /@babel/code-frame/7.16.0:
-    resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==}
+  /@babel/code-frame/7.16.7:
+    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.16.0
+      '@babel/highlight': 7.16.10
     dev: true
 
   /@babel/compat-data/7.16.0:
@@ -42,6 +43,11 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/compat-data/7.16.8:
+    resolution: {integrity: sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/core/7.16.0:
     resolution: {integrity: sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==}
     engines: {node: '>=6.9.0'}
@@ -65,14 +71,14 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/eslint-parser/7.16.5_eslint@7.32.0:
+  /@babel/eslint-parser/7.16.5_eslint@8.8.0:
     resolution: {integrity: sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
       '@babel/core': '>=7.11.0'
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-scope: 5.1.1
       eslint-visitor-keys: 2.1.0
       semver: 6.3.0
@@ -87,6 +93,15 @@ packages:
       source-map: 0.5.7
     dev: true
 
+  /@babel/generator/7.16.8:
+    resolution: {integrity: sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+      jsesc: 2.5.2
+      source-map: 0.5.7
+    dev: true
+
   /@babel/helper-annotate-as-pure/7.16.0:
     resolution: {integrity: sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==}
     engines: {node: '>=6.9.0'}
@@ -94,6 +109,21 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-annotate-as-pure/7.16.7:
+    resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
+    resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-explode-assignable-expression': 7.16.7
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-compilation-targets/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==}
     engines: {node: '>=6.9.0'}
@@ -107,6 +137,19 @@ packages:
       semver: 6.3.0
     dev: true
 
+  /@babel/helper-compilation-targets/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.0
+      '@babel/helper-validator-option': 7.16.7
+      browserslist: 4.17.6
+      semver: 6.3.0
+    dev: true
+
   /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==}
     engines: {node: '>=6.9.0'}
@@ -124,6 +167,67 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-create-class-features-plugin/7.16.10_@babel+core@7.16.0:
+    resolution: {integrity: sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-create-regexp-features-plugin/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      regexpu-core: 4.8.0
+    dev: true
+
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/traverse': 7.16.0
+      debug: 4.3.3
+      lodash.debounce: 4.0.8
+      resolve: 1.20.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-environment-visitor/7.16.7:
+    resolution: {integrity: sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-explode-assignable-expression/7.16.7:
+    resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-function-name/7.16.0:
     resolution: {integrity: sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==}
     engines: {node: '>=6.9.0'}
@@ -133,6 +237,15 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-function-name/7.16.7:
+    resolution: {integrity: sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-get-function-arity': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-get-function-arity/7.16.0:
     resolution: {integrity: sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==}
     engines: {node: '>=6.9.0'}
@@ -140,6 +253,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-get-function-arity/7.16.7:
+    resolution: {integrity: sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-hoist-variables/7.16.0:
     resolution: {integrity: sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==}
     engines: {node: '>=6.9.0'}
@@ -147,6 +267,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-hoist-variables/7.16.7:
+    resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-member-expression-to-functions/7.16.0:
     resolution: {integrity: sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==}
     engines: {node: '>=6.9.0'}
@@ -154,6 +281,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-member-expression-to-functions/7.16.7:
+    resolution: {integrity: sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-module-imports/7.16.0:
     resolution: {integrity: sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==}
     engines: {node: '>=6.9.0'}
@@ -161,6 +295,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-module-imports/7.16.7:
+    resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-module-transforms/7.16.0:
     resolution: {integrity: sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==}
     engines: {node: '>=6.9.0'}
@@ -177,6 +318,22 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-module-transforms/7.16.7:
+    resolution: {integrity: sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-optimise-call-expression/7.16.0:
     resolution: {integrity: sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==}
     engines: {node: '>=6.9.0'}
@@ -184,11 +341,34 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-optimise-call-expression/7.16.7:
+    resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-plugin-utils/7.14.5:
     resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==}
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/helper-plugin-utils/7.16.7:
+    resolution: {integrity: sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-remap-async-to-generator/7.16.8:
+    resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-wrap-function': 7.16.8
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-replace-supers/7.16.0:
     resolution: {integrity: sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==}
     engines: {node: '>=6.9.0'}
@@ -201,6 +381,19 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-replace-supers/7.16.7:
+    resolution: {integrity: sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-simple-access/7.16.0:
     resolution: {integrity: sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==}
     engines: {node: '>=6.9.0'}
@@ -208,6 +401,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-simple-access/7.16.7:
+    resolution: {integrity: sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
     resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
     engines: {node: '>=6.9.0'}
@@ -222,289 +422,1066 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-split-export-declaration/7.16.7:
+    resolution: {integrity: sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-validator-identifier/7.15.7:
     resolution: {integrity: sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-validator-option/7.14.5:
-    resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
+  /@babel/helper-validator-identifier/7.16.7:
+    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-option/7.14.5:
+    resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-option/7.16.7:
+    resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-wrap-function/7.16.8:
+    resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-function-name': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helpers/7.16.0:
+    resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.16.0
+      '@babel/traverse': 7.16.0
+      '@babel/types': 7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/highlight/7.16.0:
+    resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.15.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+    dev: true
+
+  /@babel/highlight/7.16.10:
+    resolution: {integrity: sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+    dev: true
+
+  /@babel/parser/7.16.12:
+    resolution: {integrity: sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dev: true
+
+  /@babel/parser/7.16.2:
+    resolution: {integrity: sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dev: true
+
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-async-generator-functions/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-dynamic-import/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-export-namespace-from/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-json-strings/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-logical-assignment-operators/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-object-rest-spread/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-chaining/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.16.11_@babel+core@7.16.0:
+    resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-property-in-object/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-unicode-property-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.16.0:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-async-to-generator/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-block-scoping/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-classes/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-computed-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-destructuring/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-duplicate-keys/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-for-of/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helpers/7.16.0:
-    resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==}
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/template': 7.16.0
-      '@babel/traverse': 7.16.0
-      '@babel/types': 7.16.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/highlight/7.16.0:
-    resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==}
+  /@babel/plugin-transform-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/helper-validator-identifier': 7.15.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/parser/7.16.2:
-    resolution: {integrity: sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-proposal-class-properties/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==}
+  /@babel/plugin-transform-modules-amd/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==}
+  /@babel/plugin-transform-modules-commonjs/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
+      '@babel/helper-module-transforms': 7.16.0
       '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-simple-access': 7.16.0
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==}
+  /@babel/plugin-transform-modules-commonjs/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==}
+  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==}
+  /@babel/plugin-transform-modules-umd/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==}
+  /@babel/plugin-transform-named-capturing-groups-regex/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==}
+  /@babel/plugin-transform-new-target/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-proposal-private-methods/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==}
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==}
+  /@babel/plugin-transform-parameters/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-annotate-as-pure': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+  /@babel/plugin-transform-react-jsx/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.16.0
+      '@babel/types': 7.16.8
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+  /@babel/plugin-transform-regenerator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      regenerator-transform: 0.14.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+  /@babel/plugin-transform-reserved-words/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+  /@babel/plugin-transform-runtime/7.16.10_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.0
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+  /@babel/plugin-transform-spread/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+  /@babel/plugin-transform-template-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+  /@babel/plugin-transform-typeof-symbol/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.0:
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+  /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
       '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==}
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==}
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-module-transforms': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/helper-simple-access': 7.16.0
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0:
-    resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==}
+  /@babel/preset-env/7.16.11_@babel+core@7.16.0:
+    resolution: {integrity: sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
+      '@babel/compat-data': 7.16.8
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-async-generator-functions': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-class-static-block': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-json-strings': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-logical-assignment-operators': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-private-methods': 7.16.11_@babel+core@7.16.0
+      '@babel/plugin-proposal-private-property-in-object': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.0
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-async-to-generator': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-computed-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-duplicate-keys': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-amd': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-commonjs': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-systemjs': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-umd': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-new-target': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-regenerator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-reserved-words': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-typeof-symbol': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/preset-modules': 0.1.5_@babel+core@7.16.0
+      '@babel/types': 7.16.8
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.0
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.0
+      core-js-compat: 3.21.0
+      semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/preset-modules/0.1.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/types': 7.16.8
+      esutils: 2.0.3
+    dev: true
+
   /@babel/preset-typescript/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-txegdrZYgO9DlPbv+9QOVpMnKbOtezsLHWsnsRF4AjbSIsVaujrq1qg8HK0mxQpWv0jnejt0yEoW1uWpvbrDTg==}
     engines: {node: '>=6.9.0'}
@@ -527,8 +1504,8 @@ packages:
       regenerator-runtime: 0.13.9
     dev: true
 
-  /@babel/runtime/7.15.3:
-    resolution: {integrity: sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==}
+  /@babel/runtime/7.16.7:
+    resolution: {integrity: sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.9
@@ -543,6 +1520,15 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/template/7.16.7:
+    resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/parser': 7.16.12
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/traverse/7.16.0:
     resolution: {integrity: sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==}
     engines: {node: '>=6.9.0'}
@@ -560,6 +1546,24 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/traverse/7.16.10:
+    resolution: {integrity: sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.16.8
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.16.12
+      '@babel/types': 7.16.8
+      debug: 4.3.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/types/7.16.0:
     resolution: {integrity: sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==}
     engines: {node: '>=6.9.0'}
@@ -568,34 +1572,42 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@es-joy/jsdoccomment/0.10.8:
-    resolution: {integrity: sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /@babel/types/7.16.8:
+    resolution: {integrity: sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@es-joy/jsdoccomment/0.18.0:
+    resolution: {integrity: sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     dependencies:
-      comment-parser: 1.2.4
+      comment-parser: 1.3.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.1.1
+      jsdoc-type-pratt-parser: 2.2.2
     dev: true
 
-  /@eslint/eslintrc/0.4.3:
-    resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@eslint/eslintrc/1.0.5:
+    resolution: {integrity: sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.2
-      espree: 7.3.1
+      espree: 9.3.0
       globals: 13.11.0
       ignore: 4.0.6
       import-fresh: 3.3.0
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       minimatch: 3.0.4
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.5.0:
-    resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==}
+  /@humanwhocodes/config-array/0.9.3:
+    resolution: {integrity: sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -719,6 +1731,28 @@ packages:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
+  /@types/prop-types/15.7.4:
+    resolution: {integrity: sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==}
+    dev: true
+
+  /@types/react-dom/17.0.11:
+    resolution: {integrity: sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==}
+    dependencies:
+      '@types/react': 17.0.38
+    dev: true
+
+  /@types/react/17.0.38:
+    resolution: {integrity: sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==}
+    dependencies:
+      '@types/prop-types': 15.7.4
+      '@types/scheduler': 0.16.2
+      csstype: 3.0.10
+    dev: true
+
+  /@types/scheduler/0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+    dev: true
+
   /@types/stack-utils/2.0.1:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
     dev: true
@@ -741,138 +1775,226 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e:
-    resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/eslint-plugin/5.10.2_0d682450f1ef58680b7f0316f2e82e26:
+    resolution: {integrity: sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/type-utils': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      debug: 4.3.2
+      eslint: 8.8.0
+      functional-red-black-tree: 1.0.1
+      ignore: 5.2.0
+      regexpp: 3.2.0
+      semver: 7.3.5
+      tsutils: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/experimental-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-stRnIlxDduzxtaVLtEohESoXI1k7J6jvJHGyIkOT2pvXbg5whPM6f9tzJ51bJJxaJTdmvwgVFDNCopFRb2F5Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/parser/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      debug: 4.3.2
+      eslint: 8.8.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/scope-manager/5.10.2:
+    resolution: {integrity: sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
+    dev: true
+
+  /@typescript-eslint/type-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      debug: 4.3.3
+      eslint: 8.8.0
+      tsutils: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/types/5.10.2:
+    resolution: {integrity: sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree/5.10.2:
+    resolution: {integrity: sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^4.0.0
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/scope-manager': 4.33.0
-      debug: 4.3.2
-      eslint: 7.32.0
-      functional-red-black-tree: 1.0.1
-      ignore: 5.1.8
-      regexpp: 3.2.0
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
+      debug: 4.3.3
+      globby: 11.0.4
+      is-glob: 4.0.3
       semver: 7.3.5
       tsutils: 3.21.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
-      eslint: 7.32.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      eslint: 8.8.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@7.32.0
+      eslint-utils: 3.0.0_eslint@8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/parser/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/visitor-keys/5.10.2:
+    resolution: {integrity: sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      eslint-visitor-keys: 3.2.0
+    dev: true
+
+  /@wordpress/babel-plugin-import-jsx-pragma/3.1.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-518mL3goaSeXtJCQcPK9OYHUUiA0sjXuoGWHBwRalkyTIQZZy5ZZzlwrlSc9ESZcOw9BZ+Uo8CJRjV2OWnx+Zw==}
+    engines: {node: '>=12'}
     peerDependencies:
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      '@babel/core': ^7.12.9
     dependencies:
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
-      debug: 4.3.2
-      eslint: 7.32.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.16.0
     dev: true
 
-  /@typescript-eslint/scope-manager/4.33.0:
-    resolution: {integrity: sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@wordpress/babel-preset-default/6.5.0:
+    resolution: {integrity: sha512-F2bv78gNz8FsSP88tEabNffiynvwgepcfustDCbhXXWZoMQoTmyu+jj1h7sjriH+9lIUmfcJifKy+QstCR1Y4w==}
+    engines: {node: '>=12'}
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@babel/core': 7.16.0
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-runtime': 7.16.10_@babel+core@7.16.0
+      '@babel/preset-env': 7.16.11_@babel+core@7.16.0
+      '@babel/preset-typescript': 7.16.0_@babel+core@7.16.0
+      '@babel/runtime': 7.16.7
+      '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.0
+      '@wordpress/browserslist-config': 4.1.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/warning': 2.3.0
+      browserslist: 4.17.6
+      core-js: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@typescript-eslint/types/4.33.0:
-    resolution: {integrity: sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@wordpress/browserslist-config/4.1.0:
+    resolution: {integrity: sha512-RSJhgY2xmz6yAdDNhz/NvAO6JS+91vv9cVL7VDG2CftbyjTXBef05vWt3FzZhfeF0xUrYdpZL1PVpxmJiKvbEg==}
+    engines: {node: '>=12'}
     dev: true
 
-  /@typescript-eslint/typescript-estree/4.33.0:
-    resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@wordpress/element/4.1.0:
+    resolution: {integrity: sha512-Q63OGOExHthL1TGJOaQKYXr2vEvkIk3jBlcMuPuY/6JhKx3h0G6GDE3J0mc9HQyydkv6XWDyATWjfP5naMjM/Q==}
+    engines: {node: '>=12'}
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
-      debug: 4.3.2
-      globby: 11.0.4
-      is-glob: 4.0.3
-      semver: 7.3.5
-      tsutils: 3.21.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/runtime': 7.16.7
+      '@types/react': 17.0.38
+      '@types/react-dom': 17.0.11
+      '@wordpress/escape-html': 2.3.0
+      lodash: 4.17.21
+      react: 17.0.2
+      react-dom: 17.0.2_react@17.0.2
     dev: true
 
-  /@typescript-eslint/visitor-keys/4.33.0:
-    resolution: {integrity: sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@wordpress/escape-html/2.3.0:
+    resolution: {integrity: sha512-QD5uid5Le3sZkKGKiXcudQKILxrSEeGltYVyQoNwbeBIhUE19DW7J0S1zqKkaaHks0jEERPIfzNThiyUh1IrVg==}
+    engines: {node: '>=12'}
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      eslint-visitor-keys: 2.1.0
+      '@babel/runtime': 7.16.7
     dev: true
 
-  /@wordpress/eslint-plugin/9.3.0_eslint@7.32.0:
-    resolution: {integrity: sha512-9F7B60gHAjiTIi9vBw5ZoH0MZW3UnmbuKols4kWpJVdgsvG4X1Wj6XXTLmQKrzh/Em7mD1CCIbCSyWknEzIOLw==}
+  /@wordpress/eslint-plugin/10.0.0_eslint@8.8.0:
+    resolution: {integrity: sha512-OMPyXLwjvnDio/f1l2+FkwwtNO2hpHkTdJe8D1ie5QpUFQgVz7n59w9USMxdJ/XR2eDDLjVv1alwXEow1go+mg==}
     engines: {node: '>=12', npm: '>=6.9'}
     peerDependencies:
-      eslint: ^6 || ^7
-      typescript: ^4
+      '@babel/core': '>=7'
+      eslint: '>=8'
+      typescript: '>=4'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@babel/eslint-parser': 7.16.5_eslint@7.32.0
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
+      '@babel/eslint-parser': 7.16.5_eslint@8.8.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@wordpress/babel-preset-default': 6.5.0
       '@wordpress/prettier-config': 1.1.1
       cosmiconfig: 7.0.1
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
-      eslint-plugin-import: 2.25.3_eslint@7.32.0
-      eslint-plugin-jest: 24.5.2_d3b4c2d4ac51f4275548d5d796aee5d5
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-jsx-a11y: 6.4.1_eslint@7.32.0
-      eslint-plugin-prettier: 3.4.1_34b707f3a53b0942f3919c1ff656ce36
-      eslint-plugin-react: 7.25.1_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.2.0_eslint@7.32.0
-      globals: 12.4.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
+      eslint-plugin-import: 2.25.3_eslint@8.8.0
+      eslint-plugin-jest: 25.7.0_2710175b8e1738b8f39f06cfa9aa7159
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.8.0
+      eslint-plugin-prettier: 3.4.1_5208900944bd53d50aafd0e7d193e6c3
+      eslint-plugin-react: 7.28.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      globals: 13.12.0
       prettier: /wp-prettier/2.2.1-beta-1
       requireindex: 1.2.0
     transitivePeerDependencies:
-      - '@babel/core'
+      - jest
       - supports-color
     dev: true
 
@@ -881,16 +2003,21 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@7.4.1:
+  /@wordpress/warning/2.3.0:
+    resolution: {integrity: sha512-Is6uEp2wvUPTK1+RtQQdzTdb93BDMAJEYE5UCHvoSFCWpxvEhBP6SY+Nzv/MkFKHZwY66QxEAduThxfINma87Q==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 7.4.1
+      acorn: 8.7.0
     dev: true
 
-  /acorn/7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+  /acorn/8.7.0:
+    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -913,15 +2040,6 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ajv/8.8.2:
-    resolution: {integrity: sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-    dev: true
-
   /allure-js-commons/2.0.0-beta.14:
     resolution: {integrity: sha512-5OlMp8kdc5FuxkquOV1ZXxJCAmFUwHnI5OqL2IlhJ65NKBeABpMwro6BbhlJqcV8iPQmh1w9bErTICSeB+Hj2A==}
     dependencies:
@@ -936,11 +2054,6 @@ packages:
       allure-js-commons: 2.0.0-beta.14
     dev: true
 
-  /ansi-colors/4.1.1:
-    resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /ansi-regex/5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -965,17 +2078,15 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /argparse/1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
-    dependencies:
-      sprintf-js: 1.0.3
+  /argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
   /aria-query/4.2.2:
     resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
     engines: {node: '>=6.0'}
     dependencies:
-      '@babel/runtime': 7.15.3
+      '@babel/runtime': 7.16.7
       '@babel/runtime-corejs3': 7.15.3
     dev: true
 
@@ -1004,27 +2115,21 @@ packages:
       es-abstract: 1.19.1
     dev: true
 
-  /array.prototype.flatmap/1.2.4:
-    resolution: {integrity: sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==}
+  /array.prototype.flatmap/1.2.5:
+    resolution: {integrity: sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.3
       es-abstract: 1.19.1
-      function-bind: 1.1.1
     dev: true
 
   /ast-types-flow/0.0.7:
     resolution: {integrity: sha1-9wtzXGvKGlycItmCw+Oef+ujva0=}
     dev: true
 
-  /astral-regex/2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /axe-core/4.3.3:
-    resolution: {integrity: sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==}
+  /axe-core/4.4.0:
+    resolution: {integrity: sha512-btWy2rze3NnxSSxb7LtNhPYYFrRoFBfjiGzmSc/5Hu47wApO2KNXjP/w7Nv2Uz/Fyr/pfEiwOkcXhDxu0jz5FA==}
     engines: {node: '>=4'}
     dev: true
 
@@ -1038,6 +2143,42 @@ packages:
       object.assign: 4.1.2
     dev: true
 
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-corejs3/0.5.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+      core-js-compat: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -1068,6 +2209,18 @@ packages:
       picocolors: 1.0.0
     dev: true
 
+  /browserslist/4.19.1:
+    resolution: {integrity: sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+    dependencies:
+      caniuse-lite: 1.0.30001304
+      electron-to-chromium: 1.4.59
+      escalade: 3.1.1
+      node-releases: 2.0.1
+      picocolors: 1.0.0
+    dev: true
+
   /buffer-crc32/0.2.13:
     resolution: {integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=}
     dev: true
@@ -1088,6 +2241,10 @@ packages:
     resolution: {integrity: sha512-psUNoaG1ilknZPxi8HuhQWobuhLqtYSRUxplfVkEJdgZNB9TETVYGSBtv4YyfAdGvE6gn2eb0ztiXqHoWJcGnw==}
     dev: true
 
+  /caniuse-lite/1.0.30001304:
+    resolution: {integrity: sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==}
+    dev: true
+
   /chalk/2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -1136,8 +2293,8 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /comment-parser/1.2.4:
-    resolution: {integrity: sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==}
+  /comment-parser/1.3.0:
+    resolution: {integrity: sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==}
     engines: {node: '>= 12.0.0'}
     dev: true
 
@@ -1158,11 +2315,23 @@ packages:
       safe-buffer: 5.1.2
     dev: true
 
+  /core-js-compat/3.21.0:
+    resolution: {integrity: sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==}
+    dependencies:
+      browserslist: 4.19.1
+      semver: 7.0.0
+    dev: true
+
   /core-js-pure/3.16.4:
     resolution: {integrity: sha512-bY1K3/1Jy9D8Jd12eoeVahNXHLfHFb4TXWI8SQ4y8bImR9qDPmGITBAfmcffTkgUvbJn87r8dILOTWW5kZzkgA==}
     requiresBuild: true
     dev: true
 
+  /core-js/3.21.0:
+    resolution: {integrity: sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==}
+    requiresBuild: true
+    dev: true
+
   /cosmiconfig/7.0.1:
     resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
     engines: {node: '>=10'}
@@ -1183,6 +2352,10 @@ packages:
       which: 2.0.2
     dev: true
 
+  /csstype/3.0.10:
+    resolution: {integrity: sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==}
+    dev: true
+
   /damerau-levenshtein/1.0.7:
     resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
     dev: true
@@ -1211,6 +2384,18 @@ packages:
       ms: 2.1.2
     dev: true
 
+  /debug/4.3.3:
+    resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+    dev: true
+
   /deep-is/0.1.3:
     resolution: {integrity: sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=}
     dev: true
@@ -1257,8 +2442,8 @@ packages:
     resolution: {integrity: sha512-5iD1zgyPpFER4kJ716VsA4MxQ6x405dxdFNCEK2mITL075VHO5ResjY0xzQUZguCww/KlBxCA6JmBA9sDt1PRw==}
     dev: true
 
-  /emoji-regex/8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+  /electron-to-chromium/1.4.59:
+    resolution: {integrity: sha512-AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg==}
     dev: true
 
   /emoji-regex/9.2.2:
@@ -1271,13 +2456,6 @@ packages:
       once: 1.4.0
     dev: true
 
-  /enquirer/2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
-    engines: {node: '>=8.6'}
-    dependencies:
-      ansi-colors: 4.1.1
-    dev: true
-
   /error-ex/1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -1339,13 +2517,13 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-config-prettier/7.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==}
+  /eslint-config-prettier/8.3.0_eslint@8.8.0:
+    resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
   /eslint-import-resolver-node/0.3.6:
@@ -1364,7 +2542,7 @@ packages:
       pkg-dir: 2.0.0
     dev: true
 
-  /eslint-plugin-import/2.25.3_eslint@7.32.0:
+  /eslint-plugin-import/2.25.3_eslint@8.8.0:
     resolution: {integrity: sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -1374,7 +2552,7 @@ packages:
       array.prototype.flat: 1.2.5
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.1
       has: 1.0.3
@@ -1386,37 +2564,39 @@ packages:
       tsconfig-paths: 3.11.0
     dev: true
 
-  /eslint-plugin-jest/24.5.2_d3b4c2d4ac51f4275548d5d796aee5d5:
-    resolution: {integrity: sha512-lrI3sGAyZi513RRmP08sIW241Ti/zMnn/6wbE4ZBhb3M2pJ9ztaZMnSKSKKBUfotVdwqU8W1KtD8ao2/FR8DIg==}
-    engines: {node: '>=10'}
+  /eslint-plugin-jest/25.7.0_2710175b8e1738b8f39f06cfa9aa7159:
+    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 4'
-      eslint: '>=5'
+      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
+      jest:
+        optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      eslint: 7.32.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/experimental-utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jsdoc/36.1.1_eslint@7.32.0:
-    resolution: {integrity: sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /eslint-plugin-jsdoc/37.7.0_eslint@8.8.0:
+    resolution: {integrity: sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@es-joy/jsdoccomment': 0.10.8
-      comment-parser: 1.2.4
-      debug: 4.3.2
-      eslint: 7.32.0
+      '@es-joy/jsdoccomment': 0.18.0
+      comment-parser: 1.3.0
+      debug: 4.3.3
+      escape-string-regexp: 4.0.0
+      eslint: 8.8.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.2.0
-      lodash: 4.17.21
       regextras: 0.8.0
       semver: 7.3.5
       spdx-expression-parse: 3.0.1
@@ -1424,28 +2604,29 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.4.1_eslint@7.32.0:
-    resolution: {integrity: sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==}
+  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.8.0:
+    resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      '@babel/runtime': 7.15.3
+      '@babel/runtime': 7.16.7
       aria-query: 4.2.2
       array-includes: 3.1.4
       ast-types-flow: 0.0.7
-      axe-core: 4.3.3
+      axe-core: 4.4.0
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.7
       emoji-regex: 9.2.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       has: 1.0.3
-      jsx-ast-utils: 3.2.0
+      jsx-ast-utils: 3.2.1
       language-tags: 1.0.5
+      minimatch: 3.0.4
     dev: true
 
-  /eslint-plugin-playwright/0.6.0_eslint@7.32.0:
-    resolution: {integrity: sha512-hccbDZcGcRAkfVa2omeTd/PCPjhjo8roZWVANYB8qBv2EGGjFNIGKkN3jzHjYQytgp5K4FKyBn/dgujPpFynjA==}
+  /eslint-plugin-playwright/0.8.0_eslint@8.8.0:
+    resolution: {integrity: sha512-9uJH25m6H3jwU5O7bHD5M8cLx46L72EnIUe3dZqTox6M+WzOFzeUWaDJHHCdLGXZ8XlAU4mbCZnP7uhjKepfRA==}
     peerDependencies:
       eslint: '>=7'
       eslint-plugin-jest: '>=24'
@@ -1453,10 +2634,10 @@ packages:
       eslint-plugin-jest:
         optional: true
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-prettier/3.4.1_34b707f3a53b0942f3919c1ff656ce36:
+  /eslint-plugin-prettier/3.4.1_5208900944bd53d50aafd0e7d193e6c3:
     resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -1467,41 +2648,42 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
       prettier: /wp-prettier/2.2.1-beta-1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==}
+  /eslint-plugin-react-hooks/4.3.0_eslint@8.8.0:
+    resolution: {integrity: sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==}
     engines: {node: '>=10'}
     peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-react/7.25.1_eslint@7.32.0:
-    resolution: {integrity: sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==}
+  /eslint-plugin-react/7.28.0_eslint@8.8.0:
+    resolution: {integrity: sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==}
     engines: {node: '>=4'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
       array-includes: 3.1.4
-      array.prototype.flatmap: 1.2.4
+      array.prototype.flatmap: 1.2.5
       doctrine: 2.1.0
-      eslint: 7.32.0
-      estraverse: 5.2.0
-      has: 1.0.3
+      eslint: 8.8.0
+      estraverse: 5.3.0
       jsx-ast-utils: 3.2.0
       minimatch: 3.0.4
-      object.entries: 1.1.4
-      object.fromentries: 2.0.4
+      object.entries: 1.1.5
+      object.fromentries: 2.0.5
+      object.hasown: 1.1.0
       object.values: 1.1.5
       prop-types: 15.7.2
       resolve: 2.0.0-next.3
-      string.prototype.matchall: 4.0.5
+      semver: 6.3.0
+      string.prototype.matchall: 4.0.6
     dev: true
 
   /eslint-scope/5.1.1:
@@ -1512,95 +2694,85 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-utils/2.1.0:
-    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
-    engines: {node: '>=6'}
+  /eslint-scope/7.1.0:
+    resolution: {integrity: sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      eslint-visitor-keys: 1.3.0
+      esrecurse: 4.3.0
+      estraverse: 5.2.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@7.32.0:
+  /eslint-utils/3.0.0_eslint@8.8.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/1.3.0:
-    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /eslint-visitor-keys/2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint/7.32.0:
-    resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /eslint-visitor-keys/3.2.0:
+    resolution: {integrity: sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint/8.8.0:
+    resolution: {integrity: sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@babel/code-frame': 7.12.11
-      '@eslint/eslintrc': 0.4.3
-      '@humanwhocodes/config-array': 0.5.0
+      '@eslint/eslintrc': 1.0.5
+      '@humanwhocodes/config-array': 0.9.3
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
       debug: 4.3.2
       doctrine: 3.0.0
-      enquirer: 2.3.6
       escape-string-regexp: 4.0.0
-      eslint-scope: 5.1.1
-      eslint-utils: 2.1.0
-      eslint-visitor-keys: 2.1.0
-      espree: 7.3.1
+      eslint-scope: 7.1.0
+      eslint-utils: 3.0.0_eslint@8.8.0
+      eslint-visitor-keys: 3.2.0
+      espree: 9.3.0
       esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       functional-red-black-tree: 1.0.1
-      glob-parent: 5.1.2
+      glob-parent: 6.0.2
       globals: 13.11.0
-      ignore: 4.0.6
+      ignore: 5.2.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.0.4
       natural-compare: 1.4.0
       optionator: 0.9.1
-      progress: 2.0.3
       regexpp: 3.2.0
-      semver: 7.3.5
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
-      table: 6.7.5
       text-table: 0.2.0
       v8-compile-cache: 2.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /espree/7.3.1:
-    resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /espree/9.3.0:
+    resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 7.4.1
-      acorn-jsx: 5.3.2_acorn@7.4.1
-      eslint-visitor-keys: 1.3.0
-    dev: true
-
-  /esprima/4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
+      acorn: 8.7.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
+      eslint-visitor-keys: 3.2.0
     dev: true
 
   /esquery/1.4.0:
@@ -1627,6 +2799,11 @@ packages:
     engines: {node: '>=4.0'}
     dev: true
 
+  /estraverse/5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+    dev: true
+
   /esutils/2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -1777,6 +2954,13 @@ packages:
       is-glob: 4.0.3
     dev: true
 
+  /glob-parent/6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: 4.0.3
+    dev: true
+
   /glob/7.1.7:
     resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==}
     dependencies:
@@ -1793,15 +2977,15 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /globals/12.4.0:
-    resolution: {integrity: sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==}
+  /globals/13.11.0:
+    resolution: {integrity: sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==}
     engines: {node: '>=8'}
     dependencies:
-      type-fest: 0.8.1
+      type-fest: 0.20.2
     dev: true
 
-  /globals/13.11.0:
-    resolution: {integrity: sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==}
+  /globals/13.12.0:
+    resolution: {integrity: sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -1814,7 +2998,7 @@ packages:
       array-union: 2.1.0
       dir-glob: 3.0.1
       fast-glob: 3.2.7
-      ignore: 5.1.8
+      ignore: 5.2.0
       merge2: 1.4.1
       slash: 3.0.0
     dev: true
@@ -1871,8 +3055,8 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
-  /ignore/5.1.8:
-    resolution: {integrity: sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==}
+  /ignore/5.2.0:
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
     dev: true
 
@@ -1960,11 +3144,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-fullwidth-code-point/3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-    dev: true
-
   /is-glob/4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -2095,22 +3274,21 @@ packages:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-yaml/3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  /js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
+      argparse: 2.0.1
     dev: true
 
-  /jsdoc-type-pratt-parser/1.1.1:
-    resolution: {integrity: sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==}
+  /jsdoc-type-pratt-parser/2.2.2:
+    resolution: {integrity: sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==}
     engines: {node: '>=12.0.0'}
     dev: true
 
-  /jsdoc-type-pratt-parser/1.2.0:
-    resolution: {integrity: sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==}
-    engines: {node: '>=12.0.0'}
+  /jsesc/0.5.0:
+    resolution: {integrity: sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=}
+    hasBin: true
     dev: true
 
   /jsesc/2.5.2:
@@ -2127,10 +3305,6 @@ packages:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-schema-traverse/1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
-
   /json-stable-stringify-without-jsonify/1.0.1:
     resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
     dev: true
@@ -2158,6 +3332,14 @@ packages:
       object.assign: 4.1.2
     dev: true
 
+  /jsx-ast-utils/3.2.1:
+    resolution: {integrity: sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      array-includes: 3.1.4
+      object.assign: 4.1.2
+    dev: true
+
   /language-subtag-registry/0.3.21:
     resolution: {integrity: sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==}
     dev: true
@@ -2188,12 +3370,12 @@ packages:
       path-exists: 3.0.0
     dev: true
 
-  /lodash.merge/4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha1-gteb/zCmfEAF/9XiUVMArZyk168=}
     dev: true
 
-  /lodash.truncate/4.4.2:
-    resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=}
+  /lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
   /lodash/4.17.21:
@@ -2298,8 +3480,8 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /object.entries/1.1.4:
-    resolution: {integrity: sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==}
+  /object.entries/1.1.5:
+    resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
@@ -2307,14 +3489,20 @@ packages:
       es-abstract: 1.19.1
     dev: true
 
-  /object.fromentries/2.0.4:
-    resolution: {integrity: sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==}
+  /object.fromentries/2.0.5:
+    resolution: {integrity: sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.3
       es-abstract: 1.19.1
-      has: 1.0.3
+    dev: true
+
+  /object.hasown/1.1.0:
+    resolution: {integrity: sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==}
+    dependencies:
+      define-properties: 1.1.3
+      es-abstract: 1.19.1
     dev: true
 
   /object.values/1.1.5:
@@ -2552,6 +3740,17 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
+  /react-dom/17.0.2_react@17.0.2:
+    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
+    peerDependencies:
+      react: 17.0.2
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react: 17.0.2
+      scheduler: 0.20.2
+    dev: true
+
   /react-is/16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
     dev: true
@@ -2560,10 +3759,35 @@ packages:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
 
+  /react/17.0.2:
+    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
+  /regenerate-unicode-properties/9.0.0:
+    resolution: {integrity: sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+    dev: true
+
+  /regenerate/1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+    dev: true
+
   /regenerator-runtime/0.13.9:
     resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
     dev: true
 
+  /regenerator-transform/0.14.5:
+    resolution: {integrity: sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==}
+    dependencies:
+      '@babel/runtime': 7.16.7
+    dev: true
+
   /regexp.prototype.flags/1.3.1:
     resolution: {integrity: sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==}
     engines: {node: '>= 0.4'}
@@ -2577,14 +3801,32 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /regexpu-core/4.8.0:
+    resolution: {integrity: sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 9.0.0
+      regjsgen: 0.5.2
+      regjsparser: 0.7.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.0.0
+    dev: true
+
   /regextras/0.8.0:
     resolution: {integrity: sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==}
     engines: {node: '>=0.1.14'}
     dev: true
 
-  /require-from-string/2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
+  /regjsgen/0.5.2:
+    resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==}
+    dev: true
+
+  /regjsparser/0.7.0:
+    resolution: {integrity: sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
     dev: true
 
   /requireindex/1.2.0:
@@ -2638,11 +3880,23 @@ packages:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: true
 
+  /scheduler/0.20.2:
+    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
   /semver/6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
     dev: true
 
+  /semver/7.0.0:
+    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
+    hasBin: true
+    dev: true
+
   /semver/7.3.5:
     resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==}
     engines: {node: '>=10'}
@@ -2680,15 +3934,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /slice-ansi/4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
   /smart-buffer/4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -2739,10 +3984,6 @@ packages:
     resolution: {integrity: sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==}
     dev: true
 
-  /sprintf-js/1.0.3:
-    resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=}
-    dev: true
-
   /stack-utils/2.0.3:
     resolution: {integrity: sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==}
     engines: {node: '>=10'}
@@ -2750,17 +3991,8 @@ packages:
       escape-string-regexp: 2.0.0
     dev: true
 
-  /string-width/4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-    dev: true
-
-  /string.prototype.matchall/4.0.5:
-    resolution: {integrity: sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==}
+  /string.prototype.matchall/4.0.6:
+    resolution: {integrity: sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.3
@@ -2817,17 +4049,6 @@ packages:
       has-flag: 4.0.0
     dev: true
 
-  /table/6.7.5:
-    resolution: {integrity: sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==}
-    engines: {node: '>=10.0.0'}
-    dependencies:
-      ajv: 8.8.2
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /text-table/0.2.0:
     resolution: {integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=}
     dev: true
@@ -2878,11 +4099,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /unbox-primitive/1.0.1:
     resolution: {integrity: sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==}
     dependencies:
@@ -2892,6 +4108,29 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
+  /unicode-canonical-property-names-ecmascript/2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-match-property-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.0.0
+    dev: true
+
+  /unicode-match-property-value-ecmascript/2.0.0:
+    resolution: {integrity: sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-property-aliases-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==}
+    engines: {node: '>=4'}
+    dev: true
+
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
diff --git a/projects/plugins/boost/tests/e2e/specs/common.test.js b/projects/plugins/boost/tests/e2e/specs/common.test.js
index 5ce881b0c2d8a..3ae9fa03d4e17 100644
--- a/projects/plugins/boost/tests/e2e/specs/common.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/common.test.js
@@ -39,7 +39,6 @@ test( 'Deactivating the plugin should clear Critical CSS and Dismissed Recommend
 		.withActiveModules( [ 'critical-css' ] )
 		.build();
 	const jetpackBoostPage = await JetpackBoostPage.visit( page );
-	expect( await jetpackBoostPage.waitForCriticalCssGenerationProgressUIVisibility() ).toBeTruthy();
 	expect( await jetpackBoostPage.waitForCriticalCssMetaInfoVisibility() ).toBeTruthy();
 	await DashboardPage.visit( page );
 	await ( await Sidebar.init( page ) ).selectInstalledPlugins();
diff --git a/projects/plugins/boost/tests/e2e/specs/connection.test.js b/projects/plugins/boost/tests/e2e/specs/connection.test.js
index dbce9a70d2812..971ca2bc3e191 100644
--- a/projects/plugins/boost/tests/e2e/specs/connection.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/connection.test.js
@@ -10,7 +10,9 @@ test.describe( 'Settings Page Connection', () => {
 		await prerequisitesBuilder().withActivePlugins( [ 'jetpack' ] ).withConnection( true ).build();
 		await boostPrerequisitesBuilder().withConnection( false ).build();
 		const jetpackBoostPage = await JetpackBoostPage.visit( page );
-		expect( await jetpackBoostPage.isFreshlyConnected() ).toBeTruthy();
+		expect( await jetpackBoostPage.isAwaitingConnection() ).toBeTruthy();
+		await jetpackBoostPage.connect();
+		expect( await jetpackBoostPage.isConnected() ).toBeTruthy();
 	} );
 
 	test( 'Should connect to WP.com on a fresh install with Jetpack plugin activated', async ( {
@@ -18,7 +20,9 @@ test.describe( 'Settings Page Connection', () => {
 	} ) => {
 		await boostPrerequisitesBuilder( page ).withCleanEnv( true ).withConnection( false ).build();
 		const jetpackBoostPage = await JetpackBoostPage.visit( page );
-		expect( await jetpackBoostPage.isFreshlyConnected() ).toBeTruthy();
+		expect( await jetpackBoostPage.isAwaitingConnection() ).toBeTruthy();
+		await jetpackBoostPage.connect();
+		expect( await jetpackBoostPage.isConnected() ).toBeTruthy();
 	} );
 
 	test( 'Should connect to WP.com on a fresh install without Jetpack plugin activated', async ( {
@@ -27,6 +31,8 @@ test.describe( 'Settings Page Connection', () => {
 		await prerequisitesBuilder().withInactivePlugins( [ 'jetpack' ] ).build();
 		await boostPrerequisitesBuilder( page ).withCleanEnv( true ).withConnection( false ).build();
 		const jetpackBoostPage = await JetpackBoostPage.visit( page );
-		expect( await jetpackBoostPage.isFreshlyConnected() ).toBeTruthy();
+		expect( await jetpackBoostPage.isAwaitingConnection() ).toBeTruthy();
+		await jetpackBoostPage.connect();
+		expect( await jetpackBoostPage.isConnected() ).toBeTruthy();
 	} );
 } );
diff --git a/projects/plugins/boost/tests/e2e/specs/speed-score.test.js b/projects/plugins/boost/tests/e2e/specs/speed-score.test.js
index 27c4a5e40bde0..ba909afb820e0 100644
--- a/projects/plugins/boost/tests/e2e/specs/speed-score.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/speed-score.test.js
@@ -1,9 +1,20 @@
 import { test, expect } from '../fixtures/base-test.js';
+import { boostPrerequisitesBuilder } from '../lib/env/prerequisites.js';
 import { JetpackBoostPage } from '../lib/pages/index.js';
 
 let jetpackBoostPage;
 
 test.describe( 'Speed Score feature', () => {
+	test.beforeAll( async ( { browser } ) => {
+		const page = await browser.newPage();
+		await boostPrerequisitesBuilder( page ).withSpeedScoreMocked( false ).build();
+	} );
+
+	test.afterAll( async ( { browser } ) => {
+		const page = await browser.newPage();
+		await boostPrerequisitesBuilder( page ).withSpeedScoreMocked( true ).build();
+	} );
+
 	test.beforeEach( async function ( { page } ) {
 		jetpackBoostPage = await JetpackBoostPage.visit( page );
 	} );
diff --git a/projects/plugins/boost/tests/php/lib/test-class-speed-score-history.php b/projects/plugins/boost/tests/php/lib/test-class-speed-score-history.php
index 22a4af3ae609c..7472da164365f 100644
--- a/projects/plugins/boost/tests/php/lib/test-class-speed-score-history.php
+++ b/projects/plugins/boost/tests/php/lib/test-class-speed-score-history.php
@@ -2,7 +2,7 @@
 //phpcs:ignoreFile
 namespace Automattic\Jetpack_Boost\Tests\Lib;
 
-use Automattic\Jetpack_Boost\Lib\Speed_Score_History;
+use Automattic\Jetpack_Boost\Features\Speed_Score\Speed_Score_History;
 use Automattic\Jetpack_Boost\Tests\Base_Test_Case;
 use Brain\Monkey\Functions;
 
diff --git a/projects/plugins/boost/tests/php/mocks/mock-module.php b/projects/plugins/boost/tests/php/mocks/mock-module.php
deleted file mode 100644
index 7930e55eee708..0000000000000
--- a/projects/plugins/boost/tests/php/mocks/mock-module.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php //phpcs:ignoreFile
-
-namespace Automattic\Jetpack_Boost\Tests\Mocks;
-
-use Automattic\Jetpack_Boost\Modules\Module;
-
-/**
- * Class Mock_Module
- */
-Class Mock_Module extends Module {
-	protected function on_initialize() {}
-}
diff --git a/projects/plugins/boost/tests/php/modules/test-class-module.php b/projects/plugins/boost/tests/php/modules/test-class-module.php
deleted file mode 100644
index 3d8b3b02b8242..0000000000000
--- a/projects/plugins/boost/tests/php/modules/test-class-module.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php //phpcs:ignoreFile
-/**
- * Test Module Base Class.
- */
-
-namespace Automattic\Jetpack_Boost\Tests\Modules;
-
-use Automattic\Jetpack_Boost\Tests\Base_Test_Case;
-use Automattic\Jetpack_Boost\Tests\Mocks\Mock_Module;
-
-/**
- * Class WP_Test_Module
- *
- * @package Automattic\Jetpack_Boost\Tests\Modules
- */
-class WP_Test_Module extends Base_Test_Case {
-
-	/**
-	 * Test deactivation hook.
-	 */
-	public function test_deactivate_hook() {
-		$module = new Mock_Module();
-		$this->assertEquals( 10, has_action( 'jetpack_boost_deactivate', [ $module, 'on_deactivate' ] ) );
-	}
-
-	/**
-	 * Test uninstall hook.
-	 */
-	public function test_uninstall_hook() {
-		$module = new Mock_Module();
-		$this->assertEquals( 10, has_action( 'jetpack_boost_uninstall', [ $module, 'on_uninstall' ] ) );
-	}
-}
diff --git a/projects/plugins/debug-helper/changelog/add-disallow-relative-includes-2 b/projects/plugins/debug-helper/changelog/add-disallow-relative-includes-2
new file mode 100644
index 0000000000000..d455739c9d693
--- /dev/null
+++ b/projects/plugins/debug-helper/changelog/add-disallow-relative-includes-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed minor coding standard violation.
diff --git a/projects/plugins/debug-helper/modules/class-broken-token.php b/projects/plugins/debug-helper/modules/class-broken-token.php
index 3d842c8324316..828347bd7b870 100644
--- a/projects/plugins/debug-helper/modules/class-broken-token.php
+++ b/projects/plugins/debug-helper/modules/class-broken-token.php
@@ -12,7 +12,7 @@
 /**
  * Require the XMLRPC functionality.
  */
-require 'inc/class-broken-token-xmlrpc.php';
+require __DIR__ . '/inc/class-broken-token-xmlrpc.php';
 
 /**
  * Class Broken_Token
diff --git a/projects/plugins/debug-helper/plugin.php b/projects/plugins/debug-helper/plugin.php
index d0e8b958978dc..82e24c0b0a249 100644
--- a/projects/plugins/debug-helper/plugin.php
+++ b/projects/plugins/debug-helper/plugin.php
@@ -71,7 +71,7 @@
 	),
 );
 
-require_once 'class-admin.php';
+require_once __DIR__ . '/class-admin.php';
 
 foreach ( (array) Admin::get_active_modules() as $module ) {
 	if ( isset( $jetpack_dev_debug_modules[ $module ] ) ) {
diff --git a/projects/plugins/jetpack/.eslintignore b/projects/plugins/jetpack/.eslintignore
index a16083c696314..fd13b6b4f1584 100644
--- a/projects/plugins/jetpack/.eslintignore
+++ b/projects/plugins/jetpack/.eslintignore
@@ -9,7 +9,6 @@
 /modules/custom-css/custom-css/js/core-customizer-css-preview.js
 /modules/custom-css/custom-css/js/core-customizer-css.core-4.9.js
 /modules/custom-css/custom-css/js/core-customizer-css.js
-/modules/widgets/search/js/search-widget-admin.js
 
 # Temporary ignore until Jest is set up
 /extensions/**/test/
diff --git a/projects/plugins/jetpack/.gitattributes b/projects/plugins/jetpack/.gitattributes
index 6ed305c7dfdc2..34d754ec559ea 100644
--- a/projects/plugins/jetpack/.gitattributes
+++ b/projects/plugins/jetpack/.gitattributes
@@ -20,6 +20,7 @@
 # Files to exclude from Automattic/jetpack-production.
 # Remember to end all directories with `/**` to properly tag every file.
 .eslintrc.js                                             production-exclude
+.eslintignore                                            production-exclude
 /.gitattributes                                          production-exclude
 /.gitignore                                              production-exclude
 /.phpcs.dir.xml                                          production-exclude
diff --git a/projects/plugins/jetpack/3rd-party/bbpress.php b/projects/plugins/jetpack/3rd-party/bbpress.php
index 86d6f13f05a6e..4db4523a7ddf1 100644
--- a/projects/plugins/jetpack/3rd-party/bbpress.php
+++ b/projects/plugins/jetpack/3rd-party/bbpress.php
@@ -23,7 +23,7 @@ function jetpack_bbpress_compat() {
 	 *
 	 * @since 8.5.0 Moved from root-level file and check_rest_api_compat()
 	 */
-	require_once 'class-jetpack-bbpress-rest-api.php';
+	require_once __DIR__ . '/class-jetpack-bbpress-rest-api.php';
 	Jetpack_BbPress_REST_API::instance();
 
 	// Adds sharing buttons to bbPress items.
diff --git a/projects/plugins/jetpack/3rd-party/class-jetpack-crm-data.php b/projects/plugins/jetpack/3rd-party/class-jetpack-crm-data.php
index 21c01ce5a2400..85de4a1e54e18 100644
--- a/projects/plugins/jetpack/3rd-party/class-jetpack-crm-data.php
+++ b/projects/plugins/jetpack/3rd-party/class-jetpack-crm-data.php
@@ -22,8 +22,7 @@ class Jetpack_CRM_Data {
 	 * @return array An array containing the Jetpack CRM plugin data.
 	 */
 	public function get_crm_data() {
-		jetpack_require_lib( 'plugins' );
-		$plugins = \Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 
 		// Set default values.
 		$response = array(
diff --git a/projects/plugins/jetpack/3rd-party/creative-mail.php b/projects/plugins/jetpack/3rd-party/creative-mail.php
index 957a8a2d4ee13..b0fc602b08048 100644
--- a/projects/plugins/jetpack/3rd-party/creative-mail.php
+++ b/projects/plugins/jetpack/3rd-party/creative-mail.php
@@ -10,6 +10,8 @@
 
 namespace Automattic\Jetpack\Creative_Mail;
 
+use Automattic\Jetpack\Plugins_Installer;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -67,8 +69,7 @@ function try_install() {
  * @return bool result of installation
  */
 function install_and_activate() {
-	jetpack_require_lib( 'plugins' );
-	$result = \Jetpack_Plugins::install_and_activate_plugin( PLUGIN_SLUG );
+	$result = Plugins_Installer::install_and_activate_plugin( PLUGIN_SLUG );
 
 	if ( is_wp_error( $result ) ) {
 		return false;
diff --git a/projects/plugins/jetpack/3rd-party/debug-bar/class-jetpack-search-debug-bar.php b/projects/plugins/jetpack/3rd-party/debug-bar/class-jetpack-search-debug-bar.php
index 1a486a07bac5d..083e3e00b5b55 100644
--- a/projects/plugins/jetpack/3rd-party/debug-bar/class-jetpack-search-debug-bar.php
+++ b/projects/plugins/jetpack/3rd-party/debug-bar/class-jetpack-search-debug-bar.php
@@ -5,6 +5,8 @@
  * @package automattic/jetpack
  */
 
+use Automattic\Jetpack\Search as Jetpack_Search;
+
 /**
  * Singleton class instantiated by Jetpack_Searc_Debug_Bar::instance() that handles
  * rendering the Jetpack Search debug bar menu item and panel.
@@ -91,7 +93,11 @@ public function is_visible() {
 	 * @return void
 	 */
 	public function render() {
-		$jetpack_search  = Automattic\Jetpack\Search\Classic_Search::instance();
+		$jetpack_search  = (
+			Jetpack_Search\Options::is_instant_enabled() ?
+			Jetpack_Search\Instant_Search::instance() :
+			Jetpack_Search\Classic_Search::instance()
+		);
 		$last_query_info = $jetpack_search->get_last_query_info();
 
 		// If not empty, let's reshuffle the order of some things.
diff --git a/projects/plugins/jetpack/3rd-party/jetpack-backup.php b/projects/plugins/jetpack/3rd-party/jetpack-backup.php
index ec1880b3a1816..14ee285affcef 100644
--- a/projects/plugins/jetpack/3rd-party/jetpack-backup.php
+++ b/projects/plugins/jetpack/3rd-party/jetpack-backup.php
@@ -10,6 +10,8 @@
 
 namespace Automattic\Jetpack\Jetpack_Backup;
 
+use Automattic\Jetpack\Plugins_Installer;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -67,8 +69,7 @@ function try_install() {
  * @return bool result of installation
  */
 function install_and_activate() {
-	jetpack_require_lib( 'plugins' );
-	$result = \Jetpack_Plugins::install_and_activate_plugin( PLUGIN_SLUG );
+	$result = Plugins_Installer::install_and_activate_plugin( PLUGIN_SLUG );
 
 	if ( is_wp_error( $result ) ) {
 		return false;
diff --git a/projects/plugins/jetpack/3rd-party/jetpack-boost.php b/projects/plugins/jetpack/3rd-party/jetpack-boost.php
index 328078c1c48f5..163cde40e31bc 100644
--- a/projects/plugins/jetpack/3rd-party/jetpack-boost.php
+++ b/projects/plugins/jetpack/3rd-party/jetpack-boost.php
@@ -10,6 +10,8 @@
 
 namespace Automattic\Jetpack\Jetpack_Boost;
 
+use Automattic\Jetpack\Plugins_Installer;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -67,8 +69,7 @@ function try_install() {
  * @return bool result of installation
  */
 function install_and_activate() {
-	jetpack_require_lib( 'plugins' );
-	$result = \Jetpack_Plugins::install_and_activate_plugin( PLUGIN_SLUG );
+	$result = Plugins_Installer::install_and_activate_plugin( PLUGIN_SLUG );
 
 	if ( is_wp_error( $result ) ) {
 		return false;
diff --git a/projects/plugins/jetpack/3rd-party/woocommerce-services.php b/projects/plugins/jetpack/3rd-party/woocommerce-services.php
index 87212cdc7f61f..68074944dc280 100644
--- a/projects/plugins/jetpack/3rd-party/woocommerce-services.php
+++ b/projects/plugins/jetpack/3rd-party/woocommerce-services.php
@@ -1,5 +1,7 @@
 <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
+use Automattic\Jetpack\Plugins_Installer;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -126,8 +128,7 @@ public function error_notice() {
 	 * @return bool result of installation
 	 */
 	private function install() {
-		jetpack_require_lib( 'plugins' );
-		$result = Jetpack_Plugins::install_plugin( 'woocommerce-services' );
+		$result = Plugins_Installer::install_plugin( 'woocommerce-services' );
 
 		if ( is_wp_error( $result ) ) {
 			return false;
diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
index 3f6b416836507..878e5f2c961fc 100644
--- a/projects/plugins/jetpack/CHANGELOG.md
+++ b/projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,66 @@
 
 ### This is a list detailing changes for all Jetpack releases.
 
+## 10.7-a.1 - 2022-02-02
+### Enhancements
+- Add an AMP-compatible version of the email share button.
+- Add transformation from core/buttons to jetpack/recurring-payments block (requires gutenberg >= 11.5.0).
+- Business Hours: Add support for color & spacing design tool.
+- Changed the plan description for invalid plans and added a Warning message for Premium content blocks with invalid plans.
+- Dashboard: update the links used to purchase plans when in Jetpack settings.
+
+### Improved compatibility
+- My Community widget: Hide widget from the block inserter and Legacy widget block drop-down menu
+
+### Bug fixes
+- Fixed several React warnings shown on the console when SCRIPT_DEBUG is active
+- Search: avoid PHP warning when using Search widget.
+- Widget Visibility: ensure role and logged in features are available.
+
+### Other changes <!-- Non-user-facing changes go here. This section will not be copied to readme.txt. -->
+- Added 'jetpack_related_posts_display_markup' filter to update the output HTML of Related Posts module
+- Extract Jetpack_Plugins class to its own package
+- Blocks: Update block fixture docs for running phpunit tests.
+- Build: remove unneeded files from production build.
+- Payments Block: remove wrapper around icons.
+- Updated package dependencies
+- Reduced the data set for the Search Sync tests to speed up the process.
+- Update internal logic for rendering Dashboard sections.
+
+## 10.6 - 2022-02-01
+### Enhancements
+- Contact Info and Markdown Blocks: add color, typography and spacing features.
+- Dashboard: support Beta versions of Automattic plugins in plugin cards.
+- Search: improve accessibility via headings hierarchy and aria roles.
+- Tiled Gallery Block: improve the block so it can be used within the mobile applications.
+
+### Improved compatibility
+- Instant Search: synchronize more meta data so the search feature can be used with more third-party plugins.
+- Sharing / AMP plugin: avoid adding sharing's CSS on AMP pages when the sharing feature is not active.
+
+### Bug fixes
+- Backups: hide backup preparation message for sites without backup.
+- Connection: correctly request list of active features so they can be activated on a reconnection.
+- Pay with Paypal Block: properly display the card icons below the button.
+- Scan: avoid PHP notice when non-admin users access the dashboard.
+- Search: Initialize debug bar using correct class
+- Widget Visibility: ensure it remains possible to edit visibility for legacy widgets in the block-based widget editor.
+
+### Other changes <!-- Non-user-facing changes go here. This section will not be copied to readme.txt. -->
+- Add a comment to explain the reasoning behind an empty scss file.
+- Change usage of filter_var to filter_input in markdown file.
+- Comment: phpcs linting cleanup.
+- Cover block: avoid the block's placeholder rendering on top of other blocks.
+- Dashboard: update CTAs (wording, layout) in the At A Glance section.
+- Fixed development mode prop type warning in UserLicenseActivationNotice component.
+- Fix PHPCS sniffs in root classes.
+- PHPCS fixes for site verification tools.
+- phpcs fixes for the markdown module
+- Search: add E2E tests for Customberg
+- Search: added E2E tests for the search dashboard
+- Updated package dependencies.
+- Use new Visitor class for determining IP address.
+
 ## 10.6-a.3 - 2022-01-18
 ### Enhancements
 - Embeds: add support for Descript.com embeds.
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/backups.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/backups.jsx
index cbca7ecd8d003..776e54c546b3c 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/backups.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/backups.jsx
@@ -10,7 +10,7 @@ import { get, isEmpty, noop } from 'lodash';
  * WordPress dependencies
  */
 import { createInterpolateElement } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { getRedirectUrl } from '@automattic/jetpack-components';
 
 /**
@@ -38,7 +38,7 @@ import {
 import { isPluginInstalled } from 'state/site/plugins';
 import { getVaultPressData } from 'state/at-a-glance';
 import { hasConnectedOwner, isOfflineMode, connectUser } from 'state/connection';
-import { showBackups } from 'state/initial-state';
+import { getPartnerCoupon, showBackups } from 'state/initial-state';
 
 /**
  * Displays a card for Backups based on the props given.
@@ -102,6 +102,84 @@ class DashBackups extends Component {
 		} );
 	};
 
+	trackRedeemCouponButtonView = () => {
+		const { partnerCoupon } = this.props;
+
+		analytics.tracks.recordEvent( 'jetpack_wpa_aag_redeem_partner_coupon_button_view', {
+			feature: 'backups',
+			coupon_preset: partnerCoupon.preset,
+		} );
+	};
+
+	getJetpackBackupBanner() {
+		const { partnerCoupon, upgradeUrl, siteRawUrl, trackUpgradeButtonView } = this.props;
+
+		if ( this.props.hasConnectedOwner ) {
+			if ( partnerCoupon && 'jetpack_backup_daily' === partnerCoupon.product.slug ) {
+				const checkoutUrl = getRedirectUrl( 'jetpack-plugin-partner-coupon-checkout', {
+					path: partnerCoupon.product.slug,
+					site: siteRawUrl,
+					query: `coupon=${ partnerCoupon.coupon_code }`,
+				} );
+
+				return (
+					<JetpackBanner
+						callToAction={ __( 'Redeem', 'jetpack' ) }
+						title={ sprintf(
+							/* translators: %s: Name of a Jetpack product. */
+							__(
+								'Redeem your coupon and get started with %s for free the first year!',
+								'jetpack'
+							),
+							partnerCoupon.product.title
+						) }
+						disableHref="false"
+						href={ checkoutUrl }
+						eventFeature="backups"
+						path="dashboard"
+						eventProps={ {
+							type: 'redeem_partner_coupon',
+							coupon_preset: partnerCoupon.preset,
+						} }
+						plan={ getJetpackProductUpsellByFeature( FEATURE_SITE_BACKUPS_JETPACK ) }
+						trackBannerDisplay={ this.trackRedeemCouponButtonView }
+					/>
+				);
+			}
+
+			return (
+				<JetpackBanner
+					callToAction={ __( 'Upgrade', 'jetpack' ) }
+					title={ __(
+						'Never worry about losing your site – automatic backups keep your content safe.',
+						'jetpack'
+					) }
+					disableHref="false"
+					href={ upgradeUrl }
+					eventFeature="backups"
+					path="dashboard"
+					plan={ getJetpackProductUpsellByFeature( FEATURE_SITE_BACKUPS_JETPACK ) }
+					trackBannerDisplay={ trackUpgradeButtonView }
+				/>
+			);
+		}
+
+		return (
+			<JetpackBanner
+				callToAction={ __( 'Connect', 'jetpack' ) }
+				title={ __(
+					'Connect your WordPress.com account to upgrade and get automatic backups that keep your content safe.',
+					'jetpack'
+				) }
+				disableHref="false"
+				onClick={ this.props.connectUser }
+				eventFeature="backups"
+				path="dashboard"
+				plan={ getJetpackProductUpsellByFeature( FEATURE_SITE_BACKUPS_JETPACK ) }
+			/>
+		);
+	}
+
 	getVPContent() {
 		const {
 			sitePlan,
@@ -163,34 +241,7 @@ class DashBackups extends Component {
 			return renderCard( {
 				className: 'jp-dash-item__is-inactive',
 				status: 'no-pro-uninstalled-or-inactive',
-				overrideContent: this.props.hasConnectedOwner ? (
-					<JetpackBanner
-						callToAction={ __( 'Upgrade', 'jetpack' ) }
-						title={ __(
-							'Never worry about losing your site – automatic backups keep your content safe.',
-							'jetpack'
-						) }
-						disableHref="false"
-						href={ this.props.upgradeUrl }
-						eventFeature="backups"
-						path="dashboard"
-						plan={ getJetpackProductUpsellByFeature( FEATURE_SITE_BACKUPS_JETPACK ) }
-						trackBannerDisplay={ this.props.trackUpgradeButtonView }
-					/>
-				) : (
-					<JetpackBanner
-						callToAction={ __( 'Connect', 'jetpack' ) }
-						title={ __(
-							'Connect your WordPress.com account to upgrade and get automatic backups that keep your content safe.',
-							'jetpack'
-						) }
-						disableHref="false"
-						onClick={ this.props.connectUser }
-						eventFeature="backups"
-						path="dashboard"
-						plan={ getJetpackProductUpsellByFeature( FEATURE_SITE_BACKUPS_JETPACK ) }
-					/>
-				),
+				overrideContent: this.getJetpackBackupBanner(),
 			} );
 		}
 
@@ -334,6 +385,7 @@ export default connect(
 			hasConnectedOwner: hasConnectedOwner( state ),
 			isFetchingSite: isFetchingSiteData( state ),
 			hasBackupPlan: siteHasBackupPlan( state ),
+			partnerCoupon: getPartnerCoupon( state ),
 		};
 	},
 	dispatch => ( {
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/index.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/index.jsx
index 99f4c30c4e8b2..4f7b7cc88b202 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/index.jsx
@@ -39,18 +39,6 @@ import { isOfflineMode, hasConnectedOwner } from 'state/connection';
 import { getModuleOverride } from 'state/modules';
 import { getScanStatus, isFetchingScanStatus } from 'state/scan';
 
-const renderPairs = layout =>
-	layout.map( ( item, layoutIndex ) => [
-		item.header,
-		item.pinnedBundle,
-		chunk( item.cards, 2 ).map( ( [ left, right ], cardIndex ) => (
-			<div className="jp-at-a-glance__item-grid" key={ `card-${ layoutIndex }-${ cardIndex }` }>
-				<div className="jp-at-a-glance__left">{ left }</div>
-				<div className="jp-at-a-glance__right">{ right }</div>
-			</div>
-		) ),
-	] );
-
 class AtAGlance extends Component {
 	trackSecurityClick = () => analytics.tracks.recordJetpackClick( 'aag_manage_security_wpcom' );
 
@@ -71,7 +59,6 @@ class AtAGlance extends Component {
 		};
 		const securityHeader = (
 			<DashSectionHeader
-				key="securityHeader"
 				label={ __( 'Security', 'jetpack' ) }
 				settingsPath={ this.props.userCanManageModules ? '#security' : undefined }
 				externalLink={
@@ -145,14 +132,6 @@ class AtAGlance extends Component {
 		if ( this.props.userCanManageModules ) {
 			const canDisplaybundleCard =
 				! this.props.multisite && ! this.props.isOfflineMode && this.props.hasConnectedOwner;
-			const pairs = [
-				{
-					header: securityHeader,
-					cards: securityCards,
-					pinnedBundle: canDisplaybundleCard ? <DashSecurityBundle /> : null,
-				},
-			];
-
 			const performanceCards = [];
 			if ( 'inactive' !== this.props.getModuleOverride( 'photon' ) ) {
 				performanceCards.push( <DashPhoton { ...settingsProps } /> );
@@ -178,25 +157,21 @@ class AtAGlance extends Component {
 				performanceCards.push( <DashBoost siteAdminUrl={ this.props.siteAdminUrl } /> );
 			}
 
-			if ( performanceCards.length ) {
-				pairs.push( {
-					header: (
-						<DashSectionHeader
-							key="performanceHeader"
-							label={ __( 'Performance and Growth', 'jetpack' ) }
-						/>
-					),
-					cards: performanceCards,
-				} );
-			}
-
 			return (
 				<div className="jp-at-a-glance">
 					<QuerySitePlugins />
 					<QuerySite />
 					<QueryScanStatus />
 					<DashStats { ...settingsProps } { ...urls } />
-					{ renderPairs( pairs ) }
+					<Section
+						header={ securityHeader }
+						cards={ securityCards }
+						pinnedBundle={ canDisplaybundleCard ? <DashSecurityBundle /> : null }
+					/>
+					<Section
+						header={ <DashSectionHeader label={ __( 'Performance and Growth', 'jetpack' ) } /> }
+						cards={ performanceCards }
+					/>
 					{ connections }
 				</div>
 			);
@@ -243,3 +218,21 @@ export default connect( state => {
 		hasConnectedOwner: hasConnectedOwner( state ),
 	};
 } )( withModuleSettingsFormHelpers( AtAGlance ) );
+
+const Section = ( { cards = [], header, pinnedBundle } ) => {
+	if ( ! cards.length ) {
+		return null;
+	}
+	return (
+		<>
+			{ header }
+			{ pinnedBundle }
+			{ chunk( cards, 2 ).map( ( [ left, right ], cardIndex ) => (
+				<div className="jp-at-a-glance__item-grid" key={ `card-${ cardIndex }` }>
+					<div className="jp-at-a-glance__left">{ left }</div>
+					<div className="jp-at-a-glance__right">{ right }</div>
+				</div>
+			) ) }
+		</>
+	);
+};
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/search.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/search.jsx
index c4bb72671bded..154e42b3400b9 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/search.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/search.jsx
@@ -67,7 +67,7 @@ class DashSearch extends Component {
 
 		// Connected props
 		isOfflineMode: PropTypes.bool.isRequired,
-		hasConnectedOwner: PropTypes.string.isRequired,
+		hasConnectedOwner: PropTypes.bool.isRequired,
 	};
 
 	static defaultProps = {
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/security-bundle/index.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/security-bundle/index.jsx
index b3dab8031ecc5..99026e68f88fa 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/security-bundle/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/security-bundle/index.jsx
@@ -71,7 +71,11 @@ class DashSecurityBundle extends Component {
 		return (
 			<div className="dash-security-bundle--content-info-features">
 				{ features.map( ( { id, imageUrl, text, imgAlt } ) => (
-					<div id={ id } className="dash-security-bundle--content-info-features-single-feature">
+					<div
+						key={ id }
+						id={ id }
+						className="dash-security-bundle--content-info-features-single-feature"
+					>
 						<img src={ imageUrl } alt={ imgAlt } />
 						<p>{ text }</p>
 					</div>
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/videopress.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/videopress.jsx
index 4c7bc4921ee7d..d407c372f9c75 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/videopress.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/videopress.jsx
@@ -43,7 +43,7 @@ import { getProductDescriptionUrl } from 'product-descriptions/utils';
 class DashVideoPress extends Component {
 	static propTypes = {
 		hasConnectedOwner: PropTypes.bool.isRequired,
-		isOfflineMode: PropTypes.bool.isRequired,
+		isOffline: PropTypes.bool.isRequired,
 		isModuleAvailable: PropTypes.bool.isRequired,
 		trackUpgradeButtonView: PropTypes.func,
 	};
diff --git a/projects/plugins/jetpack/_inc/client/components/admin-notices/index.jsx b/projects/plugins/jetpack/_inc/client/components/admin-notices/index.jsx
index 2a48f257f599c..3937ad588f005 100644
--- a/projects/plugins/jetpack/_inc/client/components/admin-notices/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/admin-notices/index.jsx
@@ -110,7 +110,7 @@ class AdminNotices extends React.Component {
 		}
 
 		if ( $adminNotices.length > 0 ) {
-			jQuery( '.dops-notice__dismiss' ).click( function () {
+			jQuery( '.dops-notice__dismiss' ).on( 'click', function () {
 				jQuery( this ).parent().closest( 'div' ).hide();
 			} );
 		}
diff --git a/projects/plugins/jetpack/_inc/client/components/apps-badge/index.jsx b/projects/plugins/jetpack/_inc/client/components/apps-badge/index.jsx
index ee95299fb4ece..1d96bf15dbc42 100644
--- a/projects/plugins/jetpack/_inc/client/components/apps-badge/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/apps-badge/index.jsx
@@ -64,7 +64,7 @@ class AppsBadge extends PureComponent {
 		storeName: PropTypes.oneOf( [ 'ios', 'android' ] ).isRequired,
 		titleText: PropTypes.string,
 		onBadgeClick: PropTypes.func,
-		utm_source: PropTypes.string.isRequired,
+		utm_source: PropTypes.string,
 		utm_campaign: PropTypes.string,
 		utm_medium: PropTypes.string,
 	};
diff --git a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
index 341c5cc1021e4..eece41c3f7452 100644
--- a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
@@ -55,7 +55,6 @@ class AppsCard extends React.Component {
 							borderless
 							compact
 							className="jp-apps-card__dismiss"
-							href="javascript:void(0)"
 							onClick={ this.dismissCard }
 						>
 							<span className="dashicons dashicons-no" />
diff --git a/projects/plugins/jetpack/_inc/client/components/banner/index.jsx b/projects/plugins/jetpack/_inc/client/components/banner/index.jsx
index 12ca1b4ae3651..824591392a97b 100644
--- a/projects/plugins/jetpack/_inc/client/components/banner/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/banner/index.jsx
@@ -33,6 +33,7 @@ class Banner extends Component {
 		currentVersion: PropTypes.string.isRequired,
 		description: PropTypes.node,
 		eventFeature: PropTypes.string,
+		eventProps: PropTypes.object,
 		feature: PropTypes.string, // PropTypes.oneOf( getValidFeatureKeys() ),
 		href: PropTypes.string,
 		icon: PropTypes.string,
@@ -43,13 +44,14 @@ class Banner extends Component {
 		path: PropTypes.string,
 		plan: PropTypes.string,
 		siteSlug: PropTypes.string,
-		title: PropTypes.string.isRequired,
-		isCurrentUserLinked: PropTypes.string,
+		title: PropTypes.node.isRequired,
+		isCurrentUserLinked: PropTypes.bool,
 		isConnectionOwner: PropTypes.bool,
 	};
 
 	static defaultProps = {
 		onClick: noop,
+		eventProps: {},
 	};
 
 	getHref() {
@@ -67,12 +69,12 @@ class Banner extends Component {
 	handleClick = () => {
 		this.props.onClick();
 
-		const { eventFeature, path, currentVersion } = this.props;
+		const { eventFeature, path, currentVersion, eventProps } = this.props;
 		if ( eventFeature || path ) {
 			const eventFeatureProp = eventFeature ? { feature: eventFeature } : {};
 			const pathProp = path ? { path } : {};
 
-			const eventProps = {
+			const clickEventProps = {
 				target: 'banner',
 				type: 'upgrade',
 				current_version: currentVersion,
@@ -80,9 +82,10 @@ class Banner extends Component {
 				is_connection_owner: this.props.isConnectionOwner ? 'yes' : 'no',
 				...eventFeatureProp,
 				...pathProp,
+				...eventProps,
 			};
 
-			analytics.tracks.recordJetpackClick( eventProps );
+			analytics.tracks.recordJetpackClick( clickEventProps );
 		}
 	};
 
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-banner/index.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-banner/index.jsx
index 39244f0b75d54..ec8de70670dc9 100644
--- a/projects/plugins/jetpack/_inc/client/components/jetpack-banner/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/jetpack-banner/index.jsx
@@ -29,7 +29,7 @@ class JetpackBanner extends Banner {
 		path: PropTypes.string,
 		plan: PropTypes.string,
 		siteSlug: PropTypes.string,
-		title: PropTypes.string.isRequired,
+		title: PropTypes.node.isRequired,
 	};
 
 	static defaultProps = {
diff --git a/projects/plugins/jetpack/_inc/client/components/plans/plan-icon/index.jsx b/projects/plugins/jetpack/_inc/client/components/plans/plan-icon/index.jsx
index 72e7b074682e6..bde2a64647f80 100644
--- a/projects/plugins/jetpack/_inc/client/components/plans/plan-icon/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/plans/plan-icon/index.jsx
@@ -183,6 +183,8 @@ PlanIcon.propTypes = {
 		PLAN_JETPACK_SECURITY_T2_MONTHLY,
 		PLAN_JETPACK_COMPLETE,
 		PLAN_JETPACK_COMPLETE_MONTHLY,
+		PLAN_JETPACK_VIDEOPRESS,
+		PLAN_JETPACK_VIDEOPRESS_MONTHLY,
 
 		// DEPRECATED: Daily and Real-time variations will soon be retired.
 		// Remove after all customers are migrated to new products.
@@ -194,5 +196,7 @@ PlanIcon.propTypes = {
 		PLAN_JETPACK_SECURITY_DAILY_MONTHLY,
 		PLAN_JETPACK_SECURITY_REALTIME,
 		PLAN_JETPACK_SECURITY_REALTIME_MONTHLY,
+		PLAN_JETPACK_VIDEOPRESS,
+		PLAN_JETPACK_VIDEOPRESS_MONTHLY,
 	] ).isRequired,
 };
diff --git a/projects/plugins/jetpack/_inc/client/components/settings-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/settings-card/index.jsx
index 7215ba4315585..a01f5a85258f9 100644
--- a/projects/plugins/jetpack/_inc/client/components/settings-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/settings-card/index.jsx
@@ -23,7 +23,7 @@ import {
 	getPlanClass,
 	getJetpackProductUpsellByFeature,
 } from 'lib/plans/constants';
-
+import { getProductDescriptionUrl } from 'product-descriptions/utils';
 import {
 	hasConnectedOwner as hasConnectedOwnerSelector,
 	isOfflineMode,
@@ -191,7 +191,7 @@ export const SettingsCard = props => {
 							callToAction={ upgradeLabel }
 							feature={ feature }
 							onClick={ handleClickForTracking( feature ) }
-							href={ props.securityProUpgradeUrl }
+							href={ props.securityUpgradeUrl }
 						/>
 					) : (
 						<JetpackBanner
@@ -217,7 +217,7 @@ export const SettingsCard = props => {
 						plan={ getJetpackProductUpsellByFeature( FEATURE_SECURITY_SCANNING_JETPACK ) }
 						feature={ feature }
 						onClick={ handleClickForTracking( feature ) }
-						href={ props.securityPremiumUpgradeUrl }
+						href={ props.scanUpgradeUrl }
 					/>
 				) : (
 					<JetpackBanner
@@ -484,13 +484,12 @@ export default connect(
 			getModuleOverride: module_name => getModuleOverride( state, module_name ),
 			getModule: module_name => getModule( state, module_name ),
 			activeFeatures: getActiveFeatures( state ),
-			videoPremiumUpgradeUrl: getUpgradeUrl( state, 'settings-video-premium' ),
 			adsUpgradeUrl: getUpgradeUrl( state, 'settings-ads' ),
-			securityProUpgradeUrl: getUpgradeUrl( state, 'settings-security-pro' ),
-			securityPremiumUpgradeUrl: getUpgradeUrl( state, 'settings-security-premium' ),
+			securityUpgradeUrl: getProductDescriptionUrl( state, 'security' ),
+			scanUpgradeUrl: getProductDescriptionUrl( state, 'scan' ),
 			gaUpgradeUrl: getUpgradeUrl( state, 'settings-ga' ),
-			searchUpgradeUrl: getUpgradeUrl( state, 'jetpack-search' ),
-			spamUpgradeUrl: getUpgradeUrl( state, 'settings-spam' ),
+			searchUpgradeUrl: getProductDescriptionUrl( state, 'search' ),
+			spamUpgradeUrl: getProductDescriptionUrl( state, 'akismet' ),
 			multisite: isMultisite( state ),
 			hasActiveSearchPurchase: hasActiveSearchPurchase( state ),
 			inOfflineMode: isOfflineMode( state ),
diff --git a/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
index 804dad618367b..9ddfed898d7b5 100644
--- a/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/support-card/index.jsx
@@ -141,7 +141,7 @@ class SupportCard extends React.Component {
 SupportCard.propTypes = {
 	siteConnectionStatus: PropTypes.any.isRequired,
 	className: PropTypes.string,
-	isCurrentUserLinked: PropTypes.string,
+	isCurrentUserLinked: PropTypes.bool,
 	isConnectionOwner: PropTypes.bool,
 };
 
diff --git a/projects/plugins/jetpack/_inc/client/my-plan/index.jsx b/projects/plugins/jetpack/_inc/client/my-plan/index.jsx
index 333d58c301772..e989ab86fe39f 100644
--- a/projects/plugins/jetpack/_inc/client/my-plan/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/my-plan/index.jsx
@@ -20,6 +20,7 @@ import { getSiteConnectionStatus } from 'state/connection';
 
 import MyPlanHeader from './my-plan-header';
 import MyPlanBody from './my-plan-body';
+import MyPlanPartnerCoupon from './my-plan-partner-coupon';
 
 export function MyPlan( props ) {
 	let sitePlan = props.sitePlan.product_slug || '',
@@ -34,6 +35,7 @@ export function MyPlan( props ) {
 	return (
 		<React.Fragment>
 			<QuerySite />
+			<MyPlanPartnerCoupon siteRawUrl={ props.siteRawUrl } />
 			<MyPlanHeader
 				activeProducts={ props.activeProducts }
 				plan={ sitePlan }
diff --git a/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/index.jsx b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/index.jsx
new file mode 100644
index 0000000000000..b30338f0de448
--- /dev/null
+++ b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/index.jsx
@@ -0,0 +1,64 @@
+/**
+ * External dependencies
+ */
+import React, { useCallback, useEffect } from 'react';
+import PropTypes from 'prop-types';
+
+/**
+ * Internal dependencies
+ */
+import analytics from 'lib/analytics';
+import MyPlanCard from '../my-plan-card';
+import { imagePath } from 'constants/urls';
+
+/**
+ * Import styles
+ */
+import './style.scss';
+
+const MyPlanBanner = props => {
+	const { additionalEventProperties, productSlug, action, title, tagLine, trackingId } = props;
+
+	useEffect( () => {
+		analytics.tracks.recordEvent( 'jetpack_my_plan_banner_view', {
+			type: trackingId,
+			...additionalEventProperties,
+		} );
+	}, [ additionalEventProperties, trackingId ] );
+
+	const trackActionClick = useCallback( () => {
+		analytics.tracks.recordJetpackClick( {
+			target: trackingId,
+			feature: 'my-plan-banner',
+			page: 'my-plan',
+			...additionalEventProperties,
+		} );
+	}, [ additionalEventProperties, trackingId ] );
+
+	return (
+		<div className="jp-my-plan-banner">
+			<div
+				className="jp-my-plan-banner__card dops-card"
+				style={ { backgroundImage: `url(${ imagePath }jetpack-banner-gradient.png)` } }
+			>
+				<MyPlanCard
+					productSlug={ productSlug }
+					action={ React.cloneElement( action, { onClick: trackActionClick } ) }
+					title={ title }
+					tagLine={ tagLine }
+				/>
+			</div>
+		</div>
+	);
+};
+
+MyPlanBanner.propTypes = {
+	action: PropTypes.element.isRequired,
+	productSlug: PropTypes.string.isRequired,
+	trackingId: PropTypes.string.isRequired,
+	additionalEventProperties: PropTypes.object,
+	tagLine: PropTypes.oneOfType( [ PropTypes.string, PropTypes.node, PropTypes.element ] ),
+	title: PropTypes.oneOfType( [ PropTypes.string, PropTypes.node, PropTypes.element ] ),
+};
+
+export default MyPlanBanner;
diff --git a/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/style.scss b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/style.scss
new file mode 100644
index 0000000000000..c1fdef1f7fc7d
--- /dev/null
+++ b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-banner/style.scss
@@ -0,0 +1,17 @@
+@import '../../scss/calypso-colors';
+
+.jp-my-plan-banner__card {
+	background-color: $white;
+	background-position: 100%;
+	background-size: 50% 100%;
+	background-repeat: no-repeat;
+}
+
+.jp-my-plan-banner .my-plan-card__icon {
+	margin-top: 8px;
+	margin-bottom: 8px;
+}
+
+.jp-my-plan-banner .my-plan-card__header {
+	align-self: center;
+}
diff --git a/projects/plugins/jetpack/_inc/client/my-plan/my-plan-partner-coupon/index.jsx b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-partner-coupon/index.jsx
new file mode 100644
index 0000000000000..076e1da60567d
--- /dev/null
+++ b/projects/plugins/jetpack/_inc/client/my-plan/my-plan-partner-coupon/index.jsx
@@ -0,0 +1,68 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import { getRedirectUrl } from '@automattic/jetpack-components';
+import { __, sprintf } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import Button from 'components/button';
+import MyPlanBanner from '../my-plan-banner';
+import { getPartnerCoupon } from 'state/initial-state';
+
+const MyPlanPartnerCoupon = ( { partnerCoupon, siteRawUrl } ) => {
+	if ( 'object' !== typeof partnerCoupon ) {
+		return null;
+	}
+
+	const redeemButton = (
+		<Button
+			primary
+			href={ getRedirectUrl( 'jetpack-plugin-partner-coupon-checkout', {
+				path: partnerCoupon.product.slug,
+				site: siteRawUrl,
+				query: `coupon=${ partnerCoupon.coupon_code }`,
+			} ) }
+		>
+			{ __( 'Redeem', 'jetpack' ) }
+		</Button>
+	);
+
+	return (
+		<MyPlanBanner
+			productSlug={ partnerCoupon.product.slug }
+			action={ redeemButton }
+			title={ sprintf(
+				/* translators: %s: Jetpack product or plan name. */
+				__( 'Get %s free for one year!', 'jetpack' ),
+				partnerCoupon.product.title
+			) }
+			tagLine={ sprintf(
+				/* translators: %1$s: the name of a Jetpack partner, %2$s: the name of a Jetpack product or plan. */
+				__(
+					'Redeem your %1$s coupon to get started with %2$s for free the first year!',
+					'jetpack'
+				),
+				partnerCoupon.partner.name,
+				partnerCoupon.product.title
+			) }
+			trackingId="jetpack-partner-coupon"
+			additionalEventProperties={ {
+				coupon: partnerCoupon.coupon_code,
+			} }
+		/>
+	);
+};
+
+MyPlanPartnerCoupon.propTypes = {
+	partnerCoupon: PropTypes.oneOfType( [ PropTypes.object, PropTypes.bool ] ).isRequired,
+	siteRawUrl: PropTypes.string.isRequired,
+};
+
+export default connect( state => ( {
+	partnerCoupon: getPartnerCoupon( state ),
+} ) )( MyPlanPartnerCoupon );
diff --git a/projects/plugins/jetpack/_inc/client/performance/media.jsx b/projects/plugins/jetpack/_inc/client/performance/media.jsx
index 7e287399afd98..ffd32662f1d5a 100644
--- a/projects/plugins/jetpack/_inc/client/performance/media.jsx
+++ b/projects/plugins/jetpack/_inc/client/performance/media.jsx
@@ -24,7 +24,7 @@ import { ModuleToggle } from 'components/module-toggle';
 import { withModuleSettingsFormHelpers } from 'components/module-settings/with-module-settings-form-helpers';
 import SettingsCard from 'components/settings-card';
 import SettingsGroup from 'components/settings-group';
-import { getUpgradeUrl } from 'state/initial-state';
+import { getProductDescriptionUrl } from 'product-descriptions/utils';
 import { getModule, getModuleOverride } from 'state/modules';
 import { isModuleFound as _isModuleFound } from 'state/search';
 import { hasConnectedOwner as hasConnectedOwnerSelector, isOfflineMode } from 'state/connection';
@@ -156,7 +156,7 @@ export default connect( state => {
 		isOffline: isOfflineMode( state ),
 		isFetching: isFetchingSitePurchases( state ),
 		getModuleOverride: module_name => getModuleOverride( state, module_name ),
-		upgradeUrl: getUpgradeUrl( state, 'videopress-upgrade' ),
+		upgradeUrl: getProductDescriptionUrl( state, 'videopress' ),
 		videoPressStorageUsed: getVideoPressStorageUsed( state ),
 	};
 } )( withModuleSettingsFormHelpers( Media ) );
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-about-page.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-about-page.php
index 6cd1faf60817d..fd0b9436eb91d 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-about-page.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-about-page.php
@@ -12,7 +12,7 @@
 	exit;
 }
 
-require_once 'class.jetpack-admin-page.php';
+require_once __DIR__ . '/class.jetpack-admin-page.php';
 
 /**
  * Builds the landing page and its menu.
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
index ebad61afff771..8132ab7a0a83e 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php
@@ -113,7 +113,7 @@ public static function get_initial_state() {
 			'pluginBaseUrl'               => plugins_url( '', JETPACK__PLUGIN_FILE ),
 			'connectionStatus'            => $connection_status,
 			'connectedPlugins'            => Connection_Plugin_Storage::get_all(),
-			'connectUrl'                  => false == $current_user_data['isConnected'] // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			'connectUrl'                  => false == $current_user_data['isConnected'] // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				? Jetpack::init()->build_connect_url( true, false, false )
 				: '',
 			'dismissedNotices'            => self::get_dismissed_jetpack_notices(),
@@ -145,7 +145,7 @@ public static function get_initial_state() {
 				'icon'                       => has_site_icon()
 					? apply_filters( 'jetpack_photon_url', get_site_icon_url(), array( 'w' => 64 ) )
 					: '',
-				'siteVisibleToSearchEngines' => '1' == get_option( 'blog_public' ), // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+				'siteVisibleToSearchEngines' => '1' == get_option( 'blog_public' ), // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				/**
 				 * Whether promotions are visible or not.
 				 *
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
index 1c76ea28ead13..59fabcd6887a7 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -3,7 +3,7 @@
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Status;
 
-include_once( 'class.jetpack-admin-page.php' );
+require_once __DIR__ . '/class.jetpack-admin-page.php';
 require_once __DIR__ . '/class-jetpack-redux-state-helper.php';
 
 // Builds the landing page and its menu
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php
index 551b9f71a1a85..0cd947eff7a2e 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php
@@ -3,8 +3,8 @@
 use Automattic\Jetpack\Tracking;
 use Automattic\Jetpack\Assets;
 
-include_once( 'class.jetpack-admin-page.php' );
-include_once( JETPACK__PLUGIN_DIR . 'class.jetpack-modules-list-table.php' );
+require_once __DIR__ . '/class.jetpack-admin-page.php';
+require_once JETPACK__PLUGIN_DIR . 'class.jetpack-modules-list-table.php';
 
 // Builds the settings page and its menu
 class Jetpack_Settings_Page extends Jetpack_Admin_Page {
diff --git a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php
index 5abfeec693083..5aa8d7769afb0 100644
--- a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php
+++ b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php
@@ -6,6 +6,7 @@
 use Automattic\Jetpack\Connection\REST_Connector;
 use Automattic\Jetpack\Jetpack_CRM_Data;
 use Automattic\Jetpack\Licensing;
+use Automattic\Jetpack\Plugins_Installer;
 use Automattic\Jetpack\Search\REST_Controller as Search_REST_Controller;
 use Automattic\Jetpack\Status\Host;
 use Automattic\Jetpack\Status\Visitor;
@@ -3681,8 +3682,7 @@ public static function get_plugin_update_count() {
 	 * @return WP_REST_Response|WP_Error List of plugins in the site. Otherwise, a WP_Error instance with the corresponding error.
 	 */
 	public static function get_plugins() {
-		jetpack_require_lib( 'plugins' );
-		$plugins = Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 
 		if ( ! empty( $plugins ) ) {
 			return rest_ensure_response( $plugins );
@@ -3709,14 +3709,12 @@ public static function get_plugins() {
 	public static function install_plugin( $request ) {
 		$plugin = stripslashes( $request['slug'] );
 
-		jetpack_require_lib( 'plugins' );
-
 		// Let's make sure the plugin isn't already installed.
-		$plugin_id = Jetpack_Plugins::get_plugin_id_by_slug( $plugin );
+		$plugin_id = Plugins_Installer::get_plugin_id_by_slug( $plugin );
 
 		// If not installed, let's install now.
 		if ( ! $plugin_id ) {
-			$result = Jetpack_Plugins::install_plugin( $plugin );
+			$result = Plugins_Installer::install_plugin( $plugin );
 
 			if ( is_wp_error( $result ) ) {
 				return new WP_Error(
@@ -3757,7 +3755,7 @@ public static function install_plugin( $request ) {
 		 * Let's check again for the plugin's ID if we don't already have it.
 		 */
 		if ( ! $plugin_id ) {
-			$plugin_id = Jetpack_Plugins::get_plugin_id_by_slug( $plugin );
+			$plugin_id = Plugins_Installer::get_plugin_id_by_slug( $plugin );
 			if ( ! $plugin_id ) {
 				return new WP_Error(
 					'unable_to_determine_installed_plugin',
@@ -3804,8 +3802,7 @@ public static function activate_plugin( $request ) {
 			);
 		}
 
-		jetpack_require_lib( 'plugins' );
-		$plugins = Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 
 		if ( empty( $plugins ) ) {
 			return new WP_Error( 'no_plugins_found', esc_html__( 'This site has no plugins.', 'jetpack' ), array( 'status' => 404 ) );
@@ -3833,7 +3830,7 @@ public static function activate_plugin( $request ) {
 		}
 
 		// Is the plugin active already?
-		$status = Jetpack_Plugins::get_plugin_status( $plugin );
+		$status = Plugins_Installer::get_plugin_status( $plugin );
 		if ( in_array( $status, array( 'active', 'network-active' ), true ) ) {
 			return new WP_Error(
 				'plugin_already_active',
@@ -3904,8 +3901,7 @@ public static function validate_activate_plugin( $value, $request, $param ) { //
 	 * @return bool|WP_Error True if module was activated. Otherwise, a WP_Error instance with the corresponding error.
 	 */
 	public static function get_plugin( $request ) {
-		jetpack_require_lib( 'plugins' );
-		$plugins = Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 
 		if ( empty( $plugins ) ) {
 			return new WP_Error( 'no_plugins_found', esc_html__( 'This site has no plugins.', 'jetpack' ), array( 'status' => 404 ) );
@@ -3919,7 +3915,7 @@ public static function get_plugin( $request ) {
 
 		$plugin_data = $plugins[ $plugin ];
 
-		$plugin_data['active'] = in_array( Jetpack_Plugins::get_plugin_status( $plugin ), array( 'active', 'network-active' ), true );
+		$plugin_data['active'] = in_array( Plugins_Installer::get_plugin_status( $plugin ), array( 'active', 'network-active' ), true );
 
 		return rest_ensure_response(
 			array(
diff --git a/projects/plugins/jetpack/_inc/lib/class.jetpack-automatic-install-skin.php b/projects/plugins/jetpack/_inc/lib/class.jetpack-automatic-install-skin.php
index 00afeb012a27e..de46b144f4712 100644
--- a/projects/plugins/jetpack/_inc/lib/class.jetpack-automatic-install-skin.php
+++ b/projects/plugins/jetpack/_inc/lib/class.jetpack-automatic-install-skin.php
@@ -1,112 +1,10 @@
 <?php
-
-include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-include_once ABSPATH . 'wp-admin/includes/file.php';
-
 /**
- * Allows us to capture that the site doesn't have proper file system access.
- * In order to update the plugin.
+ * This file has been moved to the jetpack-plugins-installer package
+ *
+ * @deprecated 10.7
+ *
+ * @package jetpack
  */
-class Jetpack_Automatic_Install_Skin extends Automatic_Upgrader_Skin {
-	/**
-	 * Stores the last error key;
-	 **/
-	protected $main_error_code = 'install_error';
-
-	/**
-	 * Stores the last error message.
-	 **/
-	protected $main_error_message = 'An unknown error occurred during installation';
-
-	/**
-	 * Overwrites the set_upgrader to be able to tell if we e ven have the ability to write to the files.
-	 *
-	 * @param WP_Upgrader $upgrader
-	 *
-	 */
-	public function set_upgrader( &$upgrader ) {
-		parent::set_upgrader( $upgrader );
-
-		// Check if we even have permission to.
-		$result = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
-		if ( ! $result ) {
-			// set the string here since they are not available just yet
-			$upgrader->generic_strings();
-			$this->feedback( 'fs_unavailable' );
-		}
-	}
-
-	/**
-	 * Overwrites the error function
-	 */
-	public function error( $error ) {
-		if ( is_wp_error( $error ) ) {
-			$this->feedback( $error );
-		}
-	}
-
-	private function set_main_error_code( $code ) {
-		// Don't set the process_failed as code since it is not that helpful unless we don't have one already set.
-		$this->main_error_code = ( $code === 'process_failed' && $this->main_error_code ? $this->main_error_code : $code );
-	}
-
-	private function set_main_error_message( $message, $code ) {
-		// Don't set the process_failed as message since it is not that helpful unless we don't have one already set.
-		$this->main_error_message = ( $code === 'process_failed' && $this->main_error_code ? $this->main_error_code : $message );
-	}
-
-	public function get_main_error_code() {
-		return $this->main_error_code;
-	}
-
-	public function get_main_error_message() {
-		return $this->main_error_message;
-	}
-
-	/**
-	 * Overwrites the feedback function
-	 *
-	 * @param string|array|WP_Error $data    Data.
-	 * @param mixed                 ...$args Optional text replacements.
-	 */
-	public function feedback( $data, ...$args ) {
-
-		$current_error = null;
-		if ( is_wp_error( $data ) ) {
-			$this->set_main_error_code( $data->get_error_code() );
-			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
-			return;
-		} else {
-			$string = $data;
-		}
-
-		if ( ! empty( $this->upgrader->strings[$string] ) ) {
-			$this->set_main_error_code( $string );
-
-			$current_error = $string;
-			$string        = $this->upgrader->strings[$string];
-		}
-
-		if ( strpos( $string, '%' ) !== false ) {
-			if ( ! empty( $args ) ) {
-				$string = vsprintf( $string, $args );
-			}
-		}
-
-		$string = trim( $string );
-		$string = wp_kses(
-			$string, array(
-			'a'      => array(
-				'href' => true
-			),
-			'br'     => true,
-			'em'     => true,
-			'strong' => true,
-		)
-		);
 
-		$this->set_main_error_message( $string, $current_error );
-		$this->messages[] = $string;
-	}
-}
+class_alias( Automattic\Jetpack\Automatic_Install_Skin::class, 'Jetpack_Automatic_Install_Skin' );
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
index 2c829b571fb60..1bca75961e3d6 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
@@ -1,5 +1,6 @@
 <?php
 
+use Automattic\Jetpack\Plugins_Installer;
 use Automattic\Jetpack\Status;
 
 /**
@@ -1126,8 +1127,7 @@ private function _process_onboarding( $data ) {
 		}
 
 		if ( ! empty( $data['installWooCommerce'] ) ) {
-			jetpack_require_lib( 'plugins' );
-			$wc_install_result = Jetpack_Plugins::install_and_activate_plugin( 'woocommerce' );
+			$wc_install_result = Plugins_Installer::install_and_activate_plugin( 'woocommerce' );
 			delete_transient( '_wc_activation_redirect' ); // Redirecting to WC setup would kill our users' flow
 			if ( is_wp_error( $wc_install_result ) ) {
 				$error[] = 'woocommerce installation';
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-tweetstorm-gather.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-tweetstorm-gather.php
index 47300005131b0..346c0ac1bedf2 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-tweetstorm-gather.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-tweetstorm-gather.php
@@ -56,7 +56,9 @@ public function register_routes() {
 				'private_site_security_settings' => array(
 					'allow_blog_token_access' => true,
 				),
-				'permission_callback'            => '__return_true',
+				'permission_callback'            => function () {
+					return current_user_can( 'edit_posts' );
+				},
 			)
 		);
 	}
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/publicize-connections.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/publicize-connections.php
index 78cb317891c55..621dac644a300 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/publicize-connections.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/publicize-connections.php
@@ -122,7 +122,7 @@ protected function get_connections() {
 					'display_name'         => $publicize->get_display_name( $service_name, $connection ),
 					'profile_display_name' => ! empty( $connection_meta['profile_display_name'] ) ? $connection_meta['profile_display_name'] : '',
 					'profile_picture'      => ! empty( $connection_meta['profile_picture'] ) ? $connection_meta['profile_picture'] : '',
-					// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- We expect an integer, but do loose comparison below in case some other type is stored.
+					// phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- We expect an integer, but do loose comparison below in case some other type is stored.
 					'global'               => 0 == $connection_data['user_id'],
 				);
 			}
diff --git a/projects/plugins/jetpack/_inc/lib/debugger.php b/projects/plugins/jetpack/_inc/lib/debugger.php
index a0e13e76f194b..60eba5cbc9460 100644
--- a/projects/plugins/jetpack/_inc/lib/debugger.php
+++ b/projects/plugins/jetpack/_inc/lib/debugger.php
@@ -6,15 +6,15 @@
  */
 
 /* Jetpack Connection Testing Framework */
-require_once 'debugger/class-jetpack-cxn-test-base.php';
+require_once __DIR__ . '/debugger/class-jetpack-cxn-test-base.php';
 /* Jetpack Connection Tests */
-require_once 'debugger/class-jetpack-cxn-tests.php';
+require_once __DIR__ . '/debugger/class-jetpack-cxn-tests.php';
 /* Jetpack Debug Data */
-require_once 'debugger/class-jetpack-debug-data.php';
+require_once __DIR__ . '/debugger/class-jetpack-debug-data.php';
 /* The "In-Plugin Debugger" admin page. */
-require_once 'debugger/class-jetpack-debugger.php';
+require_once __DIR__ . '/debugger/class-jetpack-debugger.php';
 /* General Debugging Functions */
-require_once 'debugger/debug-functions.php';
+require_once __DIR__ . '/debugger/debug-functions.php';
 
 add_filter( 'debug_information', array( 'Jetpack_Debug_Data', 'core_debug_data' ) );
 add_filter( 'site_status_tests', 'jetpack_debugger_site_status_tests' );
diff --git a/projects/plugins/jetpack/_inc/lib/plugins.php b/projects/plugins/jetpack/_inc/lib/plugins.php
index 0bffc5299c10b..cc8e8bb56cf62 100644
--- a/projects/plugins/jetpack/_inc/lib/plugins.php
+++ b/projects/plugins/jetpack/_inc/lib/plugins.php
@@ -1,205 +1,10 @@
-<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+<?php
 /**
- * Plugins Library
+ * This file has been moved to the jetpack-plugins-installer package
  *
- * Helper functions for installing and activating plugins.
+ * @deprecated 10.7
  *
- * Used by the REST API
- *
- * @autounit api plugins
- */
-
-require_once 'class.jetpack-automatic-install-skin.php';
-
-use Automattic\Jetpack\A8c_Mc_Stats;
-
-/**
- * Plugins management tools.
+ * @package jetpack
  */
-class Jetpack_Plugins {
-
-	/**
-	 * Install and activate a plugin.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param string $slug Plugin slug.
-	 *
-	 * @return bool|WP_Error True if installation succeeded, error object otherwise.
-	 */
-	public static function install_and_activate_plugin( $slug ) {
-		$plugin_id = self::get_plugin_id_by_slug( $slug );
-
-		if ( ! $plugin_id ) {
-			$installed = self::install_plugin( $slug );
-			if ( is_wp_error( $installed ) ) {
-				return $installed;
-			}
-			$plugin_id = self::get_plugin_id_by_slug( $slug );
-		} elseif ( is_plugin_active( $plugin_id ) ) {
-			return true; // Already installed and active.
-		}
-
-		if ( ! current_user_can( 'activate_plugins' ) ) {
-			return new WP_Error( 'not_allowed', __( 'You are not allowed to activate plugins on this site.', 'jetpack' ) );
-		}
-		$activated = activate_plugin( $plugin_id );
-		if ( is_wp_error( $activated ) ) {
-			return $activated;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Install a plugin.
-	 *
-	 * @since 5.8.0
-	 *
-	 * @param string $slug Plugin slug.
-	 *
-	 * @return bool|WP_Error True if installation succeeded, error object otherwise.
-	 */
-	public static function install_plugin( $slug ) {
-		if ( is_multisite() && ! current_user_can( 'manage_network' ) ) {
-			return new WP_Error( 'not_allowed', __( 'You are not allowed to install plugins on this site.', 'jetpack' ) );
-		}
-
-		$skin     = new Jetpack_Automatic_Install_Skin();
-		$upgrader = new Plugin_Upgrader( $skin );
-		$zip_url  = self::generate_wordpress_org_plugin_download_link( $slug );
-		$mc_stats = new A8c_Mc_Stats();
-
-		$result = $upgrader->install( $zip_url );
-
-		if ( is_wp_error( $result ) ) {
-			$mc_stats->add( 'install-plugin', "fail-$slug" );
-			return $result;
-		}
-
-		$plugin     = self::get_plugin_id_by_slug( $slug );
-		$error_code = 'install_error';
-		if ( ! $plugin ) {
-			$error = __( 'There was an error installing your plugin', 'jetpack' );
-		}
-
-		if ( ! $result ) {
-			$error_code = $upgrader->skin->get_main_error_code();
-			$message    = $upgrader->skin->get_main_error_message();
-			$error      = $message ? $message : __( 'An unknown error occurred during installation', 'jetpack' );
-		}
-
-		if ( ! empty( $error ) ) {
-			if ( 'download_failed' === $error_code ) {
-				// For backwards compatibility: versions prior to 3.9 would return no_package instead of download_failed.
-				$error_code = 'no_package';
-			}
-
-			$mc_stats->add( 'install-plugin', "fail-$slug" );
-			return new WP_Error( $error_code, $error, 400 );
-		}
-
-		$mc_stats->add( 'install-plugin', "success-$slug" );
-		return (array) $upgrader->skin->get_upgrade_messages();
-	}
-
-	/**
-	 * Get WordPress.org zip download link from a plugin slug
-	 *
-	 * @param string $plugin_slug Plugin slug.
-	 */
-	protected static function generate_wordpress_org_plugin_download_link( $plugin_slug ) {
-		return "https://downloads.wordpress.org/plugin/$plugin_slug.latest-stable.zip";
-	}
-
-	/**
-	 * Get the plugin ID (composed of the plugin slug and the name of the main plugin file) from a plugin slug.
-	 *
-	 * @param string $slug Plugin slug.
-	 */
-	public static function get_plugin_id_by_slug( $slug ) {
-		// Check if get_plugins() function exists. This is required on the front end of the
-		// site, since it is in a file that is normally only loaded in the admin.
-		if ( ! function_exists( 'get_plugins' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-
-		/** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-		$plugins = apply_filters( 'all_plugins', get_plugins() );
-		if ( ! is_array( $plugins ) ) {
-			return false;
-		}
-
-		foreach ( $plugins as $plugin_file => $plugin_data ) {
-			if ( self::get_slug_from_file_path( $plugin_file ) === $slug ) {
-				return $plugin_file;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the plugin slug from the plugin ID (composed of the plugin slug and the name of the main plugin file)
-	 *
-	 * @param string $plugin_file Plugin file (ID -- e.g. hello-dolly/hello.php).
-	 */
-	protected static function get_slug_from_file_path( $plugin_file ) {
-		// Similar to get_plugin_slug() method.
-		$slug = dirname( $plugin_file );
-		if ( '.' === $slug ) {
-			$slug = preg_replace( '/(.+)\.php$/', '$1', $plugin_file );
-		}
-
-		return $slug;
-	}
-
-	/**
-	 * Get the activation status for a plugin.
-	 *
-	 * @since 8.9.0
-	 *
-	 * @param string $plugin_file The plugin file to check.
-	 * @return string Either 'network-active', 'active' or 'inactive'.
-	 */
-	public static function get_plugin_status( $plugin_file ) {
-		if ( is_plugin_active_for_network( $plugin_file ) ) {
-			return 'network-active';
-		}
-
-		if ( is_plugin_active( $plugin_file ) ) {
-			return 'active';
-		}
-
-		return 'inactive';
-	}
-
-	/**
-	 * Returns a list of all plugins in the site.
-	 *
-	 * @since 8.9.0
-	 * @uses get_plugins()
-	 *
-	 * @return array
-	 */
-	public static function get_plugins() {
-		if ( ! function_exists( 'get_plugins' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-		/** This filter is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-		$plugins = apply_filters( 'all_plugins', get_plugins() );
-
-		if ( is_array( $plugins ) && ! empty( $plugins ) ) {
-			foreach ( $plugins as $plugin_slug => $plugin_data ) {
-				$plugins[ $plugin_slug ]['active'] = in_array(
-					self::get_plugin_status( $plugin_slug ),
-					array( 'active', 'network-active' ),
-					true
-				);
-			}
-			return $plugins;
-		}
 
-		return array();
-	}
-}
+class_alias( Automattic\Jetpack\Plugins_Installer::class, 'Jetpack_Plugins' );
diff --git a/projects/plugins/jetpack/changelog/add-analytics-to-my-jetpack b/projects/plugins/jetpack/changelog/add-analytics-to-my-jetpack
deleted file mode 100644
index dbc16c421f816..0000000000000
--- a/projects/plugins/jetpack/changelog/add-analytics-to-my-jetpack
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Update root reqs for Jetpack
diff --git a/projects/plugins/jetpack/changelog/add-idc-customizate-labels b/projects/plugins/jetpack/changelog/add-anti-spam-my-jetpack
similarity index 100%
rename from projects/plugins/jetpack/changelog/add-idc-customizate-labels
rename to projects/plugins/jetpack/changelog/add-anti-spam-my-jetpack
diff --git a/projects/plugins/jetpack/changelog/add-contact-info-block-color-typography-spacing-features b/projects/plugins/jetpack/changelog/add-contact-info-block-color-typography-spacing-features
deleted file mode 100644
index edf430bf2071a..0000000000000
--- a/projects/plugins/jetpack/changelog/add-contact-info-block-color-typography-spacing-features
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Contact Info block: Add color, typography and spacing features
diff --git a/projects/plugins/jetpack/changelog/add-fancy-eslint-ignore b/projects/plugins/jetpack/changelog/add-fancy-eslint-ignore
deleted file mode 100644
index 863554614c200..0000000000000
--- a/projects/plugins/jetpack/changelog/add-fancy-eslint-ignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Hack eslint config to use `.gitignore` and per-dir `.eslintignore`.
-
-
diff --git a/projects/plugins/jetpack/changelog/phpcs-widget-visibility b/projects/plugins/jetpack/changelog/add-init-10.7-a.2-cycle
similarity index 54%
rename from projects/plugins/jetpack/changelog/phpcs-widget-visibility
rename to projects/plugins/jetpack/changelog/add-init-10.7-a.2-cycle
index be28895ed942e..d7653540ed7f3 100644
--- a/projects/plugins/jetpack/changelog/phpcs-widget-visibility
+++ b/projects/plugins/jetpack/changelog/add-init-10.7-a.2-cycle
@@ -1,5 +1,4 @@
 Significance: patch
 Type: other
-Comment: PHPCS cleanup.
-
 
+Init Jetpack 10.7-a.2 cycle
diff --git a/projects/plugins/jetpack/changelog/add-jp-search-sync2 b/projects/plugins/jetpack/changelog/add-jp-search-sync2
deleted file mode 100644
index 0b1013d95ac94..0000000000000
--- a/projects/plugins/jetpack/changelog/add-jp-search-sync2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Search: adds explicit post meta keys and taxonomies to sync into the index. Particularly important for integrating with third-party plugins.
diff --git a/projects/plugins/jetpack/changelog/add-markdown-block-align-and-spacing-feature b/projects/plugins/jetpack/changelog/add-markdown-block-align-and-spacing-feature
deleted file mode 100644
index b0303885997a6..0000000000000
--- a/projects/plugins/jetpack/changelog/add-markdown-block-align-and-spacing-feature
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Markdown block: Add Align and Spacing features
diff --git a/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component b/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component
new file mode 100644
index 0000000000000..f6193e06d7f8d
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Added Jetpack Partner Coupon banner on My Plan page
diff --git a/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component-event-prop b/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component-event-prop
new file mode 100644
index 0000000000000..fe39d019f335b
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-my-plans-partner-coupon-component-event-prop
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Adding a new event property to a component that has not yet been shipped with Jetpack so it has no backwards impact
+
+
diff --git a/projects/plugins/jetpack/changelog/add-my_jetpack_has_plan b/projects/plugins/jetpack/changelog/add-my_jetpack_has_plan
new file mode 100644
index 0000000000000..f1b645dc02006
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-my_jetpack_has_plan
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+update lock file
diff --git a/projects/plugins/jetpack/changelog/add-idc-customizer-tags b/projects/plugins/jetpack/changelog/add-my_jetpack_has_plan#2
similarity index 100%
rename from projects/plugins/jetpack/changelog/add-idc-customizer-tags
rename to projects/plugins/jetpack/changelog/add-my_jetpack_has_plan#2
diff --git a/projects/plugins/jetpack/changelog/add-partner-coupon-variation-of-backup-banner-card b/projects/plugins/jetpack/changelog/add-partner-coupon-variation-of-backup-banner-card
new file mode 100644
index 0000000000000..5043a69212e6f
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-partner-coupon-variation-of-backup-banner-card
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+The Backup banner CTA on the At-a-Glance page will now be replaced with a "Redeem Coupon" CTA when a partner coupon is detected
diff --git a/projects/plugins/jetpack/changelog/add-plugin-dash-multi-plugin-support b/projects/plugins/jetpack/changelog/add-plugin-dash-multi-plugin-support
deleted file mode 100644
index 2cb3c54be5892..0000000000000
--- a/projects/plugins/jetpack/changelog/add-plugin-dash-multi-plugin-support
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Add support for Beta Plugins to PluginDashItem
diff --git a/projects/plugins/jetpack/changelog/add-visitor-status#2 b/projects/plugins/jetpack/changelog/add-record-meter-scaffolding
similarity index 100%
rename from projects/plugins/jetpack/changelog/add-visitor-status#2
rename to projects/plugins/jetpack/changelog/add-record-meter-scaffolding
diff --git a/projects/plugins/jetpack/changelog/add-search-customberg-e2e b/projects/plugins/jetpack/changelog/add-search-customberg-e2e
deleted file mode 100644
index 90bc6a6498b88..0000000000000
--- a/projects/plugins/jetpack/changelog/add-search-customberg-e2e
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Search: add E2E tests for Customberg
diff --git a/projects/plugins/jetpack/changelog/add-search-dashboard-e2e b/projects/plugins/jetpack/changelog/add-search-dashboard-e2e
deleted file mode 100644
index 26b38a1f60a08..0000000000000
--- a/projects/plugins/jetpack/changelog/add-search-dashboard-e2e
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Search: added E2E tests for the search dashboard
diff --git a/projects/plugins/jetpack/changelog/update-connection-enforce-initial-state b/projects/plugins/jetpack/changelog/add-search-wp-cli-auto-config
similarity index 100%
rename from projects/plugins/jetpack/changelog/update-connection-enforce-initial-state
rename to projects/plugins/jetpack/changelog/add-search-wp-cli-auto-config
diff --git a/projects/plugins/jetpack/changelog/add-visitor-status b/projects/plugins/jetpack/changelog/add-visitor-status
deleted file mode 100644
index 5c83812281ec4..0000000000000
--- a/projects/plugins/jetpack/changelog/add-visitor-status
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Use new Visitor class for determining IP address.
diff --git a/projects/plugins/jetpack/changelog/e2e-merge-gh-actions b/projects/plugins/jetpack/changelog/e2e-merge-gh-actions
new file mode 100644
index 0000000000000..fe464e7824fb7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/e2e-merge-gh-actions
@@ -0,0 +1,4 @@
+Significance: major
+Type: other
+
+E2E tests: merged Github workflows
diff --git a/projects/plugins/jetpack/changelog/fix-22152-paid-block-media-placeholder b/projects/plugins/jetpack/changelog/fix-22152-paid-block-media-placeholder
deleted file mode 100644
index 87026f2b14a5d..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-22152-paid-block-media-placeholder
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: bugfix
-
-Cover block: avoid the block's placeholder rendering on top of other blocks
diff --git a/projects/plugins/jetpack/changelog/fix-activation-notice-proptypes b/projects/plugins/jetpack/changelog/fix-activation-notice-proptypes
deleted file mode 100644
index 6e512e7b1b6ba..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-activation-notice-proptypes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Fixed development mode prop type warning in UserLicenseActivationNotice component.
diff --git a/projects/plugins/jetpack/changelog/fix-handle_post_authorization_actions b/projects/plugins/jetpack/changelog/fix-handle_post_authorization_actions
deleted file mode 100644
index b278f0f8f7610..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-handle_post_authorization_actions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Connection: correctly request list of active modules so they can be activated on a reconnection
diff --git a/projects/plugins/jetpack/changelog/fix-hide-backup-prep-message b/projects/plugins/jetpack/changelog/fix-hide-backup-prep-message
deleted file mode 100644
index fb8507c66ee77..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-hide-backup-prep-message
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Jetpack plugin: hide backup prep message for sites without Backup
diff --git a/projects/plugins/jetpack/changelog/fix-pay-paypal-block-button-size b/projects/plugins/jetpack/changelog/fix-pay-paypal-block-button-size
deleted file mode 100644
index 09bbe6220bf80..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-pay-paypal-block-button-size
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Increased the Pay with Paypal button in Pay with Paypal block in order to properly display the card icons below the button.
diff --git a/projects/plugins/jetpack/changelog/fix-phpcs-jetpack-root-classes-pt-2 b/projects/plugins/jetpack/changelog/fix-phpcs-jetpack-root-classes-pt-2
deleted file mode 100644
index 6cbee4b73351d..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-phpcs-jetpack-root-classes-pt-2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Fix PHPCS sniffs in root classes.
diff --git a/projects/plugins/jetpack/changelog/fix-scan-warning b/projects/plugins/jetpack/changelog/fix-scan-warning
deleted file mode 100644
index bc690ad3ba807..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-scan-warning
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-bugfix Fix warning for non admin users
diff --git a/projects/plugins/jetpack/changelog/fix-sharing-amp-assets b/projects/plugins/jetpack/changelog/fix-sharing-amp-assets
deleted file mode 100644
index 4c4c3936a3010..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-sharing-amp-assets
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: compat
-
-Sharing / AMP plugin: avoid adding sharing's CSS on AMP pages when the sharing feature is not active.
diff --git a/projects/plugins/jetpack/changelog/fix-tiled-gallery-frontend-perf b/projects/plugins/jetpack/changelog/fix-tiled-gallery-frontend-perf
new file mode 100644
index 0000000000000..7f7b772bf1dc6
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-tiled-gallery-frontend-perf
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Tiled Gallery Block: Fix performance issue affecting page views that use the Tiled Gallery.
diff --git a/projects/plugins/jetpack/changelog/fix-videopress-allow-download b/projects/plugins/jetpack/changelog/fix-videopress-allow-download
new file mode 100644
index 0000000000000..2976d5fabf0d0
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-videopress-allow-download
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Fix potential use of unexisting "allow_download" property in VideoPress media modal
diff --git a/projects/plugins/jetpack/changelog/fix-widget-visibility-deprecation b/projects/plugins/jetpack/changelog/fix-widget-visibility-deprecation
new file mode 100644
index 0000000000000..d5cfd600c9cfa
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-widget-visibility-deprecation
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Widget Visibility: update to match new user query parameter introduced in WordPress 5.9.
diff --git a/projects/plugins/jetpack/changelog/fix-wporg-warning b/projects/plugins/jetpack/changelog/fix-wporg-warning
new file mode 100644
index 0000000000000..4ef8c19f0f4cf
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-wporg-warning
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Contact Form: ensure form validation uses the correct variable types.
diff --git a/projects/plugins/jetpack/changelog/jetpack-likes-settings-phpcbf-fixes b/projects/plugins/jetpack/changelog/jetpack-likes-settings-phpcbf-fixes
deleted file mode 100644
index 2f595651f1b04..0000000000000
--- a/projects/plugins/jetpack/changelog/jetpack-likes-settings-phpcbf-fixes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Comment: phpcs linting cleanup.
diff --git a/projects/plugins/jetpack/changelog/phpcs-eu-cookie-widget b/projects/plugins/jetpack/changelog/phpcs-eu-cookie-widget
deleted file mode 100644
index 7265b241b516c..0000000000000
--- a/projects/plugins/jetpack/changelog/phpcs-eu-cookie-widget
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: PHPCS: EU Cookie Widget
-
-
diff --git a/projects/plugins/jetpack/changelog/phpcs-widget-visibility-2 b/projects/plugins/jetpack/changelog/phpcs-widget-visibility-2
deleted file mode 100644
index e5845df6ba681..0000000000000
--- a/projects/plugins/jetpack/changelog/phpcs-widget-visibility-2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: PHPCS: undo file rename as to avoid handling wpcom linting.
-
-
diff --git a/projects/plugins/jetpack/changelog/poc-my-jetpac-product-class b/projects/plugins/jetpack/changelog/poc-my-jetpac-product-class
deleted file mode 100644
index a1c1831fa1ef7..0000000000000
--- a/projects/plugins/jetpack/changelog/poc-my-jetpac-product-class
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Updated composer.lock.
-
-
diff --git a/projects/js-packages/storybook/changelog/renovate-webpack-5.x#2 b/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo
similarity index 78%
rename from projects/js-packages/storybook/changelog/renovate-webpack-5.x#2
rename to projects/plugins/jetpack/changelog/renovate-wordpress-monorepo
index 302aa8cf46b5c..cbdc3703e1c9d 100644
--- a/projects/js-packages/storybook/changelog/renovate-webpack-5.x#2
+++ b/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo
@@ -1,4 +1,4 @@
 Significance: patch
-Type: changed
+Type: other
 
 Updated package dependencies
diff --git a/projects/js-packages/storybook/changelog/jetpack-branch-10.4 b/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo#2
similarity index 78%
rename from projects/js-packages/storybook/changelog/jetpack-branch-10.4
rename to projects/plugins/jetpack/changelog/renovate-wordpress-monorepo#2
index c47cb18e82997..1eaea6a769e84 100644
--- a/projects/js-packages/storybook/changelog/jetpack-branch-10.4
+++ b/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo#2
@@ -1,4 +1,4 @@
 Significance: patch
-Type: changed
+Type: other
 
 Updated package dependencies.
diff --git a/projects/plugins/jetpack/changelog/rm-ad-widget-block-widget-editor b/projects/plugins/jetpack/changelog/rm-ad-widget-block-widget-editor
new file mode 100644
index 0000000000000..91d447f774ca9
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/rm-ad-widget-block-widget-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+WordAds: deprecate the legacy Ad Widget in favor of the Ad Block onwhen adding new Ad Widgets via the block-based widget editor.
diff --git a/projects/plugins/jetpack/changelog/rnmobile-add-empty-file-comment b/projects/plugins/jetpack/changelog/rnmobile-add-empty-file-comment
deleted file mode 100644
index 22d5127d15de8..0000000000000
--- a/projects/plugins/jetpack/changelog/rnmobile-add-empty-file-comment
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Add a comment to explain the reasoning behind an empty scss file.
diff --git a/projects/plugins/jetpack/changelog/rnmobile-add-tiled-gallery-block b/projects/plugins/jetpack/changelog/rnmobile-add-tiled-gallery-block
deleted file mode 100644
index 17b8e7e13da81..0000000000000
--- a/projects/plugins/jetpack/changelog/rnmobile-add-tiled-gallery-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: enhancement
-
-Jetpack Tiled Gallery Block: Port part of the block to native mobile (Gutenberg Mobile).
diff --git a/projects/plugins/jetpack/changelog/search-move-widget-to-package b/projects/plugins/jetpack/changelog/search-move-widget-to-package
new file mode 100644
index 0000000000000..d03337ff12257
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/search-move-widget-to-package
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Search: move search widget to the search pacakge
diff --git a/projects/plugins/jetpack/changelog/update-aag-ctas b/projects/plugins/jetpack/changelog/update-aag-ctas
deleted file mode 100644
index 3159b52cf6d86..0000000000000
--- a/projects/plugins/jetpack/changelog/update-aag-ctas
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Dashboard: update CTAs (wording, layout) in the At A Glance section.
diff --git a/projects/plugins/jetpack/changelog/update-donations-block-to-inner-blocks b/projects/plugins/jetpack/changelog/update-donations-block-to-inner-blocks
new file mode 100644
index 0000000000000..c8704e83652b4
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-donations-block-to-inner-blocks
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Ported Donations block from RichText to InnerBlocks.
diff --git a/projects/plugins/jetpack/changelog/update-instant-search-a11y-aria-and-headings b/projects/plugins/jetpack/changelog/update-instant-search-a11y-aria-and-headings
deleted file mode 100644
index 08c8136e1816e..0000000000000
--- a/projects/plugins/jetpack/changelog/update-instant-search-a11y-aria-and-headings
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: enhancement
-
-Search: Improve accessibility via headings hierarchy and aria roles
diff --git a/projects/plugins/jetpack/changelog/update-internet-defense-league-widget-deprecate b/projects/plugins/jetpack/changelog/update-internet-defense-league-widget-deprecate
new file mode 100644
index 0000000000000..68bbeafe9cd13
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-internet-defense-league-widget-deprecate
@@ -0,0 +1,4 @@
+Significance: minor
+Type: compat
+
+Internet Defense League widget: Widget deprecation
diff --git a/projects/plugins/jetpack/changelog/update-phpcs-markdown b/projects/plugins/jetpack/changelog/update-phpcs-markdown
deleted file mode 100644
index b6e3377f8a77b..0000000000000
--- a/projects/plugins/jetpack/changelog/update-phpcs-markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-phpcs fixes for the markdown module
diff --git a/projects/plugins/jetpack/changelog/update-phpcs-remove-global-exemption b/projects/plugins/jetpack/changelog/update-phpcs-remove-global-exemption
new file mode 100644
index 0000000000000..b66ce6e1ea59c
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-phpcs-remove-global-exemption
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Move PHPCS ignore to pass WP.com linting
+
+
diff --git a/projects/plugins/jetpack/changelog/update-phpcs-verification-tools b/projects/plugins/jetpack/changelog/update-phpcs-verification-tools
deleted file mode 100644
index 3957b1a642adc..0000000000000
--- a/projects/plugins/jetpack/changelog/update-phpcs-verification-tools
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-PHPCS fixes for site verification tools.
diff --git a/projects/plugins/jetpack/changelog/update-plan-upgrade-message b/projects/plugins/jetpack/changelog/update-plan-upgrade-message
new file mode 100644
index 0000000000000..3212acbd3260b
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-plan-upgrade-message
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Updated the Payment block Upgrade nudge description to include the plan name that's required to use the block
diff --git a/projects/plugins/jetpack/changelog/update-premium-content-nomenclature b/projects/plugins/jetpack/changelog/update-premium-content-nomenclature
new file mode 100644
index 0000000000000..ad43f0133f36a
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-premium-content-nomenclature
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Make premium content block be more consistent: Use 'Guest' rather than visitor/Logged-out
diff --git a/projects/plugins/jetpack/changelog/update-project-scripts-no-install b/projects/plugins/jetpack/changelog/update-project-scripts-no-install
deleted file mode 100644
index c158e6c65d9c8..0000000000000
--- a/projects/plugins/jetpack/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/plugins/jetpack/changelog/update-twitter-unroll-endpoint b/projects/plugins/jetpack/changelog/update-twitter-unroll-endpoint
new file mode 100644
index 0000000000000..1fe93a939c093
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-twitter-unroll-endpoint
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Unroll Twitter Threads: ensure that only contributors can access the endpoint to unroll threads.
diff --git a/projects/plugins/jetpack/changelog/update-version-jetpack-atomic-106a4 b/projects/plugins/jetpack/changelog/update-version-jetpack-atomic-106a4
deleted file mode 100644
index b1354061de6f0..0000000000000
--- a/projects/plugins/jetpack/changelog/update-version-jetpack-atomic-106a4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: other
-Comment: Janitorial: bump plugin version to start new cycle
-
-
diff --git a/projects/plugins/jetpack/changelog/update-videopress-default-progress-colour-option b/projects/plugins/jetpack/changelog/update-videopress-default-progress-colour-option
new file mode 100644
index 0000000000000..78bb818c0f2fd
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-videopress-default-progress-colour-option
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Changes the default for the `Match video` setting to `true` for VideoPress videos.
diff --git a/projects/plugins/jetpack/changelog/phpcs-wp-post-widget b/projects/plugins/jetpack/changelog/update-wpcs-to-dev-branch
similarity index 50%
rename from projects/plugins/jetpack/changelog/phpcs-wp-post-widget
rename to projects/plugins/jetpack/changelog/update-wpcs-to-dev-branch
index d6d74bb530695..744c96c12387d 100644
--- a/projects/plugins/jetpack/changelog/phpcs-wp-post-widget
+++ b/projects/plugins/jetpack/changelog/update-wpcs-to-dev-branch
@@ -1,5 +1,4 @@
 Significance: patch
 Type: other
-Comment: PHPCS: WP Post Widget
-
 
+Fixed some new PHPCS warnings.
diff --git a/projects/plugins/jetpack/class.jetpack-gutenberg.php b/projects/plugins/jetpack/class.jetpack-gutenberg.php
index 90d25a64de9c9..3e9cc9ad07bec 100644
--- a/projects/plugins/jetpack/class.jetpack-gutenberg.php
+++ b/projects/plugins/jetpack/class.jetpack-gutenberg.php
@@ -747,8 +747,7 @@ public static function load_block_editor_extensions() {
 						include_once $extension_file_path;
 					}
 				}
-			};
-
+			}
 		}
 	}
 
@@ -1070,13 +1069,13 @@ public static function get_render_callback_with_availability_check( $slug, $rend
 			$availability = self::get_cached_availability();
 			$bare_slug    = self::remove_extension_prefix( $slug );
 			if ( isset( $availability[ $bare_slug ] ) && $availability[ $bare_slug ]['available'] ) {
-				return call_user_func( $render_callback, $prepared_attributes, $block_content );
+				return call_user_func( $render_callback, $prepared_attributes, $block_content, $block );
 			}
 
 			// A preview of the block is rendered for admins on the frontend with an upgrade nudge.
 			if ( isset( $availability[ $bare_slug ] ) ) {
 				if ( self::should_show_frontend_preview( $availability[ $bare_slug ] ) ) {
-					$block_preview = call_user_func( $render_callback, $prepared_attributes, $block_content );
+					$block_preview = call_user_func( $render_callback, $prepared_attributes, $block_content, $block );
 
 					// If the upgrade nudge isn't already being displayed by a parent block, display the nudge.
 					if ( isset( $block->attributes['shouldDisplayFrontendBanner'] ) && $block->attributes['shouldDisplayFrontendBanner'] ) {
diff --git a/projects/plugins/jetpack/class.jetpack-network.php b/projects/plugins/jetpack/class.jetpack-network.php
index dd9463eec5285..5808a1608f051 100644
--- a/projects/plugins/jetpack/class.jetpack-network.php
+++ b/projects/plugins/jetpack/class.jetpack-network.php
@@ -568,7 +568,7 @@ public function network_admin_page() {
 			return;
 		}
 
-		require_once 'class.jetpack-network-sites-list-table.php';
+		require_once __DIR__ . '/class.jetpack-network-sites-list-table.php';
 
 		$network_sites_table = new Jetpack_Network_Sites_List_Table();
 		echo '<div class="wrap"><h2>' . esc_html__( 'Sites', 'jetpack' ) . '</h2>';
diff --git a/projects/plugins/jetpack/class.jetpack-plan.php b/projects/plugins/jetpack/class.jetpack-plan.php
index 333653b3145f0..949eb908527d9 100644
--- a/projects/plugins/jetpack/class.jetpack-plan.php
+++ b/projects/plugins/jetpack/class.jetpack-plan.php
@@ -90,6 +90,10 @@ class Jetpack_Plan {
 				'jetpack_security_daily_monthly',
 				'jetpack_security_realtime',
 				'jetpack_security_realtime_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
 			),
 			'supports' => array(),
 		),
diff --git a/projects/plugins/jetpack/class.jetpack.php b/projects/plugins/jetpack/class.jetpack.php
index 79d9ae204d08b..4e6394c0be1ee 100644
--- a/projects/plugins/jetpack/class.jetpack.php
+++ b/projects/plugins/jetpack/class.jetpack.php
@@ -1888,7 +1888,7 @@ public static function load_modules() {
 				continue;
 			}
 
-			if ( ! include_once self::get_module_path( $module ) ) {
+			if ( ! include_once self::get_module_path( $module ) ) { // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 				unset( $modules[ $index ] );
 				self::update_active_modules( array_values( $modules ) );
 				continue;
@@ -3022,7 +3022,7 @@ public static function activate_module( $module, $exit = true, $redirect = true
 
 		self::catch_errors( true );
 		ob_start();
-		require self::get_module_path( $module );
+		require self::get_module_path( $module ); // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 		/** This action is documented in class.jetpack.php */
 		do_action( 'jetpack_activate_module', $module );
 		$active[] = $module;
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index a02317c5b281a..1dead70296b4b 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -13,12 +13,12 @@
 		"ext-openssl": "*",
 		"automattic/jetpack-a8c-mc-stats": "1.4.x-dev",
 		"automattic/jetpack-abtest": "1.9.x-dev",
-		"automattic/jetpack-assets": "1.16.x-dev",
+		"automattic/jetpack-assets": "1.17.x-dev",
 		"automattic/jetpack-autoloader": "2.10.x-dev",
 		"automattic/jetpack-backup": "1.2.x-dev",
 		"automattic/jetpack-blocks": "1.4.x-dev",
 		"automattic/jetpack-compat": "1.6.x-dev",
-		"automattic/jetpack-composer-plugin": "1.0.x-dev",
+		"automattic/jetpack-composer-plugin": "1.1.x-dev",
 		"automattic/jetpack-config": "1.6.x-dev",
 		"automattic/jetpack-connection": "1.36.x-dev",
 		"automattic/jetpack-connection-ui": "2.3.x-dev",
@@ -26,17 +26,18 @@
 		"automattic/jetpack-device-detection": "1.4.x-dev",
 		"automattic/jetpack-error": "1.3.x-dev",
 		"automattic/jetpack-heartbeat": "1.4.x-dev",
-		"automattic/jetpack-identity-crisis": "0.6.x-dev",
+		"automattic/jetpack-identity-crisis": "0.7.x-dev",
 		"automattic/jetpack-jitm": "2.2.x-dev",
 		"automattic/jetpack-lazy-images": "2.1.x-dev",
 		"automattic/jetpack-licensing": "1.6.x-dev",
 		"automattic/jetpack-logo": "1.5.x-dev",
-		"automattic/jetpack-my-jetpack": "0.4.x-dev",
+		"automattic/jetpack-my-jetpack": "0.5.x-dev",
 		"automattic/jetpack-options": "1.14.x-dev",
 		"automattic/jetpack-partner": "1.6.x-dev",
+		"automattic/jetpack-plugins-installer": "0.1.x-dev",
 		"automattic/jetpack-redirect": "1.7.x-dev",
 		"automattic/jetpack-roles": "1.4.x-dev",
-		"automattic/jetpack-search": "0.5.x-dev",
+		"automattic/jetpack-search": "0.7.x-dev",
 		"automattic/jetpack-status": "1.10.x-dev",
 		"automattic/jetpack-sync": "1.29.x-dev",
 		"automattic/jetpack-terms-of-service": "1.9.x-dev",
@@ -96,7 +97,7 @@
 		"platform": {
 			"ext-intl": "0.0.0"
 		},
-		"autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ10_6_a_4",
+		"autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ10_7_a_2",
 		"allow-plugins": {
 			"automattic/jetpack-autoloader": true,
 			"automattic/jetpack-composer-plugin": true
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index 9b928031a5db2..243511aa4cd75 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/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": "83b762352d36b1f733c09a5b5d4adc58",
+    "content-hash": "d3ad0f7d5068bf5c2b3d734da62195d8",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
@@ -116,7 +116,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/admin-ui",
-                "reference": "e9c471e1ac68c4dd7cf656fd17a4b96fdc4c6ff1"
+                "reference": "bbb92b9b9852760e84b7aaee877ee081616efcb3"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
@@ -127,6 +127,7 @@
             "extra": {
                 "autotagger": true,
                 "mirror-repo": "Automattic/jetpack-admin-ui",
+                "textdomain": "jetpack-admin-ui",
                 "changelogger": {
                     "link-template": "https://github.com/Automattic/jetpack-admin-ui/compare/${old}...${new}"
                 },
@@ -171,7 +172,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/assets",
-                "reference": "558a4eabba5541257e2b496aeba6da3a06e169f5"
+                "reference": "810134d18a0baedd94aae5398f2f506f213bac7b"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6"
@@ -191,7 +192,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "1.16.x-dev"
+                    "dev-master": "1.17.x-dev"
                 }
             },
             "autoload": {
@@ -203,11 +204,21 @@
                 ]
             },
             "scripts": {
+                "build-development": [
+                    "pnpm run build"
+                ],
+                "build-production": [
+                    "pnpm run build-production"
+                ],
                 "phpunit": [
                     "./vendor/phpunit/phpunit/phpunit --colors=always"
                 ],
                 "test-coverage": [
-                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/php/clover.xml\"",
+                    "pnpm run test-coverage"
+                ],
+                "test-js": [
+                    "pnpm run test"
                 ],
                 "test-php": [
                     "@composer phpunit"
@@ -439,7 +450,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/composer-plugin",
-                "reference": "d9a79b97dbf363bdffb2f748e0dbed8216753c36"
+                "reference": "c3fc0e4cf179c619f896174a6c9db8e70cff74c3"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -458,7 +469,7 @@
                 },
                 "autotagger": true,
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -598,14 +609,14 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/connection-ui",
-                "reference": "73a9cff560f04b981ca97d26225cc8fbb91c0be5"
+                "reference": "af0b68a96950278824fbd56aad4fc5f5a2af4240"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-device-detection": "^1.4",
-                "automattic/jetpack-identity-crisis": "^0.6"
+                "automattic/jetpack-identity-crisis": "^0.7"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0"
@@ -840,10 +851,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/identity-crisis",
-                "reference": "daea57d4601da806be82d3265429cb9c2a304c00"
+                "reference": "80cc6904f5337f7cfa194199ad307e054fece278"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-logo": "^1.5",
@@ -868,7 +879,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-identity-crisis/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.6.x-dev"
+                    "dev-master": "0.7.x-dev"
                 }
             },
             "autoload": {
@@ -915,11 +926,11 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/jitm",
-                "reference": "7d3331eb49d58461ee4afce31e0a4c1791b24e8f"
+                "reference": "77c9f7a8e922bf208437916dd6bfcae293c1dd26"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4",
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-device-detection": "^1.4",
                 "automattic/jetpack-logo": "^1.5",
@@ -986,10 +997,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/lazy-images",
-                "reference": "65185b85f48c44181ed99a1d31cdbd2c8d68e796"
+                "reference": "c7115dc7f2f073b53f98584382773bb8db0ca68b"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-constants": "^1.6"
             },
             "require-dev": {
@@ -1154,17 +1165,20 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "a5d7c6f0f3652d649cac7b11dfe35db034634fb7"
+                "reference": "0a4354d247242a1fbc56373c2ddd4ccacab62d52"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.2",
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
+                "automattic/jetpack-plugins-installer": "^0.1",
                 "automattic/jetpack-terms-of-service": "^1.9",
                 "automattic/jetpack-tracking": "^1.14"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.0",
+                "automattic/jetpack-options": "^1.14",
+                "automattic/jetpack-search": "^0.7",
                 "automattic/wordbless": "@dev",
                 "yoast/phpunit-polyfills": "1.0.3"
             },
@@ -1177,7 +1191,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.4.x-dev"
+                    "dev-master": "0.5.x-dev"
                 }
             },
             "autoload": {
@@ -1374,6 +1388,58 @@
                 "relative": true
             }
         },
+        {
+            "name": "automattic/jetpack-plugins-installer",
+            "version": "dev-master",
+            "dist": {
+                "type": "path",
+                "url": "../../packages/plugins-installer",
+                "reference": "19c930344c337c188d411a51938c7c870ea511a1"
+            },
+            "require": {
+                "automattic/jetpack-a8c-mc-stats": "^1.4"
+            },
+            "require-dev": {
+                "automattic/jetpack-changelogger": "^3.0",
+                "yoast/phpunit-polyfills": "1.0.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                },
+                "mirror-repo": "Automattic/jetpack-plugins-installer",
+                "changelogger": {
+                    "link-template": "https://github.com/Automattic/jetpack-plugins-installer/compare/v${old}...v${new}"
+                },
+                "autotagger": true,
+                "textdomain": "jetpack-plugins-installer"
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "scripts": {
+                "phpunit": [
+                    "./vendor/phpunit/phpunit/phpunit --colors=always"
+                ],
+                "test-coverage": [
+                    "php -dpcov.directory=. ./vendor/bin/phpunit --coverage-clover \"$COVERAGE_DIR/clover.xml\""
+                ],
+                "test-php": [
+                    "@composer phpunit"
+                ]
+            },
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "description": "Handle installation of plugins from WP.org",
+            "transport-options": {
+                "monorepo": true,
+                "relative": true
+            }
+        },
         {
             "name": "automattic/jetpack-redirect",
             "version": "dev-master",
@@ -1481,10 +1547,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/search",
-                "reference": "3399a76de3767fe450c8d4ac3bd5d1983268fe53"
+                "reference": "7755f7ba56dd4ebd45432b82a54b4622eeee025b"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-options": "^1.14",
@@ -1505,10 +1571,16 @@
                     "link-template": "https://github.com/Automattic/jetpack-search/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-master": "0.5.x-dev"
+                    "dev-master": "0.7.x-dev"
+                },
+                "version-constants": {
+                    "JETPACK_SEARCH_PKG__VERSION": "search.php"
                 }
             },
             "autoload": {
+                "files": [
+                    "search.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -1538,6 +1610,10 @@
                 ],
                 "post-update-cmd": [
                     "php -r \"copy('vendor/automattic/wordbless/src/dbless-wpdb.php', 'wordpress/wp-content/db.php');\""
+                ],
+                "watch": [
+                    "Composer\\Config::disableProcessTimeout",
+                    "pnpm run watch"
                 ]
             },
             "license": [
@@ -1607,13 +1683,13 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/sync",
-                "reference": "cad6e550e4c76cc17cab3ddef0829b67e2c04838"
+                "reference": "08c63a81a1ac29072c140383f3bf9266a4c3c6be"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.36",
                 "automattic/jetpack-constants": "^1.6",
                 "automattic/jetpack-heartbeat": "^1.4",
-                "automattic/jetpack-identity-crisis": "^0.6",
+                "automattic/jetpack-identity-crisis": "^0.7",
                 "automattic/jetpack-options": "^1.14",
                 "automattic/jetpack-password-checker": "^0.2",
                 "automattic/jetpack-roles": "^1.4",
@@ -1726,10 +1802,10 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/tracking",
-                "reference": "ed6f897aaaa8e843271556d271e6c7a829cb8727"
+                "reference": "60dd2a4462221bcc460aadf9f86daeb308fd8027"
             },
             "require": {
-                "automattic/jetpack-assets": "^1.16",
+                "automattic/jetpack-assets": "^1.17",
                 "automattic/jetpack-options": "^1.14",
                 "automattic/jetpack-status": "^1.10",
                 "automattic/jetpack-terms-of-service": "^1.9"
@@ -2860,16 +2936,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.11",
+            "version": "9.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2406855036db1102126125537adb1406f7242fdd"
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd",
-                "reference": "2406855036db1102126125537adb1406f7242fdd",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743",
+                "reference": "597cb647654ede35e43b137926dfdfef0fb11743",
                 "shasum": ""
             },
             "require": {
@@ -2947,7 +3023,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13"
             },
             "funding": [
                 {
@@ -2959,7 +3035,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-25T07:07:57+00:00"
+            "time": "2022-01-24T07:33:35+00:00"
         },
         {
             "name": "psr/container",
@@ -5116,6 +5192,7 @@
         "automattic/jetpack-my-jetpack": 20,
         "automattic/jetpack-options": 20,
         "automattic/jetpack-partner": 20,
+        "automattic/jetpack-plugins-installer": 20,
         "automattic/jetpack-redirect": 20,
         "automattic/jetpack-roles": 20,
         "automattic/jetpack-search": 20,
diff --git a/projects/plugins/jetpack/extensions/blocks/business-hours/business-hours.php b/projects/plugins/jetpack/extensions/blocks/business-hours/business-hours.php
index 4de0593a90400..260cbef2c0f93 100644
--- a/projects/plugins/jetpack/extensions/blocks/business-hours/business-hours.php
+++ b/projects/plugins/jetpack/extensions/blocks/business-hours/business-hours.php
@@ -23,7 +23,23 @@
 function register_block() {
 	Blocks::jetpack_register_block(
 		BLOCK_NAME,
-		array( 'render_callback' => __NAMESPACE__ . '\render' )
+		array(
+			'render_callback' => __NAMESPACE__ . '\render',
+			'supports'        => array(
+				'color'      => array(
+					'gradients' => true,
+				),
+				'spacing'    => array(
+					'margin'  => true,
+					'padding' => true,
+				),
+				'typography' => array(
+					'fontSize'   => true,
+					'lineHeight' => true,
+				),
+				'align'      => array( 'wide', 'full' ),
+			),
+		)
 	);
 }
 add_action( 'init', __NAMESPACE__ . '\register_block' );
@@ -105,11 +121,15 @@ function render( $attributes ) {
 		$attributes['days'] = get_default_days();
 	}
 
+	$wrapper_attributes = \WP_Block_Supports::get_instance()->apply_block_supports();
+
 	$start_of_week = (int) get_option( 'start_of_week', 0 );
 	$time_format   = get_option( 'time_format' );
 	$content       = sprintf(
-		'<dl class="jetpack-business-hours %s">',
-		! empty( $attributes['className'] ) ? esc_attr( $attributes['className'] ) : ''
+		'<dl class="jetpack-business-hours%s%s"%s>',
+		! empty( $attributes['className'] ) ? ' ' . esc_attr( $attributes['className'] ) : '',
+		! empty( $wrapper_attributes['class'] ) ? ' ' . esc_attr( $wrapper_attributes['class'] ) : '',
+		! empty( $wrapper_attributes['style'] ) ? ' style="' . esc_attr( $wrapper_attributes['style'] ) . '"' : ''
 	);
 
 	$days = array( 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' );
diff --git a/projects/plugins/jetpack/extensions/blocks/business-hours/index.js b/projects/plugins/jetpack/extensions/blocks/business-hours/index.js
index ef30e8c4c100f..cbf7707d9c1b1 100644
--- a/projects/plugins/jetpack/extensions/blocks/business-hours/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/business-hours/index.js
@@ -89,6 +89,18 @@ export const settings = {
 	category: 'grow',
 	supports: {
 		html: true,
+		color: {
+			gradients: true,
+		},
+		spacing: {
+			margin: true,
+			padding: true,
+		},
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+		},
+		align: [ 'wide', 'full' ],
 	},
 	keywords: [
 		_x( 'opening hours', 'block search term', 'jetpack' ),
diff --git a/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours.server-rendered.html b/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours.server-rendered.html
index aba2772576b0c..e17ea812c9161 100644
--- a/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours.server-rendered.html
+++ b/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours.server-rendered.html
@@ -1 +1 @@
-<dl class="jetpack-business-hours "><div class="jetpack-business-hours__item"><dt class="Mon">Monday</dt><dd class="Mon">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Tue">Tuesday</dt><dd class="Tue">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Wed">Wednesday</dt><dd class="Wed">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Thu">Thursday</dt><dd class="Thu">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Fri">Friday</dt><dd class="Fri">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Sat">Saturday</dt><dd class="Sat">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Sun">Sunday</dt><dd class="Sun">Closed</dd></div></dl>
\ No newline at end of file
+<dl class="jetpack-business-hours wp-block-jetpack-business-hours"><div class="jetpack-business-hours__item"><dt class="Mon">Monday</dt><dd class="Mon">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Tue">Tuesday</dt><dd class="Tue">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Wed">Wednesday</dt><dd class="Wed">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Thu">Thursday</dt><dd class="Thu">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Fri">Friday</dt><dd class="Fri">9:00 am - 5:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Sat">Saturday</dt><dd class="Sat">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Sun">Sunday</dt><dd class="Sun">Closed</dd></div></dl>
\ No newline at end of file
diff --git a/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours__custom-hours.server-rendered.html b/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours__custom-hours.server-rendered.html
index c010b40297fc0..2a256aa6275d5 100644
--- a/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours__custom-hours.server-rendered.html
+++ b/projects/plugins/jetpack/extensions/blocks/business-hours/test/fixtures/jetpack__business-hours__custom-hours.server-rendered.html
@@ -1 +1 @@
-<dl class="jetpack-business-hours "><div class="jetpack-business-hours__item"><dt class="Mon">Monday</dt><dd class="Mon">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Tue">Tuesday</dt><dd class="Tue">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Wed">Wednesday</dt><dd class="Wed">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Thu">Thursday</dt><dd class="Thu">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Fri">Friday</dt><dd class="Fri">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Sat">Saturday</dt><dd class="Sat">10:00 am - 2:00 pm, 3:00 pm - 4:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Sun">Sunday</dt><dd class="Sun">10:00 am - 2:00 pm, 3:00 pm - 4:00 pm</dd></div></dl>
\ No newline at end of file
+<dl class="jetpack-business-hours wp-block-jetpack-business-hours"><div class="jetpack-business-hours__item"><dt class="Mon">Monday</dt><dd class="Mon">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Tue">Tuesday</dt><dd class="Tue">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Wed">Wednesday</dt><dd class="Wed">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Thu">Thursday</dt><dd class="Thu">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Fri">Friday</dt><dd class="Fri">Closed</dd></div><div class="jetpack-business-hours__item"><dt class="Sat">Saturday</dt><dd class="Sat">10:00 am - 2:00 pm, 3:00 pm - 4:00 pm</dd></div><div class="jetpack-business-hours__item"><dt class="Sun">Sunday</dt><dd class="Sun">10:00 am - 2:00 pm, 3:00 pm - 4:00 pm</dd></div></dl>
\ No newline at end of file
diff --git a/projects/plugins/jetpack/extensions/blocks/button/button.php b/projects/plugins/jetpack/extensions/blocks/button/button.php
index 451a2938dc777..8aaa892fe2c34 100644
--- a/projects/plugins/jetpack/extensions/blocks/button/button.php
+++ b/projects/plugins/jetpack/extensions/blocks/button/button.php
@@ -129,7 +129,7 @@ function get_button_classes( $attributes ) {
 		$classes[] = sprintf( 'has-%s-gradient-background', $attributes['gradient'] );
 	}
 
-	// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+	// phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 	if ( $has_border_radius && 0 == $attributes['borderRadius'] ) {
 		$classes[] = 'no-border-radius';
 	}
@@ -172,7 +172,7 @@ function get_button_styles( $attributes ) {
 		$styles[] = sprintf( 'background-color: %s;', $attributes['customBackgroundColor'] );
 	}
 
-	// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+	// phpcs:ignore Universal.Operators.StrictComparisons.LooseNotEqual
 	if ( $has_border_radius && 0 != $attributes['borderRadius'] ) {
 		$styles[] = sprintf( 'border-radius: %spx;', $attributes['borderRadius'] );
 	}
diff --git a/projects/plugins/jetpack/extensions/blocks/button/test/controls.js b/projects/plugins/jetpack/extensions/blocks/button/test/controls.js
index ee6db982a87fe..31fe5122b0929 100644
--- a/projects/plugins/jetpack/extensions/blocks/button/test/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/button/test/controls.js
@@ -13,7 +13,7 @@ import ButtonControls from '../controls';
 // Temporarily mock out the ButtonWidthControl, which is causing errors due to missing
 // dependencies in the jest test runner.
 jest.mock( '../button-width-panel', () => ( {
-    __esModule: true,
+	__esModule: true,
 	default: () => <div>Mocked Width Settings</div>,
 } ) );
 
@@ -66,7 +66,11 @@ describe( 'Inspector settings', () => {
 
 		test( 'loads and displays only default background color options', () => {
 			render( <ButtonControls { ...defaultProps } /> );
-			const backgroundColorPanel = screen.getByText( 'Background' ).closest( 'fieldset' );
+
+			userEvent.click( screen.getByText( 'Background', { ignore: '[aria-hidden=true]' } ) );
+			const backgroundColorPanel = screen
+				.getByText( 'Background' )
+				.closest( 'div.components-dropdown' );
 
 			expect( within( backgroundColorPanel ).queryByText( 'Solid' ) ).not.toBeInTheDocument();
 			expect( within( backgroundColorPanel ).queryByText( 'Gradient' ) ).not.toBeInTheDocument();
@@ -75,25 +79,31 @@ describe( 'Inspector settings', () => {
 		test( 'sets text color attribute', () => {
 			render( <ButtonControls { ...defaultProps } /> );
 
-			const textColors = screen.getByText( 'Text Color' ).closest( 'fieldset' );
+			userEvent.click( screen.getByText( 'Text Color', { ignore: '[aria-hidden=true]' } ) );
+			const textColors = screen.getByText( 'Text Color' ).closest( 'div.components-dropdown' );
 			userEvent.click( within( textColors ).getAllByLabelText( 'Color: ', { exact: false } )[ 0 ] );
 
-			expect( setTextColor.mock.calls[ 0 ] [ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
+			expect( setTextColor.mock.calls[ 0 ][ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
 		} );
 
 		test( 'sets background color attribute', () => {
 			render( <ButtonControls { ...defaultProps } /> );
 
-			const backgroundSection = screen.getByText( 'Background' ).closest( 'fieldset' );
-			const backgroundColorOption = within( backgroundSection ).getAllByLabelText( 'Color: ', { exact: false } )[ 0 ];
+			userEvent.click( screen.getByText( 'Background', { ignore: '[aria-hidden=true]' } ) );
+			const backgroundSection = screen
+				.getByText( 'Background' )
+				.closest( 'div.components-dropdown' );
+			const backgroundColorOption = within( backgroundSection ).getAllByLabelText( 'Color: ', {
+				exact: false,
+			} )[ 0 ];
 			userEvent.click( backgroundColorOption );
 
-			expect( setBackgroundColor.mock.calls[ 0 ] [ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
+			expect( setBackgroundColor.mock.calls[ 0 ][ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
 		} );
 	} );
 
-	describe('Color settings when gradients are available', () => {
-		test('loads and displays Gradient Color Settings panel', () => {
+	describe( 'Color settings when gradients are available', () => {
+		test( 'loads and displays Gradient Color Settings panel', () => {
 			render( <ButtonControls { ...defaultProps } isGradientAvailable={ true } /> );
 
 			expect( screen.getByText( 'Background & Text Color' ) ).toBeInTheDocument();
@@ -103,44 +113,67 @@ describe( 'Inspector settings', () => {
 
 		test( 'loads and displays solid and gradient background color options', () => {
 			render( <ButtonControls { ...defaultProps } isGradientAvailable={ true } /> );
-			const backgroundSection = screen.getByText( 'Background' ).closest( 'fieldset' );
 
-			expect( within( backgroundSection ).getByText( 'Solid', { ignore: '[aria-hidden=true]' } ) ).toBeInTheDocument();
-			expect(within(backgroundSection).getByText('Gradient', { ignore: '[aria-hidden=true]' } )).toBeInTheDocument();
-		});
+			userEvent.click( screen.getByText( 'Background', { ignore: '[aria-hidden=true]' } ) );
+			const backgroundSection = screen
+				.getByText( 'Background' )
+				.closest( 'div.components-dropdown' );
+
+			expect(
+				within( backgroundSection ).getByText( 'Solid', { ignore: '[aria-hidden=true]' } )
+			).toBeInTheDocument();
+			expect(
+				within( backgroundSection ).getByText( 'Gradient', { ignore: '[aria-hidden=true]' } )
+			).toBeInTheDocument();
+		} );
 
 		test( 'sets text color attribute', () => {
 			render( <ButtonControls { ...defaultProps } isGradientAvailable={ true } /> );
 
-			const textColors = screen.getByText( 'Text Color' ).closest( 'fieldset' );
+			userEvent.click( screen.getByText( 'Text Color', { ignore: '[aria-hidden=true]' } ) );
+			const textColors = screen.getByText( 'Text Color' ).closest( 'div.components-dropdown' );
 			userEvent.click( within( textColors ).getAllByLabelText( 'Color: ', { exact: false } )[ 0 ] );
 
-			expect( setTextColor.mock.calls[ 0 ] [ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
+			expect( setTextColor.mock.calls[ 0 ][ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
 		} );
 
 		test( 'sets solid background color attribute', () => {
 			render( <ButtonControls { ...defaultProps } isGradientAvailable={ true } /> );
 
-			const backgroundSection = screen.getByText( 'Background' ).closest( 'fieldset' );
+			userEvent.click( screen.getByText( 'Background', { ignore: '[aria-hidden=true]' } ) );
+			const backgroundSection = screen
+				.getByText( 'Background' )
+				.closest( 'div.components-dropdown' );
 
-			userEvent.click(within(backgroundSection).getByText('Solid', { ignore: '[aria-hidden=true]' } ));
-			userEvent.click(within(backgroundSection).getAllByLabelText('Color: ', { exact: false })[0]);
+			userEvent.click(
+				within( backgroundSection ).getByText( 'Solid', { ignore: '[aria-hidden=true]' } )
+			);
+			userEvent.click(
+				within( backgroundSection ).getAllByLabelText( 'Color: ', { exact: false } )[ 0 ]
+			);
 
-			expect( setBackgroundColor.mock.calls[ 0 ] [ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
-        } );
+			expect( setBackgroundColor.mock.calls[ 0 ][ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
+		} );
 
 		test( 'sets gradient background color attribute', () => {
 			render( <ButtonControls { ...defaultProps } isGradientAvailable={ true } /> );
 
-			const backgroundSection = screen.getByText( 'Background' ).closest( 'fieldset' );
-			userEvent.click( within( backgroundSection ).getByText( 'Gradient', { ignore: '[aria-hidden=true]' } ) );
-			userEvent.click( within( backgroundSection ).getAllByLabelText( 'Gradient: ', { exact: false } )[ 0 ] );
+			userEvent.click( screen.getByText( 'Background', { ignore: '[aria-hidden=true]' } ) );
+			const backgroundSection = screen
+				.getByText( 'Background' )
+				.closest( 'div.components-dropdown' );
+			userEvent.click(
+				within( backgroundSection ).getByText( 'Gradient', { ignore: '[aria-hidden=true]' } )
+			);
+			userEvent.click(
+				within( backgroundSection ).getAllByLabelText( 'Gradient: ', { exact: false } )[ 0 ]
+			);
 
 			expect( setGradient.mock.calls[ 0 ][ 0 ] ).toMatch( /linear\-gradient\((.+)\)/ );
 		} );
-    } );
+	} );
 
-    describe( 'Border settings', () => {
+	describe( 'Border settings', () => {
 		test( 'loads and displays border radius', () => {
 			render( <ButtonControls { ...defaultProps } /> );
 
@@ -150,11 +183,11 @@ describe( 'Inspector settings', () => {
 		test( 'sets the border radius attribute', () => {
 			render( <ButtonControls { ...defaultProps } /> );
 
-			const borderPanel = screen.getByText('Border Settings').closest('div');
-			const input = borderPanel.querySelector('input[type="number"]');
+			const borderPanel = screen.getByText( 'Border Settings' ).closest( 'div' );
+			const input = borderPanel.querySelector( 'input[type="number"]' );
 			input.focus();
-			fireEvent.change(input, { target: { value: '6' } });
-			expect(setAttributes).toHaveBeenCalledWith({ borderRadius: 6 });
+			fireEvent.change( input, { target: { value: '6' } } );
+			expect( setAttributes ).toHaveBeenCalledWith( { borderRadius: 6 } );
 		} );
 	} );
 } );
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/amount/amount.php b/projects/plugins/jetpack/extensions/blocks/donations/amount/amount.php
new file mode 100644
index 0000000000000..341cdfa4a7022
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/amount/amount.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Donations Amount Child Block.
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack\Extensions\Donations;
+
+use Automattic\Jetpack\Blocks;
+use Jetpack_Gutenberg;
+
+const DONATIONS_AMOUNT_BLOCK_NAME = 'donations-amount';
+
+/**
+ * Registers the block for use in Gutenberg
+ * This is done via an action so that we can disable
+ * registration if we need to.
+ */
+function register_donations_amount_block() {
+	Blocks::jetpack_register_block(
+		DONATIONS_AMOUNT_BLOCK_NAME,
+		array(
+			'render_callback' => __NAMESPACE__ . '\render_amount_block',
+		)
+	);
+}
+
+add_action( 'init', __NAMESPACE__ . '\register_donations_amount_block' );
+
+/**
+ * Render callback.
+ *
+ * @param array  $attr Array containing the block attributes.
+ * @param string $content String containing the block contents.
+ *
+ * @return string
+ */
+function render_amount_block( $attr, $content ) {
+	Jetpack_Gutenberg::load_styles_as_required( DONATIONS_AMOUNT_BLOCK_NAME );
+
+	return $content;
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/amount.js b/projects/plugins/jetpack/extensions/blocks/donations/amount/edit.js
similarity index 58%
rename from projects/plugins/jetpack/extensions/blocks/donations/amount.js
rename to projects/plugins/jetpack/extensions/blocks/donations/amount/edit.js
index fa8df8bed0b85..66fd16896f970 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/amount.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/amount/edit.js
@@ -1,53 +1,48 @@
 /**
  * External dependencies
  */
-import formatCurrency, { CURRENCIES } from '@automattic/format-currency';
 import classnames from 'classnames';
+import { minimumTransactionAmountForCurrency, parseAmount } from '../../../shared/currencies';
 
 /**
- * WordPress dependencies
+ * Internal dependencies
  */
-import { RichText } from '@wordpress/block-editor';
-import { useCallback, useEffect, useRef, useState } from '@wordpress/element';
+import DonationsContext from '../common/context';
 
 /**
- * Internal dependencies
+ * WordPress dependencies
  */
-import { minimumTransactionAmountForCurrency, parseAmount } from '../../shared/currencies';
+import { RichText, useBlockProps } from '@wordpress/block-editor';
+import formatCurrency, { CURRENCIES } from '@automattic/format-currency';
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from '@wordpress/element';
 
-const Amount = ( {
-	className = null,
-	currency = null,
-	defaultValue = null,
-	disabled = false,
-	label = '',
-	onChange = null,
-	value = '',
-} ) => {
+const Edit = props => {
+	const { attributes, setAttributes } = props;
+	const { baseAmountMultiplier, label, amount, disabled = false } = attributes;
+	const { currency } = useContext( DonationsContext );
+	const defaultValue = useMemo(
+		() => minimumTransactionAmountForCurrency( currency ) * baseAmountMultiplier,
+		[ currency, baseAmountMultiplier ]
+	);
 	const [ editedValue, setEditedValue ] = useState(
-		formatCurrency( value, currency, { symbol: '' } )
+		formatCurrency( amount, currency, { symbol: '' } )
 	);
 	const [ isFocused, setIsFocused ] = useState( false );
 	const [ isInvalid, setIsInvalid ] = useState( false );
 	const richTextRef = useRef( null );
 
 	const setAmount = useCallback(
-		amount => {
-			setEditedValue( amount );
-
-			if ( ! onChange ) {
-				return;
-			}
-
-			const parsedAmount = parseAmount( amount, currency );
+		newAmount => {
+			setEditedValue( newAmount );
+			const parsedAmount = parseAmount( newAmount, currency );
 			if ( parsedAmount && parsedAmount >= minimumTransactionAmountForCurrency( currency ) ) {
-				onChange( parsedAmount );
+				setAttributes( { amount: newAmount, currency } );
 				setIsInvalid( false );
-			} else if ( amount ) {
+			} else if ( newAmount ) {
 				setIsInvalid( true );
 			}
 		},
-		[ currency, onChange ]
+		[ currency, setAttributes ]
 	);
 
 	const setFocus = () => {
@@ -73,23 +68,24 @@ const Amount = ( {
 		if ( isFocused || editedValue ) {
 			return;
 		}
-
 		setAmount( formatCurrency( defaultValue, currency, { symbol: '' } ) );
-	}, [ currency, defaultValue, editedValue, isFocused, setAmount ] );
+	}, [ currency, editedValue, isFocused, setAmount, defaultValue ] );
 
 	// Syncs the edited value with the actual value whenever the latter changes (e.g. new default amount after a currency change).
 	useEffect( () => {
 		if ( isFocused || isInvalid ) {
 			return;
 		}
-		setEditedValue( formatCurrency( value, currency, { symbol: '' } ) );
-	}, [ currency, isFocused, isInvalid, setAmount, value ] );
+		setEditedValue( formatCurrency( amount, currency, { symbol: '' } ) );
+	}, [ currency, isFocused, isInvalid, setAmount, amount ] );
 
 	return (
 		<div
-			className={ classnames( 'donations__amount', className, {
-				'has-focus': isFocused,
-				'has-error': isInvalid,
+			{ ...useBlockProps( {
+				className: classnames( 'wp-block-button wp-block-button__link', {
+					'has-focus': isFocused,
+					'has-error': isInvalid,
+				} ),
 			} ) }
 			role="button"
 			tabIndex={ 0 }
@@ -99,7 +95,7 @@ const Amount = ( {
 			{ CURRENCIES[ currency ].symbol }
 			{ disabled ? (
 				<div className="donations__amount-value">
-					{ formatCurrency( value ? value : defaultValue, currency, { symbol: '' } ) }
+					{ formatCurrency( amount ? amount : defaultValue, currency, { symbol: '' } ) }
 				</div>
 			) : (
 				<RichText
@@ -107,15 +103,13 @@ const Amount = ( {
 					aria-label={ label }
 					keepPlaceholderOnFocus={ true }
 					multiline={ false }
-					onChange={ amount => setAmount( amount ) }
-					placeholder={ formatCurrency( defaultValue, currency, { symbol: '' } ) }
+					onChange={ newAmount => setAmount( newAmount ) }
 					ref={ richTextRef }
 					value={ editedValue }
-					withoutInteractiveFormatting
 				/>
 			) }
 		</div>
 	);
 };
 
-export default Amount;
+export default Edit;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/amount/index.js b/projects/plugins/jetpack/extensions/blocks/donations/amount/index.js
new file mode 100644
index 0000000000000..2fa92fcde1688
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/amount/index.js
@@ -0,0 +1,78 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { button as icon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import edit from './edit';
+import save from './save';
+
+const name = 'donations-amount';
+const BUTTON_BEHAVIOUR_TITLE = __( 'Amount selector', 'jetpack' );
+const INPUT_BEHAVIOUR_TITLE = __( 'Custom amount field', 'jetpack' );
+
+const settings = {
+	title: __( 'Donations amount button', 'jetpack' ),
+	description: __( 'Button that determines a fixed donation amount', 'jetpack' ),
+	category: 'earn',
+	attributes: {
+		baseAmountMultiplier: {
+			type: 'string',
+		},
+		label: {
+			type: 'string',
+		},
+		currency: {
+			type: 'string',
+		},
+		amount: {
+			type: 'string',
+		},
+		disabled: {
+			type: 'boolean',
+		},
+	},
+	__experimentalLabel: ( { disabled } ) =>
+		disabled ? INPUT_BEHAVIOUR_TITLE : BUTTON_BEHAVIOUR_TITLE,
+	icon,
+	supports: {
+		align: true,
+		alignWide: true,
+		html: false,
+		lightBlockWrapper: true,
+		color: {
+			gradients: true,
+		},
+		typography: {
+			fontSize: true,
+			__experimentalFontFamily: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		reusable: false,
+		spacing: {
+			padding: [ 'horizontal', 'vertical' ],
+			__experimentalDefaultControls: {
+				padding: true,
+			},
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	styles: [
+		{ name: 'fill', label: __( 'Fill', 'jetpack' ), isDefault: true },
+		{ name: 'outline', label: __( 'Outline', 'jetpack' ) },
+	],
+	edit,
+	save,
+};
+
+export { name, settings };
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/amount/save.js b/projects/plugins/jetpack/extensions/blocks/donations/amount/save.js
new file mode 100644
index 0000000000000..7fb263ae3b4fd
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/amount/save.js
@@ -0,0 +1,47 @@
+/**
+ * WordPress dependencies
+ */
+import { useBlockProps } from '@wordpress/block-editor';
+import formatCurrency, { CURRENCIES } from '@automattic/format-currency';
+
+/**
+ * External dependencies
+ */
+import { minimumTransactionAmountForCurrency } from '../../../shared/currencies';
+import classnames from 'classnames';
+
+const Save = ( { attributes } ) => {
+	const { disabled, currency, amount } = attributes;
+
+	if ( disabled ) {
+		const className = classnames( 'donations__amount wp-block-button wp-block-button__link', {
+			'donations__custom-amount': disabled,
+		} );
+		const blockProps = useBlockProps.save( { className } );
+
+		const defaultAmount = minimumTransactionAmountForCurrency( currency ) * 100;
+
+		return (
+			<div { ...blockProps }>
+				{ CURRENCIES[ currency ].symbol }
+				<div
+					className="donations__amount-value"
+					data-currency={ currency }
+					data-empty-text={ formatCurrency( defaultAmount, currency, { symbol: '' } ) }
+				></div>
+			</div>
+		);
+	}
+
+	const className = 'donations__amount wp-block-button wp-block-button__link';
+	const blockProps = useBlockProps.save( { className } );
+
+	return (
+		<div { ...blockProps } data-amount={ amount }>
+			{ CURRENCIES[ currency ].symbol }
+			{ formatCurrency( amount, currency, { symbol: '' } ) }
+		</div>
+	);
+};
+
+export default Save;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/common.scss b/projects/plugins/jetpack/extensions/blocks/donations/common.scss
index fb45d4a990765..905505fbe898e 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/common.scss
+++ b/projects/plugins/jetpack/extensions/blocks/donations/common.scss
@@ -55,7 +55,26 @@
 		}
 	}
 
-	.donations__amounts {
+	.donations__deprecated .donations__amount {
+	  display: inline-block;
+	  padding: 16px 24px;
+	  background-color: $white;
+	  color: $gray-900;
+	  border: 1px solid $gray-400;
+	  margin-right: 8px;
+	  margin-bottom: 8px;
+	  font-weight: 600;
+	  font-size: 16px;
+	  white-space: nowrap;
+
+	  &.has-error {
+		box-shadow: 0 0 0 1px $white, 0 0 0 3px $alert-red;
+		outline: 2px solid transparent;
+		outline-offset: -2px;
+	  }
+	}
+
+	.donations__amounts:not( .donations__deprecated ) {
 		margin-bottom: 16px;
 		display: flex;
 		flex-wrap: wrap;
@@ -65,23 +84,14 @@
 		}
 	}
 
-	.donations__amount {
-		display: inline-block;
-		padding: 16px 24px;
-		background-color: $white;
-		color: $gray-900;
-		border: 1px solid $gray-400;
-		margin-right: 8px;
-		margin-bottom: 8px;
-		font-weight: 600;
-		font-size: 16px;
-		white-space: nowrap;
+  	.wp-block-jetpack-donations-amount {
+	  	display: flex;
+	}
 
-		&.has-error {
-			box-shadow: 0 0 0 1px $white, 0 0 0 3px $alert-red;
-			outline: 2px solid transparent;
-			outline-offset: -2px;
-		}
+	.has-error {
+		box-shadow: 0 0 0 1px $white, 0 0 0 3px $alert-red;
+		outline: 2px solid transparent;
+		outline-offset: -2px;
 	}
 
 	.donations__custom-amount .donations__amount-value {
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/common/constants.js b/projects/plugins/jetpack/extensions/blocks/donations/common/constants.js
new file mode 100644
index 0000000000000..7aa4c0247ade5
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/common/constants.js
@@ -0,0 +1,4 @@
+export const ONE_TIME_DONATION = 'oneTimeDonation';
+export const MONTHLY_DONATION = 'monthlyDonation';
+export const ANNUAL_DONATION = 'annualDonation';
+export const DEFAULT_TAB = ONE_TIME_DONATION;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/common/context.js b/projects/plugins/jetpack/extensions/blocks/donations/common/context.js
new file mode 100644
index 0000000000000..0426c4ec57c2e
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/common/context.js
@@ -0,0 +1,21 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { DEFAULT_TAB } from './constants';
+
+const defaultContext = {
+	activeTab: DEFAULT_TAB,
+	fallbackLinkUrl: '',
+	products: [],
+	currency: '',
+	showCustomAmount: true,
+};
+
+const Context = createContext( defaultContext );
+
+export default Context;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/controls.js b/projects/plugins/jetpack/extensions/blocks/donations/controls.js
index 5fe910e449b19..bf45cf081bc18 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/controls.js
@@ -1,12 +1,6 @@
-/**
- * External dependencies
- */
-import { CURRENCIES } from '@automattic/format-currency';
-
 /**
  * WordPress dependencies
  */
-import { BlockControls, InspectorControls } from '@wordpress/block-editor';
 import {
 	Button,
 	Dashicon,
@@ -20,32 +14,28 @@ import {
 	ToolbarItem,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
+import { BlockControls, InspectorControls } from '@wordpress/block-editor';
 import { DOWN } from '@wordpress/keycodes';
 
+/**
+ * External dependencies
+ */
+import getSiteFragment from '../../shared/get-site-fragment';
+
 /**
  * Internal dependencies
  */
+import { ANNUAL_DONATION, MONTHLY_DONATION } from './common/constants';
+import { CURRENCIES } from '@automattic/format-currency';
 import { SUPPORTED_CURRENCIES } from '../../shared/currencies';
-import getSiteFragment from '../../shared/get-site-fragment';
 
 const Controls = props => {
-	const { attributes, setAttributes } = props;
-	const { currency, monthlyDonation, annualDonation, showCustomAmount } = attributes;
-
-	const toggleDonation = ( interval, show ) => {
-		const donationAttributes = {
-			'1 month': 'monthlyDonation',
-			'1 year': 'annualDonation',
-		};
-		const donationAttribute = donationAttributes[ interval ];
-		const donation = attributes[ donationAttribute ];
+	const { attributes, setAttributes, onChangeTab } = props;
+	const { showCustomAmount, currency } = attributes;
 
-		setAttributes( {
-			[ donationAttribute ]: {
-				...donation,
-				show,
-			},
-		} );
+	const toggleDonation = ( donationType, show ) => {
+		setAttributes( { [ donationType ]: show } );
+		onChangeTab( donationType, show );
 	};
 
 	return (
@@ -104,13 +94,13 @@ const Controls = props => {
 			<InspectorControls>
 				<PanelBody title={ __( 'Settings', 'jetpack' ) }>
 					<ToggleControl
-						checked={ monthlyDonation.show }
-						onChange={ value => toggleDonation( '1 month', value ) }
+						checked={ attributes[ MONTHLY_DONATION ] }
+						onChange={ value => toggleDonation( MONTHLY_DONATION, value ) }
 						label={ __( 'Show monthly donations', 'jetpack' ) }
 					/>
 					<ToggleControl
-						checked={ annualDonation.show }
-						onChange={ value => toggleDonation( '1 year', value ) }
+						checked={ attributes[ ANNUAL_DONATION ] }
+						onChange={ value => toggleDonation( ANNUAL_DONATION, value ) }
 						label={ __( 'Show annual donations', 'jetpack' ) }
 					/>
 					<ToggleControl
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/custom-amount.php b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/custom-amount.php
new file mode 100644
index 0000000000000..b6e0c34b93ef6
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/custom-amount.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Donations Custom Amount Child Block.
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack\Extensions\Donations;
+
+use Automattic\Jetpack\Blocks;
+use Jetpack_Gutenberg;
+
+const DONATIONS_CUSTOM_AMOUNT_BLOCK_NAME = 'donations-custom-amount';
+
+/**
+ * Registers the block for use in Gutenberg
+ * This is done via an action so that we can disable
+ * registration if we need to.
+ */
+function register_custom_donations_amount_block() {
+	Blocks::jetpack_register_block(
+		DONATIONS_CUSTOM_AMOUNT_BLOCK_NAME,
+		array(
+			'render_callback' => __NAMESPACE__ . '\render_custom_amount_block',
+		)
+	);
+}
+
+add_action( 'init', __NAMESPACE__ . '\register_custom_donations_amount_block' );
+
+/**
+ * Render callback.
+ *
+ * @param array  $attr Array containing the block attributes.
+ * @param string $content   String containing the block content.
+ *
+ * @return string
+ */
+function render_custom_amount_block( $attr, $content ) {
+	Jetpack_Gutenberg::load_styles_as_required( DONATIONS_CUSTOM_AMOUNT_BLOCK_NAME );
+
+	return $content;
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/edit.js b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/edit.js
new file mode 100644
index 0000000000000..0a0ca8ded8f7b
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/edit.js
@@ -0,0 +1,56 @@
+/**
+ * WordPress dependencies
+ */
+import { InnerBlocks } from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+import { useContext } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import DonationsContext from '../common/context';
+
+const Edit = () => {
+	const { showCustomAmount, currency } = useContext( DonationsContext );
+
+	return (
+		showCustomAmount && (
+			<InnerBlocks
+				templateLock={ 'all' }
+				template={ [
+					[
+						'core/paragraph',
+						{
+							content: __( 'Or enter a custom amount', 'jetpack' ),
+						},
+					],
+					[
+						'core/group',
+						{
+							layout: {
+								type: 'flex',
+								allowOrientation: false,
+							},
+						},
+						[
+							[
+								'jetpack/donations-amount',
+								{
+									label: __( 'Custom amount', 'jetpack' ),
+									baseAmountMultiplier: 100,
+									currency,
+									className: 'donations__custom-amount',
+									disabled: true,
+								},
+							],
+						],
+					],
+				] }
+				__experimentalCaptureToolbars={ true }
+				templateInsertUpdatesSelection={ false }
+			/>
+		)
+	);
+};
+
+export default Edit;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/index.js b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/index.js
new file mode 100644
index 0000000000000..cdc35388af665
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/index.js
@@ -0,0 +1,55 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { group as icon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import edit from './edit';
+import save from './save';
+
+const name = 'donations-custom-amount';
+
+const settings = {
+	title: __( 'Donations custom amount', 'jetpack' ),
+	description: __( 'Enables the user to introduce a custom donation amount', 'jetpack' ),
+	category: 'earn',
+	attributes: {},
+	icon,
+	supports: {
+		align: true,
+		alignWide: true,
+		html: false,
+		lightBlockWrapper: true,
+		inserter: false,
+		reusable: false,
+		color: {
+			gradients: true,
+		},
+		typography: {
+			fontSize: true,
+			__experimentalFontFamily: true,
+			__experimentalDefaultControls: {
+				fontSize: true,
+			},
+		},
+		spacing: {
+			padding: [ 'horizontal', 'vertical' ],
+			__experimentalDefaultControls: {
+				padding: true,
+			},
+		},
+		__experimentalBorder: {
+			radius: true,
+			__experimentalDefaultControls: {
+				radius: true,
+			},
+		},
+	},
+	edit,
+	save,
+};
+
+export { name, settings };
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/save.js b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/save.js
new file mode 100644
index 0000000000000..676156f2b63fe
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/custom-amount/save.js
@@ -0,0 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { InnerBlocks } from '@wordpress/block-editor';
+
+const Save = () => <InnerBlocks.Content />;
+
+export default Save;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/deprecated/index.js b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/index.js
new file mode 100644
index 0000000000000..fe6f91a5d4fec
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/index.js
@@ -0,0 +1,7 @@
+/**
+ * Internal dependencies
+ */
+import deprecatedV1 from './v1';
+import deprecatedV2 from './v2';
+
+export const deprecated = [ deprecatedV2, deprecatedV1 ];
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/donations.php b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/donations.php
new file mode 100644
index 0000000000000..d8fc54cab41a2
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/donations.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Donations Block v2 render block.
+ *
+ * @since   8.x
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack\Extensions\Donations;
+
+use Automattic\Jetpack\Blocks;
+use Jetpack_Gutenberg;
+
+/**
+ * Donations block dynamic rendering.
+ *
+ * @param array  $attr    Array containing the Donations block attributes.
+ * @param string $content String containing the Donations block content.
+ *
+ * @return string
+ */
+function render_block_v2( $attr, $content ) {
+	// Keep content as-is if rendered in other contexts than frontend (i.e. feed, emails, API, etc.).
+	if ( ! jetpack_is_frontend() ) {
+		return $content;
+	}
+
+	require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
+
+	// If stripe isn't connected don't show anything to potential donors - they can't actually make a donation.
+	if ( ! \Jetpack_Memberships::get_connected_account_id() ) {
+		return '';
+	}
+
+	Jetpack_Gutenberg::load_assets_as_required( FEATURE_NAME, array( 'thickbox' ) );
+	add_thickbox();
+
+	jetpack_require_lib( 'class-jetpack-currencies' );
+
+	if ( ! isset( $attr['currency'] ) ) {
+		$attr['currency'] = 'USD';
+	}
+
+	if ( ! isset( $attr['showCustomAmount'] ) ) {
+		$attr['showCustomAmount'] = true;
+	}
+
+	if ( ! isset( $attr['chooseAmountText'] ) ) {
+		$attr['chooseAmountText'] = __( 'Choose an amount', 'jetpack' );
+	}
+
+	if ( ! isset( $attr['customAmountText'] ) ) {
+		$attr['customAmountText'] = __( 'Or enter a custom amount', 'jetpack' );
+	}
+
+	$donations = array(
+		'one-time' => array_merge(
+			array(
+				'title' => __( 'One-Time', 'jetpack' ),
+				'class' => 'donations__one-time-item',
+			),
+			$attr['oneTimeDonation']
+		),
+	);
+	if ( $attr['monthlyDonation']['show'] ) {
+		$donations['1 month'] = array_merge(
+			array(
+				'title' => __( 'Monthly', 'jetpack' ),
+				'class' => 'donations__monthly-item',
+			),
+			$attr['monthlyDonation']
+		);
+	}
+	if ( $attr['annualDonation']['show'] ) {
+		$donations['1 year'] = array_merge(
+			array(
+				'title' => __( 'Yearly', 'jetpack' ),
+				'class' => 'donations__annual-item',
+			),
+			$attr['annualDonation']
+		);
+	}
+
+	$currency   = $attr['currency'];
+	$nav        = '';
+	$headings   = '';
+	$amounts    = '';
+	$extra_text = '';
+	$buttons    = '';
+	foreach ( $donations as $interval => $donation ) {
+		$plan_id = (int) $donation['planId'];
+		$plan    = get_post( $plan_id );
+		if ( ! $plan || is_wp_error( $plan ) ) {
+			continue;
+		}
+
+		if ( count( $donations ) > 1 ) {
+			if ( ! $nav ) {
+				$nav .= '<div class="donations__nav">';
+			}
+			$nav .= sprintf(
+				'<div role="button" tabindex="0" class="donations__nav-item" data-interval="%1$s">%2$s</div>',
+				esc_attr( $interval ),
+				esc_html( $donation['title'] )
+			);
+		}
+		$headings .= sprintf(
+			'<h4 class="%1$s">%2$s</h4>',
+			esc_attr( $donation['class'] ),
+			wp_kses_post( $donation['heading'] )
+		);
+		$amounts  .= sprintf(
+			'<div class="donations__amounts %s">',
+			esc_attr( $donation['class'] )
+		);
+		foreach ( $donation['amounts'] as $amount ) {
+			$amounts .= sprintf(
+				'<div class="donations__amount" data-amount="%1$s">%2$s</div>',
+				esc_attr( $amount ),
+				esc_html( \Jetpack_Currencies::format_price( $amount, $currency ) )
+			);
+		}
+		$amounts    .= '</div>';
+		$extra_text .= sprintf(
+			'<p class="%1$s">%2$s</p>',
+			esc_attr( $donation['class'] ),
+			wp_kses_post( $donation['extraText'] )
+		);
+		$buttons    .= sprintf(
+			'<a class="wp-block-button__link donations__donate-button %1$s" href="%2$s">%3$s</a>',
+			esc_attr( $donation['class'] ),
+			esc_url( \Jetpack_Memberships::get_instance()->get_subscription_url( $plan_id ) ),
+			wp_kses_post( $donation['buttonText'] )
+		);
+	}
+	if ( $nav ) {
+		$nav .= '</div>';
+	}
+
+	$custom_amount = '';
+	if ( $attr['showCustomAmount'] ) {
+		$custom_amount        .= sprintf(
+			'<p>%s</p>',
+			wp_kses_post( $attr['customAmountText'] )
+		);
+		$default_custom_amount = \Jetpack_Memberships::SUPPORTED_CURRENCIES[ $currency ] * 100;
+		$custom_amount        .= sprintf(
+			'<div class="donations__amount donations__custom-amount">
+				%1$s
+				<div class="donations__amount-value" data-currency="%2$s" data-empty-text="%3$s"></div>
+			</div>',
+			esc_html( \Jetpack_Currencies::CURRENCIES[ $attr['currency'] ]['symbol'] ),
+			esc_attr( $attr['currency'] ),
+			esc_attr( \Jetpack_Currencies::format_price( $default_custom_amount, $currency, false ) )
+		);
+	}
+
+	return sprintf(
+		'
+<div class="%1$s">
+	<div class="donations__container">
+		%2$s
+		<div class="donations__content donations__deprecated">
+			<div class="donations__tab">
+				%3$s
+				<p>%4$s</p>
+				%5$s
+				%6$s
+				<hr class="donations__separator">
+				%7$s
+				%8$s
+			</div>
+		</div>
+	</div>
+</div>
+',
+		esc_attr( Blocks::classes( FEATURE_NAME, $attr ) ),
+		$nav,
+		$headings,
+		$attr['chooseAmountText'],
+		$amounts,
+		$custom_amount,
+		$extra_text,
+		$buttons
+	);
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/index.js b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/index.js
new file mode 100644
index 0000000000000..75e58f7f8cc67
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/index.js
@@ -0,0 +1,259 @@
+/**
+ * WordPress dependencies
+ */
+import { RichText } from '@wordpress/block-editor';
+import { __, sprintf } from '@wordpress/i18n';
+import { createBlock } from '@wordpress/blocks';
+import formatCurrency from '@automattic/format-currency';
+
+/**
+ * Internal dependencies
+ */
+import { ANNUAL_DONATION, MONTHLY_DONATION, ONE_TIME_DONATION } from '../../common/constants';
+import { minimumTransactionAmountForCurrency } from '../../../../shared/currencies';
+
+const mapAttributes = oldAttributes => ( {
+	[ ONE_TIME_DONATION ]: oldAttributes[ ONE_TIME_DONATION ].show,
+	[ MONTHLY_DONATION ]: oldAttributes[ MONTHLY_DONATION ].show,
+	[ ANNUAL_DONATION ]: oldAttributes[ ANNUAL_DONATION ].show,
+	showCustomAmount: oldAttributes.showCustomAmount,
+	currency: oldAttributes.currency,
+	fallbackLinkUrl: oldAttributes.fallbackLinkUrl,
+} );
+
+const createDonationView = (
+	donationType,
+	donation,
+	chooseAmountText,
+	customAmountText,
+	currency
+) =>
+	createBlock(
+		'jetpack/donations-view',
+		{
+			type: donationType,
+		},
+		[
+			createBlock( 'core/heading', {
+				content: donation.heading || __( 'Make a one-time donation', 'jetpack' ),
+				level: 3,
+			} ),
+			createBlock( 'core/paragraph', {
+				content: chooseAmountText || __( 'Choose an amount', 'jetpack' ),
+			} ),
+			createBlock(
+				'core/buttons',
+				{
+					className: 'donations__amounts',
+				},
+				donation.amounts.map( ( amount, index ) =>
+					createBlock( 'jetpack/donations-amount', {
+						label: sprintf(
+							// translators: %d: Tier level e.g: "1", "2", "3"
+							__( 'Tier %d', 'jetpack' ),
+							index + 1
+						),
+						amount: formatCurrency( amount, currency, { symbol: '' } ),
+						currency,
+						baseAmountMultiplier: 2 * index,
+					} )
+				)
+			),
+			createBlock( 'jetpack/donations-custom-amount', {}, [
+				createBlock( 'core/paragraph', {
+					content: customAmountText || __( 'Custom amount', 'jetpack' ),
+				} ),
+				createBlock(
+					'core/group',
+					{
+						layout: {
+							type: 'flex',
+							allowOrientation: false,
+						},
+					},
+					[
+						createBlock( 'jetpack/donations-amount', {
+							label: __( 'Custom amount', 'jetpack' ),
+							baseAmountMultiplier: 100,
+							currency,
+							amount: formatCurrency(
+								minimumTransactionAmountForCurrency( currency ) * 100,
+								currency,
+								{ symbol: '' }
+							),
+							className: 'donations__custom-amount',
+							disabled: true,
+						} ),
+					]
+				),
+			] ),
+			createBlock( 'core/separator', {
+				className: 'is-style-wide',
+			} ),
+			createBlock( 'core/paragraph', {
+				content: donation.extraText || __( 'Your contribution is appreciated.', 'jetpack' ),
+			} ),
+			createBlock( 'core/buttons', {}, [
+				createBlock( 'core/button', {
+					element: 'a',
+					text: donation.buttonText || __( 'Donate', 'jetpack' ),
+					className: 'donations__donate-button',
+				} ),
+			] ),
+		]
+	);
+
+export default {
+	attributes: {
+		currency: {
+			type: 'string',
+			default: 'USD',
+		},
+		oneTimeDonation: {
+			type: 'object',
+			default: {
+				show: true,
+				planId: null,
+				amounts: [ 5, 15, 100 ],
+				heading: __( 'Make a one-time donation', 'jetpack' ),
+				extraText: __( 'Your contribution is appreciated.', 'jetpack' ),
+				buttonText: __( 'Donate', 'jetpack' ),
+			},
+		},
+		monthlyDonation: {
+			type: 'object',
+			default: {
+				show: true,
+				planId: null,
+				amounts: [ 5, 15, 100 ],
+				heading: __( 'Make a monthly donation', 'jetpack' ),
+				extraText: __( 'Your contribution is appreciated.', 'jetpack' ),
+				buttonText: __( 'Donate monthly', 'jetpack' ),
+			},
+		},
+		annualDonation: {
+			type: 'object',
+			default: {
+				show: true,
+				planId: null,
+				amounts: [ 5, 15, 100 ],
+				heading: __( 'Make a yearly donation', 'jetpack' ),
+				extraText: __( 'Your contribution is appreciated.', 'jetpack' ),
+				buttonText: __( 'Donate yearly', 'jetpack' ),
+			},
+		},
+		showCustomAmount: {
+			type: 'boolean',
+			default: true,
+		},
+		chooseAmountText: {
+			type: 'string',
+			default: __( 'Choose an amount', 'jetpack' ),
+		},
+		customAmountText: {
+			type: 'string',
+			default: __( 'Or enter a custom amount', 'jetpack' ),
+		},
+		fallbackLinkUrl: {
+			type: 'string',
+			default: '',
+		},
+	},
+	supports: {
+		html: false,
+	},
+	save: ( { attributes } ) => {
+		const { fallbackLinkUrl, oneTimeDonation, monthlyDonation, annualDonation } = attributes;
+
+		if (
+			! oneTimeDonation ||
+			! oneTimeDonation.show ||
+			! oneTimeDonation.planId ||
+			oneTimeDonation.planId === -1
+		) {
+			return null;
+		}
+
+		return (
+			<div>
+				<RichText.Content tagName="h4" value={ oneTimeDonation.heading } />
+				<RichText.Content tagName="p" value={ oneTimeDonation.extraText } />
+				<RichText.Content
+					tagName="a"
+					className="jetpack-donations-fallback-link"
+					href={ fallbackLinkUrl }
+					rel="noopener noreferrer noamphtml"
+					target="_blank"
+					value={ oneTimeDonation.buttonText }
+				/>
+				{ monthlyDonation.show && (
+					<>
+						<hr className="donations__separator" />
+						<RichText.Content tagName="h4" value={ monthlyDonation.heading } />
+						<RichText.Content tagName="p" value={ monthlyDonation.extraText } />
+						<RichText.Content
+							tagName="a"
+							className="jetpack-donations-fallback-link"
+							href={ fallbackLinkUrl }
+							rel="noopener noreferrer noamphtml"
+							target="_blank"
+							value={ monthlyDonation.buttonText }
+						/>
+					</>
+				) }
+				{ annualDonation.show && (
+					<>
+						<hr className="donations__separator" />
+						<RichText.Content tagName="h4" value={ annualDonation.heading } />
+						<RichText.Content tagName="p" value={ annualDonation.extraText } />
+						<RichText.Content
+							tagName="a"
+							className="jetpack-donations-fallback-link"
+							href={ fallbackLinkUrl }
+							rel="noopener noreferrer noamphtml"
+							target="_blank"
+							value={ annualDonation.buttonText }
+						/>
+					</>
+				) }
+			</div>
+		);
+	},
+	migrate: attributes => {
+		const mappedAttributes = mapAttributes( attributes );
+		const {
+			oneTimeDonation,
+			monthlyDonation,
+			annualDonation,
+			chooseAmountText,
+			customAmountText,
+			currency,
+		} = attributes;
+
+		const innerBlocks = [
+			createDonationView(
+				ONE_TIME_DONATION,
+				oneTimeDonation,
+				chooseAmountText,
+				customAmountText,
+				currency
+			),
+			createDonationView(
+				MONTHLY_DONATION,
+				monthlyDonation,
+				chooseAmountText,
+				customAmountText,
+				currency
+			),
+			createDonationView(
+				ANNUAL_DONATION,
+				annualDonation,
+				chooseAmountText,
+				customAmountText,
+				currency
+			),
+		];
+
+		return [ mappedAttributes, innerBlocks ];
+	},
+};
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/view.js b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/view.js
new file mode 100644
index 0000000000000..fb32f7fa29d9e
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/deprecated/v2/view.js
@@ -0,0 +1,230 @@
+/**
+ * External dependencies
+ */
+import formatCurrency from '@automattic/format-currency';
+
+/**
+ * WordPress dependencies
+ */
+import { ENTER } from '@wordpress/keycodes';
+import { addQueryArgs, removeQueryArgs } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { minimumTransactionAmountForCurrency, parseAmount } from '../../../../shared/currencies';
+
+class JetpackDonationsV2 {
+	init( block ) {
+		this.block = block;
+		this.amount = null;
+		this.isCustomAmount = false;
+		this.interval = 'one-time';
+
+		// Initialize block.
+		this.initNavigation();
+		this.handleCustomAmount();
+		this.handleChosenAmount();
+
+		// Remove loading spinner.
+		this.block.querySelector( '.donations__container' ).classList.add( 'loaded' );
+	}
+
+	getNavItem( interval ) {
+		return this.block.querySelector( `.donations__nav-item[data-interval="${ interval }"]` );
+	}
+
+	resetSelectedAmount() {
+		const selectedAmount = this.block.querySelector( '.donations__amount.is-selected' );
+		if ( selectedAmount ) {
+			selectedAmount.classList.remove( 'is-selected' );
+		}
+	}
+
+	getDonateButton() {
+		const buttonIntervalClasses = {
+			'one-time': 'donations__one-time-item',
+			'1 month': 'donations__monthly-item',
+			'1 year': 'donations__annual-item',
+		};
+		return this.block.querySelector(
+			`.donations__donate-button.${ buttonIntervalClasses[ this.interval ] }`
+		);
+	}
+
+	toggleDonateButton( enable ) {
+		const donateButton = this.getDonateButton();
+		enable
+			? donateButton.classList.remove( 'is-disabled' )
+			: donateButton.classList.add( 'is-disabled' );
+	}
+
+	updateUrl() {
+		const donateButton = this.getDonateButton();
+		const url = donateButton.getAttribute( 'href' );
+		if ( this.amount ) {
+			donateButton.setAttribute(
+				'href',
+				addQueryArgs( url, {
+					amount: this.amount,
+					...( this.isCustomAmount && { customAmount: true } ),
+				} )
+			);
+		} else {
+			donateButton.setAttribute( 'href', removeQueryArgs( url, 'amount', 'customAmount' ) );
+		}
+	}
+
+	updateAmountFromCustomAmountInput() {
+		const input = this.block.querySelector( '.donations__custom-amount .donations__amount-value' );
+		const wrapper = this.block.querySelector( '.donations__custom-amount' );
+
+		const amount = input.innerHTML;
+		if ( ! amount ) {
+			this.amount = null;
+			this.toggleDonateButton( false );
+			return;
+		}
+
+		// Validates the amount.
+		const currency = input.dataset.currency;
+		const parsedAmount = parseAmount( amount, currency );
+		if ( parsedAmount && parsedAmount >= minimumTransactionAmountForCurrency( currency ) ) {
+			wrapper.classList.remove( 'has-error' );
+			this.amount = parsedAmount;
+			this.toggleDonateButton( true );
+		} else {
+			wrapper.classList.add( 'has-error' );
+			this.amount = null;
+			this.toggleDonateButton( false );
+		}
+		this.updateUrl();
+	}
+
+	initNavigation() {
+		const navItems = this.block.querySelectorAll( '.donations__nav-item' );
+		const tabContent = this.block.querySelector( '.donations__tab' );
+		const tabContentClasses = {
+			'one-time': 'is-one-time',
+			'1 month': 'is-monthly',
+			'1 year': 'is-annual',
+		};
+
+		const handleClick = event => {
+			// Update selected interval.
+			const prevInterval = this.interval;
+			const newInterval = event.target.dataset.interval;
+			this.interval = newInterval;
+
+			// Toggle nav item.
+			const prevNavItem = this.getNavItem( prevInterval );
+			if ( prevNavItem ) {
+				prevNavItem.classList.remove( 'is-active' );
+			}
+			const newNavItem = this.getNavItem( newInterval );
+			if ( newNavItem ) {
+				newNavItem.classList.add( 'is-active' );
+			}
+
+			// Toggle tab content.
+			tabContent.classList.remove( tabContentClasses[ prevInterval ] );
+			tabContent.classList.add( tabContentClasses[ newInterval ] );
+
+			// Reset chosen amount.
+			this.amount = null;
+			this.isCustomAmount = false;
+			this.resetSelectedAmount();
+			this.updateUrl();
+
+			// Disable donate button.
+			this.toggleDonateButton( false );
+		};
+
+		navItems.forEach( navItem => {
+			navItem.addEventListener( 'click', handleClick );
+			navItem.addEventListener( 'keydown', handleClick );
+		} );
+
+		// Activates the default tab on first execution.
+		const navItem = this.getNavItem( this.interval );
+		if ( navItem ) {
+			navItem.classList.add( 'is-active' );
+		}
+		tabContent.classList.add( tabContentClasses[ this.interval ] );
+	}
+
+	handleCustomAmount() {
+		const input = this.block.querySelector( '.donations__custom-amount .donations__amount-value' );
+		if ( ! input ) {
+			return;
+		}
+
+		const wrapper = this.block.querySelector( '.donations__custom-amount' );
+
+		// Make input editable.
+		input.setAttribute( 'contenteditable', '' );
+
+		// Prevent new lines.
+		input.addEventListener( 'keydown', event => {
+			if ( event.keyCode === ENTER ) {
+				event.preventDefault();
+			}
+		} );
+
+		input.addEventListener( 'focus', () => {
+			// Toggle selected amount.
+			this.resetSelectedAmount();
+			wrapper.classList.add( 'is-selected' );
+
+			if ( this.isCustomAmount ) {
+				return;
+			}
+			this.isCustomAmount = true;
+			this.updateAmountFromCustomAmountInput();
+		} );
+
+		input.addEventListener( 'blur', () => {
+			if ( ! this.isCustomAmount || ! this.amount ) {
+				return;
+			}
+
+			// Formats the entered amount.
+			input.innerHTML = formatCurrency( this.amount, input.dataset.currency, {
+				symbol: '',
+			} );
+		} );
+
+		input.addEventListener( 'input', () => this.updateAmountFromCustomAmountInput() );
+	}
+
+	handleChosenAmount() {
+		const prefixedAmounts = this.block.querySelectorAll(
+			'.donations__amount:not( .donations__custom-amount )'
+		);
+		prefixedAmounts.forEach( amount => {
+			amount.addEventListener( 'click', event => {
+				// Toggle amount.
+				this.resetSelectedAmount();
+				event.target.classList.add( 'is-selected' );
+				this.amount = event.target.dataset.amount;
+				this.isCustomAmount = false;
+				const customAmountWrapper = this.block.querySelector( '.donations__custom-amount' );
+				if ( customAmountWrapper ) {
+					customAmountWrapper.classList.remove( 'has-error' );
+				}
+				this.updateUrl();
+
+				// Enables the donate button.
+				const donateButton = this.getDonateButton();
+				donateButton.classList.remove( 'is-disabled' );
+			} );
+		} );
+
+		// Disable all buttons on init since no amount has been chosen yet.
+		this.block
+			.querySelectorAll( '.donations__donate-button' )
+			.forEach( button => button.classList.add( 'is-disabled' ) );
+	}
+}
+
+export default JetpackDonationsV2;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/donations-view/donations-view.php b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/donations-view.php
new file mode 100644
index 0000000000000..8eb0cf177b67b
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/donations-view.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Donations View Child Block.
+ *
+ * @package automattic/jetpack
+ */
+
+namespace Automattic\Jetpack\Extensions\Donations;
+
+use Automattic\Jetpack\Blocks;
+use Jetpack_Gutenberg;
+use Jetpack_Memberships;
+
+const DONATIONS_VIEW_BLOCK_NAME = 'donations-view';
+
+/**
+ * Registers the block for use in Gutenberg
+ * This is done via an action so that we can disable
+ * registration if we need to.
+ */
+function register_donations_view_block() {
+	Blocks::jetpack_register_block(
+		DONATIONS_VIEW_BLOCK_NAME,
+		array(
+			'render_callback' => __NAMESPACE__ . '\render_donations_view_block',
+			'plan_check'      => false,
+		)
+	);
+}
+
+add_action( 'init', __NAMESPACE__ . '\register_donations_view_block' );
+
+/**
+ * Render callback.
+ *
+ * @param array  $attr Array containing the block attributes.
+ * @param string $content    String containing the block content.
+ *
+ * @return string
+ */
+function render_donations_view_block( $attr, $content ) {
+	Jetpack_Gutenberg::load_styles_as_required( DONATIONS_VIEW_BLOCK_NAME );
+
+	require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
+
+	// If stripe isn't connected don't show anything to potential donors - they can't actually make a donation.
+	if ( ! Jetpack_Memberships::get_connected_account_id() ) {
+		return '';
+	}
+
+	// If we don't have a plan id we don't display the donation view.
+	if ( ! $attr['planId'] || $attr['planId'] < 0 ) {
+		return '';
+	}
+
+	$donation_url = esc_url( Jetpack_Memberships::get_instance()->get_subscription_url( $attr['planId'] ) );
+
+	return preg_replace( '/(donations__donate-button.*><a\b[^><]*)>/i', '$1 href="' . esc_url( $donation_url ) . '">', $content );
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/donations-view/edit.js b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/edit.js
new file mode 100644
index 0000000000000..7cdb5994cd55e
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/edit.js
@@ -0,0 +1,109 @@
+/**
+ * Internal dependencies
+ */
+import DonationsContext from '../common/context';
+import { ANNUAL_DONATION, MONTHLY_DONATION, ONE_TIME_DONATION } from '../common/constants';
+
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
+/**
+ * WordPress dependencies
+ */
+import { useContext } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
+import { InnerBlocks } from '@wordpress/block-editor';
+
+const types = {
+	[ ONE_TIME_DONATION ]: {
+		heading: __( 'Make a one-time donation', 'jetpack' ),
+		cta: __( 'Donate', 'jetpack' ),
+	},
+	[ MONTHLY_DONATION ]: {
+		heading: __( 'Make a monthly donation', 'jetpack' ),
+		cta: __( 'Donate monthly', 'jetpack' ),
+	},
+	[ ANNUAL_DONATION ]: {
+		heading: __( 'Make a yearly donation', 'jetpack' ),
+		cta: __( 'Donate yearly', 'jetpack' ),
+	},
+};
+
+const Edit = props => {
+	const { attributes, setAttributes } = props;
+	const { type } = attributes;
+	const { heading, cta } = types[ type ];
+	const { activeTab, fallbackLinkUrl, products } = useContext( DonationsContext );
+	const planId = products[ type ];
+
+	setAttributes( { fallbackLinkUrl, planId } );
+
+	return (
+		<div className={ classNames( 'donations__view', { 'is-active': activeTab === type } ) }>
+			<InnerBlocks
+				templateLock={ true }
+				template={ [
+					[
+						'core/heading',
+						{
+							content: heading,
+							level: 3,
+						},
+					],
+					[
+						'core/paragraph',
+						{
+							content: __( 'Choose an amount', 'jetpack' ),
+						},
+					],
+					[
+						'core/buttons',
+						{ className: 'donations__amounts' },
+						[ 10, 30, 200 ].map( ( multiplier, index ) => [
+							'jetpack/donations-amount',
+							{
+								label: sprintf(
+									// translators: %d: Tier level e.g: "1", "2", "3"
+									__( 'Tier %d', 'jetpack' ),
+									index + 1
+								),
+								baseAmountMultiplier: multiplier,
+							},
+						] ),
+					],
+					[ 'jetpack/donations-custom-amount', {} ],
+					[
+						'core/separator',
+						{
+							className: 'is-style-wide',
+						},
+					],
+					[
+						'core/paragraph',
+						{
+							content: __( 'Your contribution is appreciated.', 'jetpack' ),
+						},
+					],
+					[
+						'core/buttons',
+						{},
+						[
+							[
+								'core/button',
+								{
+									element: 'a',
+									text: cta,
+									className: 'donations__donate-button',
+								},
+							],
+						],
+					],
+				] }
+			/>
+		</div>
+	);
+};
+
+export default Edit;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/donations-view/index.js b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/index.js
new file mode 100644
index 0000000000000..a348e29b718d4
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/index.js
@@ -0,0 +1,59 @@
+/**
+ * Internal dependencies
+ */
+import edit from './edit';
+import save from './save';
+import {
+	ANNUAL_DONATION,
+	DEFAULT_TAB,
+	MONTHLY_DONATION,
+	ONE_TIME_DONATION,
+} from '../common/constants';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * External dependencies
+ */
+import { DonationsIcon } from '../../../shared/icons';
+
+const name = 'donations-view';
+
+const blockTitles = {
+	[ ONE_TIME_DONATION ]: __( 'One Time Donation View', 'jetpack' ),
+	[ MONTHLY_DONATION ]: __( 'Monthly Donation View', 'jetpack' ),
+	[ ANNUAL_DONATION ]: __( 'Annual Donation View', 'jetpack' ),
+};
+
+const settings = {
+	title: __( 'Donations View', 'jetpack' ),
+	description: __( 'Collect one-time, monthly, or annually recurring donations.', 'jetpack' ),
+	icon: DonationsIcon,
+	__experimentalLabel: ( { type } ) => blockTitles[ type ],
+	category: 'earn',
+	attributes: {
+		type: {
+			type: 'string',
+			default: DEFAULT_TAB,
+		},
+		fallbackLinkUrl: {
+			type: 'string',
+			default: '',
+		},
+		planId: {
+			type: 'string',
+			default: '',
+		},
+	},
+	edit,
+	save,
+	supports: {
+		inserter: false,
+		html: false,
+	},
+};
+
+export { name, settings };
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/donations-view/save.js b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/save.js
new file mode 100644
index 0000000000000..f91b01097bef6
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/donations/donations-view/save.js
@@ -0,0 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { InnerBlocks } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { ANNUAL_DONATION, MONTHLY_DONATION, ONE_TIME_DONATION } from '../common/constants';
+
+const typeClassMap = {
+	[ ONE_TIME_DONATION ]: 'donations__one-time-item',
+	[ MONTHLY_DONATION ]: 'donations__monthly-item',
+	[ ANNUAL_DONATION ]: 'donations__annual-item',
+};
+
+export default function Save( { attributes } ) {
+	const { type } = attributes;
+
+	return (
+		<div className={ typeClassMap[ type ] }>
+			<InnerBlocks.Content />
+		</div>
+	);
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/donations.php b/projects/plugins/jetpack/extensions/blocks/donations/donations.php
index f4f2c08ee0b98..e75ba418704a9 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/donations.php
+++ b/projects/plugins/jetpack/extensions/blocks/donations/donations.php
@@ -11,6 +11,12 @@
 
 use Automattic\Jetpack\Blocks;
 use Jetpack_Gutenberg;
+use Jetpack_Memberships;
+use WP_Block;
+
+require_once __DIR__ . '/donations-view/donations-view.php';
+require_once __DIR__ . '/amount/amount.php';
+require_once __DIR__ . '/custom-amount/custom-amount.php';
 
 const FEATURE_NAME = 'donations';
 const BLOCK_NAME   = 'jetpack/' . FEATURE_NAME;
@@ -27,73 +33,55 @@ function register_block() {
 			'render_callback' => __NAMESPACE__ . '\render_block',
 			'plan_check'      => true,
 			'attributes'      => array(
-				'currency'         => array(
-					'type'    => 'string',
-					'default' => 'USD',
-				),
 				'oneTimeDonation'  => array(
-					'type'    => 'object',
-					'default' => array(
-						'show'       => true,
-						'planId'     => null,
-						'amounts'    => array( 5, 15, 100 ),
-						'heading'    => __( 'Make a one-time donation', 'jetpack' ),
-						'extraText'  => __( 'Your contribution is appreciated.', 'jetpack' ),
-						'buttonText' => __( 'Donate', 'jetpack' ),
-					),
+					'type'    => 'boolean',
+					'default' => true,
 				),
 				'monthlyDonation'  => array(
-					'type'    => 'object',
-					'default' => array(
-						'show'       => true,
-						'planId'     => null,
-						'amounts'    => array( 5, 15, 100 ),
-						'heading'    => __( 'Make a monthly donation', 'jetpack' ),
-						'extraText'  => __( 'Your contribution is appreciated.', 'jetpack' ),
-						'buttonText' => __( 'Donate monthly', 'jetpack' ),
-					),
+					'type'    => 'boolean',
+					'default' => true,
 				),
 				'annualDonation'   => array(
-					'type'    => 'object',
-					'default' => array(
-						'show'       => true,
-						'planId'     => null,
-						'amounts'    => array( 5, 15, 100 ),
-						'heading'    => __( 'Make a yearly donation', 'jetpack' ),
-						'extraText'  => __( 'Your contribution is appreciated.', 'jetpack' ),
-						'buttonText' => __( 'Donate yearly', 'jetpack' ),
-					),
+					'type'    => 'boolean',
+					'default' => true,
 				),
 				'showCustomAmount' => array(
 					'type'    => 'boolean',
 					'default' => true,
 				),
-				'chooseAmountText' => array(
-					'type'    => 'string',
-					'default' => __( 'Choose an amount', 'jetpack' ),
-				),
-				'customAmountText' => array(
+				'currency'         => array(
 					'type'    => 'string',
-					'default' => __( 'Or enter a custom amount', 'jetpack' ),
+					'default' => 'USD',
 				),
 				'fallbackLinkUrl'  => array(
-					'type' => 'string',
+					'type'    => 'string',
+					'default' => '',
 				),
 			),
 		)
 	);
 }
+
 add_action( 'init', __NAMESPACE__ . '\register_block' );
 
 /**
  * Donations block dynamic rendering.
  *
- * @param array  $attr    Array containing the Donations block attributes.
- * @param string $content String containing the Donations block content.
+ * @param array    $attr    Array containing the Donations block attributes.
+ * @param string   $content String containing the Donations block content.
+ * @param WP_Block $block   The actual block that we are rendering.
  *
  * @return string
  */
-function render_block( $attr, $content ) {
+function render_block( $attr, $content, $block ) {
+	foreach ( $block->parsed_block['attrs'] as $attribute => $value ) {
+		// We validate if the stored block's attribute doesn't exist or if it has another type.
+		if ( ! isset( $block->block_type->attributes[ $attribute ] ) || gettype( $value ) !== $block->block_type->attributes[ $attribute ]['type'] ) {
+			require_once __DIR__ . '/deprecated/v2/donations.php';
+			return render_block_v2( $block->parsed_block['attrs'], $block->parsed_block['innerHTML'] );
+		}
+	}
+
 	// Keep content as-is if rendered in other contexts than frontend (i.e. feed, emails, API, etc.).
 	if ( ! jetpack_is_frontend() ) {
 		return $content;
@@ -102,7 +90,7 @@ function render_block( $attr, $content ) {
 	require_once JETPACK__PLUGIN_DIR . 'modules/memberships/class-jetpack-memberships.php';
 
 	// If stripe isn't connected don't show anything to potential donors - they can't actually make a donation.
-	if ( ! \Jetpack_Memberships::get_connected_account_id() ) {
+	if ( ! Jetpack_Memberships::get_connected_account_id() ) {
 		return '';
 	}
 
@@ -112,152 +100,82 @@ function render_block( $attr, $content ) {
 	jetpack_require_lib( 'class-jetpack-currencies' );
 
 	$donations = array(
-		'one-time' => array_merge(
-			array(
-				'title' => __( 'One-Time', 'jetpack' ),
-				'class' => 'donations__one-time-item',
-			),
-			$attr['oneTimeDonation']
+		array(
+			'title'    => __( 'One-Time', 'jetpack' ),
+			'class'    => 'donations__one-time-item',
+			'interval' => 'one-time',
 		),
 	);
-	if ( $attr['monthlyDonation']['show'] ) {
-		$donations['1 month'] = array_merge(
-			array(
-				'title' => __( 'Monthly', 'jetpack' ),
-				'class' => 'donations__monthly-item',
-			),
-			$attr['monthlyDonation']
+
+	if ( $attr['monthlyDonation'] ) {
+		$donations[] = array(
+			'title'    => __( 'Monthly', 'jetpack' ),
+			'class'    => 'donations__monthly-item',
+			'interval' => '1 month',
 		);
 	}
-	if ( $attr['annualDonation']['show'] ) {
-		$donations['1 year'] = array_merge(
-			array(
-				'title' => __( 'Yearly', 'jetpack' ),
-				'class' => 'donations__annual-item',
-			),
-			$attr['annualDonation']
+
+	if ( $attr['annualDonation'] ) {
+		$donations[] = array(
+			'title'    => __( 'Yearly', 'jetpack' ),
+			'class'    => 'donations__annual-item',
+			'interval' => '1 year',
 		);
 	}
 
-	$currency   = $attr['currency'];
-	$nav        = '';
-	$headings   = '';
-	$amounts    = '';
-	$extra_text = '';
-	$buttons    = '';
-	foreach ( $donations as $interval => $donation ) {
-		$plan_id = (int) $donation['planId'];
-		$plan    = get_post( $plan_id );
-		if ( ! $plan || is_wp_error( $plan ) ) {
-			continue;
-		}
-
-		if ( count( $donations ) > 1 ) {
-			if ( ! $nav ) {
-				$nav .= '<div class="donations__nav">';
-			}
-			$nav .= sprintf(
-				'<div role="button" tabindex="0" class="donations__nav-item" data-interval="%1$s">%2$s</div>',
-				esc_attr( $interval ),
+	$navigation_items = array_map(
+		function ( $donation, $index ) {
+			return sprintf(
+				'<div role="button" tabindex="%1$u" class="donations__nav-item" data-interval="%2$s">%3$s</div>',
+				esc_attr( $index ),
+				esc_attr( $donation['interval'] ),
 				esc_html( $donation['title'] )
 			);
-		}
-		$headings .= sprintf(
-			'<h4 class="%1$s">%2$s</h4>',
-			esc_attr( $donation['class'] ),
-			wp_kses_post( $donation['heading'] )
-		);
-		$amounts  .= sprintf(
-			'<div class="donations__amounts %s">',
-			esc_attr( $donation['class'] )
-		);
-		foreach ( $donation['amounts'] as $amount ) {
-			$amounts .= sprintf(
-				'<div class="donations__amount" data-amount="%1$s">%2$s</div>',
-				esc_attr( $amount ),
-				esc_html( \Jetpack_Currencies::format_price( $amount, $currency ) )
-			);
-		}
-		$amounts    .= '</div>';
-		$extra_text .= sprintf(
-			'<p class="%1$s">%2$s</p>',
-			esc_attr( $donation['class'] ),
-			wp_kses_post( $donation['extraText'] )
-		);
-		$buttons    .= sprintf(
-			'<a class="wp-block-button__link donations__donate-button %1$s" href="%2$s">%3$s</a>',
-			esc_attr( $donation['class'] ),
-			esc_url( \Jetpack_Memberships::get_instance()->get_subscription_url( $plan_id ) ),
-			wp_kses_post( $donation['buttonText'] )
-		);
-	}
-	if ( $nav ) {
-		$nav .= '</div>';
-	}
-
-	$custom_amount = '';
-	if ( $attr['showCustomAmount'] ) {
-		$custom_amount        .= sprintf(
-			'<p>%s</p>',
-			wp_kses_post( $attr['customAmountText'] )
-		);
-		$default_custom_amount = \Jetpack_Memberships::SUPPORTED_CURRENCIES[ $currency ] * 100;
-		$custom_amount        .= sprintf(
-			'<div class="donations__amount donations__custom-amount">
-				%1$s
-				<div class="donations__amount-value" data-currency="%2$s" data-empty-text="%3$s"></div>
-			</div>',
-			esc_html( \Jetpack_Currencies::CURRENCIES[ $attr['currency'] ]['symbol'] ),
-			esc_attr( $attr['currency'] ),
-			esc_attr( \Jetpack_Currencies::format_price( $default_custom_amount, $currency, false ) )
-		);
-	}
+		},
+		$donations,
+		array_keys( $donations )
+	);
 
-	return sprintf(
-		'
+	$template = '
 <div class="%1$s">
 	<div class="donations__container">
-		%2$s
+		<div class="donations__nav">
+			%2$s
+		</div>
 		<div class="donations__content">
-			<div class="donations__tab">
-				%3$s
-				<p>%4$s</p>
-				%5$s
-				%6$s
-				<hr class="donations__separator">
-				%7$s
-				%8$s
-			</div>
+			%3$s
 		</div>
 	</div>
-</div>
-',
-		esc_attr( Blocks::classes( FEATURE_NAME, $attr ) ),
-		$nav,
-		$headings,
-		$attr['chooseAmountText'],
-		$amounts,
-		$custom_amount,
-		$extra_text,
-		$buttons
+</div>';
+
+	return sprintf(
+		$template,
+		esc_attr( Blocks::classes( 'donations', $attr ) ),
+		implode( "\n", $navigation_items ),
+		$content
 	);
 }
 
 /**
  * Determine if AMP should be disabled on posts having Donations blocks.
  *
- * @param bool    $skip Skipped.
+ * @param bool    $skip    Skipped.
  * @param int     $post_id Post ID.
- * @param WP_Post $post Post.
+ * @param WP_Post $post    Post.
  *
  * @return bool Whether to skip the post from AMP.
  */
 function amp_skip_post( $skip, $post_id, $post ) {
 	// When AMP is on standard mode, there are no non-AMP posts to link to where the donation can be completed, so let's
 	// prevent the post from being available in AMP.
-	if ( function_exists( 'amp_is_canonical' ) && \amp_is_canonical() && has_block( BLOCK_NAME, $post->post_content ) ) {
+	if ( function_exists( 'amp_is_canonical' ) && \amp_is_canonical() && has_block(
+		BLOCK_NAME,
+		$post->post_content
+	) ) {
 		return true;
 	}
+
 	return $skip;
 }
+
 add_filter( 'amp_skip_post', __NAMESPACE__ . '\amp_skip_post', 10, 3 );
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/edit.js b/projects/plugins/jetpack/extensions/blocks/donations/edit.js
index c0667a599be95..dc8cb68280da9 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/edit.js
@@ -1,62 +1,120 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
-import { useState, useEffect } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import { useEffect, useState } from '@wordpress/element';
+import { InnerBlocks } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
 
 /**
  * Internal dependencies
  */
-import Tabs from './tabs';
-import LoadingError from './loading-error';
-import fetchDefaultProducts from './fetch-default-products';
-import fetchStatus from './fetch-status';
+import {
+	ANNUAL_DONATION,
+	DEFAULT_TAB,
+	MONTHLY_DONATION,
+	ONE_TIME_DONATION,
+} from './common/constants';
+import Context from './common/context';
+import Controls from './controls';
+import fetchStatus from '../donations/fetch-status';
+import fetchDefaultProducts from '../donations/fetch-default-products';
+import LoadingError from '../donations/loading-error';
+import StripeNudge from '../../shared/components/stripe-nudge';
+
+const tabs = [
+	{
+		id: ONE_TIME_DONATION,
+		label: __( 'One-Time', 'jetpack' ),
+	},
+	{
+		id: MONTHLY_DONATION,
+		label: __( 'Monthly', 'jetpack' ),
+	},
+	{
+		id: ANNUAL_DONATION,
+		label: __( 'Yearly', 'jetpack' ),
+	},
+];
+
+const defaultProducts = {
+	[ ONE_TIME_DONATION ]: -1,
+	[ MONTHLY_DONATION ]: -1,
+	[ ANNUAL_DONATION ]: -1,
+};
+
+const intervalMap = {
+	'one-time': ONE_TIME_DONATION,
+	'1 month': MONTHLY_DONATION,
+	'1 year': ANNUAL_DONATION,
+};
+
+const DonationTabButton = ( { label, id, tabIndex, isActive, onActivateTab } ) => {
+	return (
+		<div
+			role="button"
+			tabIndex={ tabIndex }
+			className={ classNames( 'donations__nav-item', {
+				'is-active': isActive,
+			} ) }
+			onClick={ () => onActivateTab( id ) }
+			onKeyDown={ () => onActivateTab( id ) }
+			key={ `jetpack-donations-nav-item-${ tabIndex }` }
+		>
+			{ label }
+		</div>
+	);
+};
 
 const Edit = props => {
-	const { attributes, className, setAttributes } = props;
-	const { currency } = attributes;
+	const { attributes, className } = props;
+	const { currency, annualDonation, monthlyDonation, showCustomAmount } = attributes;
 
 	const [ loadingError, setLoadingError ] = useState( '' );
 	const [ shouldUpgrade, setShouldUpgrade ] = useState( false );
 	const [ stripeConnectUrl, setStripeConnectUrl ] = useState( false );
-	const [ products, setProducts ] = useState( [] );
+	const [ products, setProducts ] = useState( defaultProducts );
+	const [ activeTab, setActiveTab ] = useState( DEFAULT_TAB );
 
-	const post = useSelect( select => select( 'core/editor' ).getCurrentPost(), [] );
-	useEffect( () => {
-		setAttributes( { fallbackLinkUrl: post.link } );
-	}, [ post.link, setAttributes ] );
+	const fallbackLinkUrl = useSelect( select => select( 'core/editor' ).getCurrentPost(), [] ).link;
+	const postId = useSelect( select => select( 'core/editor' ).getCurrentPostId(), [] );
 
-	const apiError = message => {
-		setLoadingError( message );
+	const resetActiveTab = ( controlTab, value ) => {
+		if ( value === false && activeTab === controlTab ) {
+			setActiveTab( DEFAULT_TAB );
+		}
 	};
 
 	const filterProducts = productList =>
 		productList.reduce( ( filteredProducts, { id, currency: productCurrency, type, interval } ) => {
 			if ( productCurrency === currency && type === 'donation' ) {
-				filteredProducts[ interval ] = id;
+				const mappedInterval = intervalMap[ interval ];
+				if ( mappedInterval ) {
+					filteredProducts[ mappedInterval ] = id;
+				}
 			}
 			return filteredProducts;
 		}, {} );
 
 	const hasRequiredProducts = productIdsPerInterval => {
 		const intervals = Object.keys( productIdsPerInterval );
-
-		return (
-			intervals.includes( 'one-time' ) &&
-			intervals.includes( '1 month' ) &&
-			intervals.includes( '1 year' )
-		);
+		return Object.keys( defaultProducts ).every( required => intervals.includes( required ) );
 	};
 
 	const mapStatusToState = result => {
-		if ( ( ! result && typeof result !== 'object' ) || result.errors ) {
-			setLoadingError( __( 'Could not load data from WordPress.com.', 'jetpack' ) );
-			return;
-		}
 		setShouldUpgrade( result.should_upgrade_to_access_memberships );
 		setStripeConnectUrl( result.connect_url );
 
+		if ( result.should_upgrade_to_access_memberships || result.connect_url ) {
+			setProducts( defaultProducts );
+			return;
+		}
+
 		const filteredProducts = filterProducts( result.products );
 
 		if ( hasRequiredProducts( filteredProducts ) ) {
@@ -64,26 +122,14 @@ const Edit = props => {
 			return;
 		}
 
-		// Set fake products when plan should be upgraded or there is no connection to Stripe so users can still try the
-		// block in the editor.
-		if ( result.should_upgrade_to_access_memberships || result.connect_url ) {
-			setProducts( {
-				'one-time': -1,
-				'1 month': -1,
-				'1 year': -1,
-			} );
-			return;
-		}
-
 		// Only create products if we have the correct plan and stripe connection.
-		fetchDefaultProducts( currency ).then( defaultProducts => {
-			return setProducts( filterProducts( defaultProducts ) );
-		}, apiError );
+		fetchDefaultProducts( currency ).then( defaultFetchedProducts => {
+			return setProducts( filterProducts( defaultFetchedProducts ) );
+		}, setLoadingError );
 	};
 
 	useEffect( () => {
-		const updateData = () => fetchStatus( 'donation' ).then( mapStatusToState, apiError );
-		updateData();
+		fetchStatus( 'donation' ).then( mapStatusToState, setLoadingError );
 	}, [ currency ] );
 
 	if ( loadingError ) {
@@ -91,12 +137,51 @@ const Edit = props => {
 	}
 
 	return (
-		<Tabs
-			{ ...props }
-			products={ products }
-			shouldUpgrade={ shouldUpgrade }
-			stripeConnectUrl={ stripeConnectUrl }
-		/>
+		<div className="wp-block-jetpack-donations">
+			{ ! shouldUpgrade && stripeConnectUrl && (
+				<StripeNudge
+					blockName="donations"
+					postId={ postId }
+					stripeConnectUrl={ stripeConnectUrl }
+				/>
+			) }
+			<div className="donations__container">
+				{ ( annualDonation || monthlyDonation ) && (
+					<div className="donations__nav">
+						{ tabs.map(
+							( { id, label }, index ) =>
+								attributes[ id ] && (
+									<DonationTabButton
+										label={ label }
+										id={ id }
+										tabIndex={ index }
+										isActive={ activeTab === id }
+										onActivateTab={ setActiveTab }
+									/>
+								)
+						) }
+					</div>
+				) }
+				<div className="donations__content ">
+					<Context.Provider
+						value={ { activeTab, fallbackLinkUrl, products, currency, showCustomAmount } }
+					>
+						<InnerBlocks
+							allowedBlocks={ [ 'jetpack/donations-view' ] }
+							templateLock={ 'all' }
+							template={ [
+								[ 'jetpack/donations-view', { type: ONE_TIME_DONATION } ],
+								[ 'jetpack/donations-view', { type: MONTHLY_DONATION } ],
+								[ 'jetpack/donations-view', { type: ANNUAL_DONATION } ],
+							] }
+							__experimentalCaptureToolbars={ true }
+							templateInsertUpdatesSelection={ false }
+						/>
+					</Context.Provider>
+				</div>
+				<Controls { ...props } onChangeTab={ resetActiveTab } />
+			</div>
+		</div>
 	);
 };
 
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/editor.js b/projects/plugins/jetpack/extensions/blocks/donations/editor.js
index d05f403942058..9090d4c76f11f 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/editor.js
@@ -2,6 +2,20 @@
  * Internal dependencies
  */
 import registerJetpackBlock from '../../shared/register-jetpack-block';
-import { name, settings } from '.';
+import { name as donationsBlockName, settings as donationsBlockSettings } from '.';
+import {
+	name as donationsViewName,
+	settings as donationsViewSettings,
+} from './donations-view/index';
+import { name as donationsAmountName, settings as donationsAmountSettings } from './amount/index';
+import {
+	name as customDonationsAmountName,
+	settings as customDonationsAmountSettings,
+} from './custom-amount/index';
 
-registerJetpackBlock( name, settings );
+registerJetpackBlock( donationsBlockName, donationsBlockSettings, [
+	{ name: donationsAmountName, settings: donationsAmountSettings },
+	{ name: donationsViewName, settings: donationsViewSettings },
+	{ name: donationsAmountName, settings: donationsAmountSettings },
+	{ name: customDonationsAmountName, settings: customDonationsAmountSettings },
+] );
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/editor.scss b/projects/plugins/jetpack/extensions/blocks/donations/editor.scss
index 842d86802a86f..37fe6f067d4db 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/editor.scss
+++ b/projects/plugins/jetpack/extensions/blocks/donations/editor.scss
@@ -2,7 +2,7 @@
 @import './common';
 
 .editor-styles-wrapper .wp-block-jetpack-donations {
-	.donations__amount {
+	.wp-block-jetpack-donations-amount {
 		cursor: text;
 
 		&.has-focus {
@@ -12,24 +12,16 @@
 		}
 	}
 
-	.donations__custom-amount {
-		cursor: default;
-	}
-
-	.donations__amount .block-editor-rich-text__editable {
-		display: inline-block;
-		text-align: left;
+  	.donations__view {
+	  display: none;
 
-		&:focus {
-			box-shadow: none;
-			outline: none;
-			outline-offset: 0;
-		}
+	  &.is-active {
+		display: inherit;
+	  }
 	}
 
-	.donations__amount [data-rich-text-placeholder]::after {
-		color: $gray-400;
-		opacity: 1;
+	.donations__custom-amount {
+		cursor: default;
 	}
 
 	.donations__custom-amount .donations__amount-value {
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/fetch-status.js b/projects/plugins/jetpack/extensions/blocks/donations/fetch-status.js
index 7dcf70bde9c46..2cbaee71c7f2d 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/fetch-status.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/fetch-status.js
@@ -8,6 +8,7 @@ import { parse as parseUrl } from 'url';
  */
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
+import { __ } from '@wordpress/i18n';
 
 const fetchStatus = async ( type = null ) => {
 	const { query } = parseUrl( window.location.href, true );
@@ -21,6 +22,11 @@ const fetchStatus = async ( type = null ) => {
 			path,
 			method: 'GET',
 		} );
+
+		if ( ( ! result && typeof result !== 'object' ) || result.errors ) {
+			return Promise.reject( __( 'Could not load data from WordPress.com.', 'jetpack' ) );
+		}
+
 		return result;
 	} catch ( error ) {
 		return Promise.reject( error.message );
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/index.js b/projects/plugins/jetpack/extensions/blocks/donations/index.js
index 0fb1764827d33..c4d237015d3d2 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/index.js
@@ -2,14 +2,15 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { DonationsIcon } from '../../shared/icons';
 
 /**
  * Internal dependencies
  */
 import edit from './edit';
 import save from './save';
-import deprecatedV1 from './deprecated/v1';
-import { DonationsIcon } from '../../shared/icons';
+import { ANNUAL_DONATION, MONTHLY_DONATION, ONE_TIME_DONATION } from './common/constants';
+import { deprecated } from './deprecated';
 
 /**
  * Style dependencies
@@ -24,12 +25,49 @@ export const settings = {
 	description: __( 'Collect one-time, monthly, or annually recurring donations.', 'jetpack' ),
 	icon: DonationsIcon,
 	category: 'earn',
-	keywords: [ __( 'Donations', 'jetpack' ) ],
+	keywords: [ __( 'donations', 'jetpack' ) ],
+	attributes: {
+		[ ONE_TIME_DONATION ]: {
+			type: 'boolean',
+			default: true,
+		},
+		[ MONTHLY_DONATION ]: {
+			type: 'boolean',
+			default: true,
+		},
+		[ ANNUAL_DONATION ]: {
+			type: 'boolean',
+			default: true,
+		},
+		showCustomAmount: {
+			type: 'boolean',
+			default: true,
+		},
+		currency: {
+			type: 'string',
+			default: 'USD',
+		},
+		fallbackLinkUrl: {
+			type: 'string',
+		},
+	},
 	supports: {
+		align: true,
+		alignWide: false,
+		spacing: {
+			padding: true,
+		},
+		color: {
+			link: true,
+			gradients: true,
+		},
+		typography: {
+			fontSize: true,
+			lineHeight: true,
+		},
 		html: false,
 	},
 	edit,
 	save,
-	example: {},
-	deprecated: [ deprecatedV1 ],
+	deprecated,
 };
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/save.js b/projects/plugins/jetpack/extensions/blocks/donations/save.js
index b07302e278dd5..676156f2b63fe 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/save.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/save.js
@@ -1,64 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { RichText } from '@wordpress/block-editor';
+import { InnerBlocks } from '@wordpress/block-editor';
 
-const Save = ( { attributes } ) => {
-	const { fallbackLinkUrl, oneTimeDonation, monthlyDonation, annualDonation } = attributes;
-
-	if (
-		! oneTimeDonation ||
-		! oneTimeDonation.show ||
-		! oneTimeDonation.planId ||
-		oneTimeDonation.planId === -1
-	) {
-		return null;
-	}
-
-	return (
-		<div>
-			<RichText.Content tagName="h4" value={ oneTimeDonation.heading } />
-			<RichText.Content tagName="p" value={ oneTimeDonation.extraText } />
-			<RichText.Content
-				tagName="a"
-				className="jetpack-donations-fallback-link"
-				href={ fallbackLinkUrl }
-				rel="noopener noreferrer noamphtml"
-				target="_blank"
-				value={ oneTimeDonation.buttonText }
-			/>
-			{ monthlyDonation.show && (
-				<>
-					<hr className="donations__separator" />
-					<RichText.Content tagName="h4" value={ monthlyDonation.heading } />
-					<RichText.Content tagName="p" value={ monthlyDonation.extraText } />
-					<RichText.Content
-						tagName="a"
-						className="jetpack-donations-fallback-link"
-						href={ fallbackLinkUrl }
-						rel="noopener noreferrer noamphtml"
-						target="_blank"
-						value={ monthlyDonation.buttonText }
-					/>
-				</>
-			) }
-			{ annualDonation.show && (
-				<>
-					<hr className="donations__separator" />
-					<RichText.Content tagName="h4" value={ annualDonation.heading } />
-					<RichText.Content tagName="p" value={ annualDonation.extraText } />
-					<RichText.Content
-						tagName="a"
-						className="jetpack-donations-fallback-link"
-						href={ fallbackLinkUrl }
-						rel="noopener noreferrer noamphtml"
-						target="_blank"
-						value={ annualDonation.buttonText }
-					/>
-				</>
-			) }
-		</div>
-	);
-};
+const Save = () => <InnerBlocks.Content />;
 
 export default Save;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/tab.js b/projects/plugins/jetpack/extensions/blocks/donations/tab.js
deleted file mode 100644
index d5cb99852a461..0000000000000
--- a/projects/plugins/jetpack/extensions/blocks/donations/tab.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { RichText } from '@wordpress/block-editor';
-import { useSelect } from '@wordpress/data';
-import { __, sprintf } from '@wordpress/i18n';
-import { useEffect, useState, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import Amount from './amount';
-import { minimumTransactionAmountForCurrency } from '../../shared/currencies';
-
-const Tab = ( { activeTab, attributes, setAttributes } ) => {
-	const {
-		currency,
-		oneTimeDonation,
-		monthlyDonation,
-		annualDonation,
-		showCustomAmount,
-		chooseAmountText,
-		customAmountText,
-	} = attributes;
-
-	const donationAttributes = {
-		'one-time': 'oneTimeDonation',
-		'1 month': 'monthlyDonation',
-		'1 year': 'annualDonation',
-	};
-
-	const getDonationValue = key => attributes[ donationAttributes[ activeTab ] ][ key ];
-
-	const setDonationValue = ( key, value ) => {
-		const donationAttribute = donationAttributes[ activeTab ];
-		const donation = attributes[ donationAttribute ];
-		setAttributes( {
-			[ donationAttribute ]: {
-				...donation,
-				[ key ]: value,
-			},
-		} );
-	};
-
-	// Updates the amounts whenever there are new defaults due to a currency change.
-	const [ previousCurrency, setPreviousCurrency ] = useState( currency );
-	const minAmount = minimumTransactionAmountForCurrency( currency );
-	const defaultAmounts = useMemo(
-		() => [
-			minAmount * 10, // 1st tier (USD 5)
-			minAmount * 30, // 2nd tier (USD 15)
-			minAmount * 200, // 3rd tier (USD 100)
-		],
-		[ minAmount ]
-	);
-	useEffect( () => {
-		if ( previousCurrency === currency ) {
-			return;
-		}
-		setPreviousCurrency( currency );
-
-		setAttributes( {
-			oneTimeDonation: { ...oneTimeDonation, amounts: defaultAmounts },
-			monthlyDonation: { ...monthlyDonation, amounts: defaultAmounts },
-			annualDonation: { ...annualDonation, amounts: defaultAmounts },
-		} );
-	}, [
-		currency,
-		previousCurrency,
-		defaultAmounts,
-		oneTimeDonation,
-		monthlyDonation,
-		annualDonation,
-		setAttributes,
-	] );
-
-	const amounts = getDonationValue( 'amounts' );
-
-	const setAmount = ( amount, tier ) => {
-		const newAmounts = [ ...amounts ];
-		newAmounts[ tier ] = amount;
-		setDonationValue( 'amounts', newAmounts );
-	};
-
-	// Keeps in sync the donate buttons labels across all intervals once the default value is overridden in one of them.
-	const setButtonText = buttonText => {
-		setAttributes( {
-			oneTimeDonation: { ...oneTimeDonation, buttonText: buttonText },
-			monthlyDonation: { ...monthlyDonation, buttonText: buttonText },
-			annualDonation: { ...annualDonation, buttonText: buttonText },
-		} );
-	};
-
-	const formatTypes = useSelect( select => select( 'core/rich-text' ).getFormatTypes(), [] );
-	const allowedFormatsForButton = formatTypes
-		.map( format => format.name )
-		.filter( format => format !== 'core/link' );
-
-	return (
-		<div className="donations__tab">
-			<RichText
-				tagName="h4"
-				placeholder={ __( 'Write a message…', 'jetpack' ) }
-				value={ getDonationValue( 'heading' ) }
-				onChange={ value => setDonationValue( 'heading', value ) }
-			/>
-			<RichText
-				tagName="p"
-				placeholder={ __( 'Write a message…', 'jetpack' ) }
-				value={ chooseAmountText }
-				onChange={ value => setAttributes( { chooseAmountText: value } ) }
-			/>
-			<div className="donations__amounts">
-				{ amounts.map( ( amount, index ) => (
-					<Amount
-						currency={ currency }
-						defaultValue={ defaultAmounts[ index ] }
-						label={ sprintf(
-							// translators: %d: Tier level e.g: "1", "2", "3"
-							__( 'Tier %d', 'jetpack' ),
-							index + 1
-						) }
-						key={ `jetpack-donations-amount-${ index }` }
-						onChange={ newAmount => setAmount( newAmount, index ) }
-						value={ amount }
-					/>
-				) ) }
-			</div>
-			{ showCustomAmount && (
-				<>
-					<RichText
-						tagName="p"
-						placeholder={ __( 'Write a message…', 'jetpack' ) }
-						value={ customAmountText }
-						onChange={ value => setAttributes( { customAmountText: value } ) }
-					/>
-					<Amount
-						currency={ currency }
-						label={ __( 'Custom amount', 'jetpack' ) }
-						defaultValue={ minimumTransactionAmountForCurrency( currency ) * 100 }
-						className="donations__custom-amount"
-						disabled={ true }
-					/>
-				</>
-			) }
-			<hr className="donations__separator" />
-			<RichText
-				tagName="p"
-				placeholder={ __( 'Write a message…', 'jetpack' ) }
-				value={ getDonationValue( 'extraText' ) }
-				onChange={ value => setDonationValue( 'extraText', value ) }
-			/>
-			<div className="wp-block-button donations__donate-button-wrapper">
-				<RichText
-					className="wp-block-button__link donations__donate-button"
-					placeholder={ __( 'Write a message…', 'jetpack' ) }
-					value={ getDonationValue( 'buttonText' ) }
-					onChange={ value => setButtonText( value ) }
-					allowedFormats={ allowedFormatsForButton }
-				/>
-			</div>
-		</div>
-	);
-};
-
-export default Tab;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/tabs.js b/projects/plugins/jetpack/extensions/blocks/donations/tabs.js
deleted file mode 100644
index 05764d5d0b1ff..0000000000000
--- a/projects/plugins/jetpack/extensions/blocks/donations/tabs.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * External dependencies
- */
-import classNames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { useCallback, useEffect, useState } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
-
-/**
- * Internal dependencies
- */
-import Controls from './controls';
-import Tab from './tab';
-import StripeNudge from '../../shared/components/stripe-nudge';
-
-const Tabs = props => {
-	const { attributes, className, products, setAttributes, shouldUpgrade, stripeConnectUrl } = props;
-	const { oneTimeDonation, monthlyDonation, annualDonation } = attributes;
-	const [ activeTab, setActiveTab ] = useState( 'one-time' );
-	const postId = useSelect( select => select( 'core/editor' ).getCurrentPostId(), [] );
-
-	const isTabActive = useCallback( tab => activeTab === tab, [ activeTab ] );
-
-	const tabs = {
-		'one-time': { title: __( 'One-Time', 'jetpack' ) },
-		...( monthlyDonation.show && { '1 month': { title: __( 'Monthly', 'jetpack' ) } } ),
-		...( annualDonation.show && { '1 year': { title: __( 'Yearly', 'jetpack' ) } } ),
-	};
-
-	// Updates plans.
-	useEffect( () => {
-		if (
-			oneTimeDonation.planId === products[ 'one-time' ] &&
-			monthlyDonation.planId === products[ '1 month' ] &&
-			annualDonation.planId === products[ '1 year' ]
-		) {
-			return;
-		}
-
-		setAttributes( {
-			...( products[ 'one-time' ] && {
-				oneTimeDonation: { ...oneTimeDonation, planId: products[ 'one-time' ] },
-			} ),
-			...( products[ '1 month' ] && {
-				monthlyDonation: { ...monthlyDonation, planId: products[ '1 month' ] },
-			} ),
-			...( products[ '1 year' ] && {
-				annualDonation: { ...annualDonation, planId: products[ '1 year' ] },
-			} ),
-		} );
-	}, [ oneTimeDonation, monthlyDonation, annualDonation, setAttributes, products ] );
-
-	// Activates the one-time tab if the interval of the current active tab is disabled.
-	useEffect( () => {
-		if ( ! monthlyDonation.show && isTabActive( '1 month' ) ) {
-			setActiveTab( 'one-time' );
-		}
-
-		if ( ! annualDonation.show && isTabActive( '1 year' ) ) {
-			setActiveTab( 'one-time' );
-		}
-	}, [ monthlyDonation, annualDonation, setActiveTab, isTabActive ] );
-
-	return (
-		<div className={ className }>
-			{ ! shouldUpgrade && stripeConnectUrl && (
-				<StripeNudge
-					blockName="donations"
-					postId={ postId }
-					stripeConnectUrl={ stripeConnectUrl }
-				/>
-			) }
-			<div className="donations__container">
-				{ Object.keys( tabs ).length > 1 && (
-					<div className="donations__nav">
-						{ Object.entries( tabs ).map( ( [ interval, { title } ] ) => (
-							<div
-								role="button"
-								tabIndex={ 0 }
-								className={ classNames( 'donations__nav-item', {
-									'is-active': isTabActive( interval ),
-								} ) }
-								onClick={ () => setActiveTab( interval ) }
-								onKeyDown={ () => setActiveTab( interval ) }
-								key={ `jetpack-donations-nav-item-${ interval } ` }
-							>
-								{ title }
-							</div>
-						) ) }
-					</div>
-				) }
-				<div className="donations__content">
-					<Tab activeTab={ activeTab } attributes={ attributes } setAttributes={ setAttributes } />
-				</div>
-			</div>
-			<Controls { ...props } />
-		</div>
-	);
-};
-
-export default Tabs;
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/view.js b/projects/plugins/jetpack/extensions/blocks/donations/view.js
index 9fe56887e4d08..10552ad2dc778 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/view.js
+++ b/projects/plugins/jetpack/extensions/blocks/donations/view.js
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import formatCurrency from '@automattic/format-currency';
+import { minimumTransactionAmountForCurrency, parseAmount } from '../../shared/currencies';
+import { initializeMembershipButtons } from '../../shared/memberships';
 
 /**
  * WordPress dependencies
@@ -9,20 +10,20 @@ import formatCurrency from '@automattic/format-currency';
 import domReady from '@wordpress/dom-ready';
 import { ENTER } from '@wordpress/keycodes';
 import { addQueryArgs, removeQueryArgs } from '@wordpress/url';
+import formatCurrency from '@automattic/format-currency';
 
 /**
  * Internal dependencies
  */
-import { minimumTransactionAmountForCurrency, parseAmount } from '../../shared/currencies';
-import { initializeMembershipButtons } from '../../shared/memberships';
+import JetpackDonationsV2 from './deprecated/v2/view';
 
 /**
  * Style dependencies
  */
-import './view.scss';
+import '../donations/view.scss';
 
 class JetpackDonations {
-	constructor( block ) {
+	init( block ) {
 		this.block = block;
 		this.amount = null;
 		this.isCustomAmount = false;
@@ -54,16 +55,19 @@ class JetpackDonations {
 			'1 month': 'donations__monthly-item',
 			'1 year': 'donations__annual-item',
 		};
+
 		return this.block.querySelector(
-			`.donations__donate-button.${ buttonIntervalClasses[ this.interval ] }`
+			`.${
+				buttonIntervalClasses[ this.interval ]
+			} .donations__donate-button .wp-block-button__link`
 		);
 	}
 
 	toggleDonateButton( enable ) {
 		const donateButton = this.getDonateButton();
 		enable
-			? donateButton.classList.remove( 'is-disabled' )
-			: donateButton.classList.add( 'is-disabled' );
+			? donateButton.parentElement.classList.remove( 'is-disabled' )
+			: donateButton.parentElement.classList.add( 'is-disabled' );
 	}
 
 	updateUrl() {
@@ -110,7 +114,7 @@ class JetpackDonations {
 
 	initNavigation() {
 		const navItems = this.block.querySelectorAll( '.donations__nav-item' );
-		const tabContent = this.block.querySelector( '.donations__tab' );
+		const tabContent = this.block.querySelector( '.donations__content' );
 		const tabContentClasses = {
 			'one-time': 'is-one-time',
 			'1 month': 'is-monthly',
@@ -223,7 +227,7 @@ class JetpackDonations {
 
 				// Enables the donate button.
 				const donateButton = this.getDonateButton();
-				donateButton.classList.remove( 'is-disabled' );
+				donateButton.parentElement.classList.remove( 'is-disabled' );
 			} );
 		} );
 
@@ -236,6 +240,19 @@ class JetpackDonations {
 
 domReady( () => {
 	const blocks = document.querySelectorAll( '.wp-block-jetpack-donations' );
-	blocks.forEach( block => new JetpackDonations( block ) );
-	initializeMembershipButtons( '.donations__donate-button' );
+
+	// We can have donation blocks of the current version and previous version on the same page.
+	blocks.forEach( donationsBlock => {
+		const isDeprecated = donationsBlock.querySelectorAll( '.donations__deprecated' ).length > 0;
+
+		if ( isDeprecated ) {
+			const donationsHandler = new JetpackDonationsV2();
+			donationsHandler.init( donationsBlock );
+			initializeMembershipButtons( '.donations__donate-button' );
+		} else {
+			const donationsHandler = new JetpackDonations();
+			donationsHandler.init( donationsBlock );
+			initializeMembershipButtons( '.donations__donate-button .wp-block-button__link' );
+		}
+	} );
 } );
diff --git a/projects/plugins/jetpack/extensions/blocks/donations/view.scss b/projects/plugins/jetpack/extensions/blocks/donations/view.scss
index aa9f71c7cdc90..ed28a685df4ea 100644
--- a/projects/plugins/jetpack/extensions/blocks/donations/view.scss
+++ b/projects/plugins/jetpack/extensions/blocks/donations/view.scss
@@ -52,20 +52,20 @@
 		}
 	}
 
-	.donations__tab.is-one-time {
+	.is-one-time {
 		.donations__monthly-item,
 		.donations__annual-item {
 			display: none;
 		}
 	}
 
-	.donations__tab.is-monthly {
+	.is-monthly {
 		.donations__one-time-item,
 		.donations__annual-item {
 			display: none;
 		}
 	}
-	.donations__tab.is-annual {
+	.is-annual {
 		.donations__one-time-item,
 		.donations__monthly-item {
 			display: none;
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/playlist-track.php b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/playlist-track.php
index 0789816e0edc8..f49387184f31b 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/playlist-track.php
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/playlist-track.php
@@ -5,6 +5,8 @@
  * @package automattic/jetpack
  */
 
+// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- This file expects $template_props set outside the file.
+
 namespace Automattic\Jetpack\Extensions\Podcast_Player;
 
 /**
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header-title.php b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header-title.php
index 763aa83a1f228..1b897d6a695e9 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header-title.php
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header-title.php
@@ -5,6 +5,8 @@
  * @package automattic/jetpack
  */
 
+//phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- This file expects $template_props set outside the file.
+
 namespace Automattic\Jetpack\Extensions\Podcast_Player;
 
 /**
@@ -43,7 +45,11 @@ class="jetpack-podcast-player__track-title-link"
 		<?php endif; // phpcs:enable ?>
 	</span>
 
-	<?php if ( ! empty( $template_props['title'] ) ) : ?>
+	<?php
+	// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- This file expects $template_props set outside the file.
+
+	if ( ! empty( $template_props['title'] ) ) :
+		?>
 		<span class="jetpack-podcast-player--visually-hidden"> - </span>
 
 		<?php
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header.php b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header.php
index b6167df2fc7d7..dd64d63f51f07 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header.php
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-header.php
@@ -5,6 +5,8 @@
  * @package automattic/jetpack
  */
 
+// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- This file expects $template_props set outside the file.
+
 namespace Automattic\Jetpack\Extensions\Podcast_Player;
 
 /**
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-title.php b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-title.php
index ce5b59caec132..8f2d194d5b97f 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-title.php
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/templates/podcast-title.php
@@ -5,6 +5,8 @@
  * @package automattic/jetpack
  */
 
+// phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- This file expects $template_props set outside the file.
+
 namespace Automattic\Jetpack\Extensions\Podcast_Player;
 
 /**
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/blocks.js b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/blocks.js
index e0f790a3e55db..6e12bb3842861 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/blocks.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/blocks.js
@@ -10,8 +10,8 @@ export default function Blocks() {
 				allowedBlocks={ [ 'premium-content/subscriber-view', 'premium-content/logged-out-view' ] }
 				templateLock={ 'all' }
 				template={ [
-					[ 'premium-content/subscriber-view' ],
 					[ 'premium-content/logged-out-view' ],
+					[ 'premium-content/subscriber-view' ],
 				] }
 				__experimentalCaptureToolbars={ true }
 				templateInsertUpdatesSelection={ false }
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/controls.js b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/controls.js
index b6126deaba1ea..af48958471478 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/controls.js
@@ -4,7 +4,7 @@
 import { Fragment } from '@wordpress/element';
 import { BlockControls } from '@wordpress/block-editor';
 import { DropdownMenu, ToolbarGroup, ToolbarItem } from '@wordpress/components';
-import { Icon, update } from '@wordpress/icons';
+import { Icon, update, warning } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -31,6 +31,13 @@ export default function Controls( props ) {
 	if ( currentPlan ) {
 		planDescription = ' ' + getPlanDescription( currentPlan );
 	}
+
+	let subscriptionIcon = update;
+	if ( selectedPlanId && ! currentPlan ) {
+		planDescription = __( 'Subscription not found', 'jetpack' );
+		subscriptionIcon = warning;
+	}
+
 	return (
 		<BlockControls>
 			<ToolbarGroup>
@@ -40,7 +47,7 @@ export default function Controls( props ) {
 							// @ts-ignore We want a label with our Dashicon.Icon
 							icon={
 								<Fragment>
-									<Icon icon={ update } />{ ' ' }
+									<Icon icon={ subscriptionIcon } />{ ' ' }
 									{ planDescription && <Fragment>{ planDescription }</Fragment> }
 								</Fragment>
 							}
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/invalid-subscription-warning.js b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/invalid-subscription-warning.js
new file mode 100644
index 0000000000000..12c656f6bf8aa
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/_inc/invalid-subscription-warning.js
@@ -0,0 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { Warning } from '@wordpress/block-editor';
+import { Icon, warning } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
+
+export default () => (
+	<Warning className="premium-content-block-nudge">
+		<span className="premium-content-block-nudge__info">
+			{ <Icon icon={ warning } /> }
+			<span className="premium-content-block-nudge__text-container">
+				<span className="premium-content-block-nudge__title">
+					{ __( 'Invalid subscription configured for this block.', 'jetpack' ) }
+				</span>
+				<span className="premium-content-block-nudge__message">
+					{ __(
+						'The subscribe button will be hidden from your visitors until you select a valid subscription.',
+						'jetpack'
+					) }
+				</span>
+			</span>
+		</span>
+	</Warning>
+);
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js b/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js
index 68999ca59f1e2..5dad7cdbe8492 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/edit.js
@@ -23,6 +23,7 @@ import { isPriceValid, minimumTransactionAmountForCurrency } from '../../shared/
 import getConnectUrl from '../../shared/get-connect-url';
 import './editor.scss';
 import useAutosaveAndRedirect from '../../shared/use-autosave-and-redirect';
+import InvalidSubscriptionWarning from './_inc/invalid-subscription-warning';
 
 /**
  * @typedef { import('./plan').Plan } Plan
@@ -336,7 +337,7 @@ function Edit( props ) {
 						className="components-tab-button"
 						isPressed={ selectedTab.className === 'wp-premium-content-logged-out-view' }
 					>
-						<span>{ __( 'Visitor View', 'jetpack' ) }</span>
+						<span>{ __( 'Guest View', 'jetpack' ) }</span>
 					</ToolbarButton>
 					<ToolbarButton
 						onClick={ () => {
@@ -363,6 +364,10 @@ function Edit( props ) {
 				{ ( isSelected || selectedInnerBlock ) && apiState === API_STATE_CONNECTED && (
 					<Inspector { ...props } savePlan={ savePlan } siteSlug={ siteSlug } />
 				) }
+				{ props.attributes.selectedPlanId &&
+					! products.find( plan => plan.id === props.attributes.selectedPlanId ) && (
+						<InvalidSubscriptionWarning />
+					) }
 				<Context.Provider
 					value={ {
 						selectedTab,
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/index.js b/projects/plugins/jetpack/extensions/blocks/premium-content/index.js
index 02e19add358c4..da56ab6ea8c5e 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/index.js
@@ -10,18 +10,12 @@ import { createBlock } from '@wordpress/blocks';
 import edit from './edit';
 import save from './save';
 import icon from './_inc/icon';
-import {
-	blockContainsPremiumBlock,
-	blockHasParentPremiumBlock,
-} from './_inc/premium';
+import { blockContainsPremiumBlock, blockHasParentPremiumBlock } from './_inc/premium';
 
 export const name = 'premium-content/container';
 export const settings = {
 	title: __( 'Premium Content', 'jetpack' ),
-	description: __(
-		'Restrict access to your content for paying subscribers.',
-		'jetpack'
-	),
+	description: __( 'Restrict access to your content for paying subscribers.', 'jetpack' ),
 	icon,
 	category: 'grow',
 	keywords: [
@@ -33,7 +27,7 @@ export const settings = {
 	attributes: {
 		newPlanName: {
 			type: 'string',
-			default: __( 'Monthly Subscription', 'jetpack' )
+			default: __( 'Monthly Subscription', 'jetpack' ),
 		},
 		newPlanCurrency: {
 			type: 'string',
@@ -98,13 +92,13 @@ export const settings = {
 					// to be replaced in the switchToBlockType call thereby meaning they
 					// are removed both from their original location and within the
 					// new premium content block.
-					const innerBlocksSubscribe = blocks.map( ( block ) => {
+					const innerBlocksSubscribe = blocks.map( block => {
 						return createBlock( block.name, block.attributes, block.innerBlocks );
 					} );
 
 					return createBlock( 'premium-content/container', {}, [
-						createBlock( 'premium-content/subscriber-view', {}, innerBlocksSubscribe ),
 						createBlock( 'premium-content/logged-out-view' ),
+						createBlock( 'premium-content/subscriber-view', {}, innerBlocksSubscribe ),
 					] );
 				},
 			},
diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/index.js b/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/index.js
index 666d9d7e585fd..234531c5006b4 100644
--- a/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/index.js
@@ -16,8 +16,11 @@ import { registerFormatType, unregisterFormatType } from '@wordpress/rich-text';
 
 const name = 'premium-content/logged-out-view';
 const settings = {
-	title: __( 'Logged Out View', 'jetpack' ),
-	description: __( 'The container for all content shown to site visitors who are not subscribers.', 'jetpack' ),
+	title: __( 'Guest View', 'jetpack' ),
+	description: __(
+		'The container for all content shown to site visitors who are not subscribers.',
+		'jetpack'
+	),
 	icon,
 	category: 'grow',
 	parent: [ 'premium-content/container' ],
@@ -52,13 +55,13 @@ const unsubscribe = subscribe( () => {
 
 	// Use the existing link button functionality but limit it so that it doesn't run inside this view.
 	const newLinkButton = compose(
-		withSelect( ( composeSelect ) => {
+		withSelect( composeSelect => {
 			return {
 				selectedBlock: composeSelect( 'core/block-editor' ).getSelectedBlock(),
 			};
 		} ),
 		// @ts-ignore
-		ifCondition( ( props ) => {
+		ifCondition( props => {
 			// @ts-ignore
 			return props.selectedBlock && props.selectedBlock.name !== name;
 		} )
diff --git a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
index 982f6f50846da..b40e907eac7fd 100644
--- a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
+++ b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
@@ -16,7 +16,7 @@ import {
 	withNotices,
 	SelectControl,
 } from '@wordpress/components';
-import { InspectorControls, InnerBlocks, BlockIcon, BlockControls } from '@wordpress/block-editor';
+import { InspectorControls, InnerBlocks, BlockControls } from '@wordpress/block-editor';
 import { Component } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 
@@ -378,7 +378,7 @@ export class MembershipsButtonEdit extends Component {
 				{ ! this.hasUpgradeNudge && this.state.shouldUpgrade && (
 					<div className="wp-block-jetpack-recurring-payments">
 						<Placeholder
-							icon={ <BlockIcon icon={ icon } /> }
+							icon={ icon }
 							label={ __( 'Payments', 'jetpack' ) }
 							notices={ notices }
 							instructions={ __(
@@ -406,7 +406,7 @@ export class MembershipsButtonEdit extends Component {
 				{ ( connected === API_STATE_LOADING ||
 					this.state.addingMembershipAmount === PRODUCT_FORM_SUBMITTED ) &&
 					! this.props.attributes.planId && (
-						<Placeholder icon={ <BlockIcon icon={ icon } /> } notices={ notices }>
+						<Placeholder icon={ icon } notices={ notices }>
 							<Spinner />
 						</Placeholder>
 					) }
@@ -415,11 +415,7 @@ export class MembershipsButtonEdit extends Component {
 					connected === API_STATE_CONNECTED &&
 					products.length === 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
-							<Placeholder
-								icon={ <BlockIcon icon={ icon } /> }
-								label={ __( 'Payments', 'jetpack' ) }
-								notices={ notices }
-							>
+							<Placeholder icon={ icon } label={ __( 'Payments', 'jetpack' ) } notices={ notices }>
 								<div className="components-placeholder__instructions">
 									<p>
 										{ __( 'To use this block, first add at least one payment plan.', 'jetpack' ) }
@@ -436,11 +432,7 @@ export class MembershipsButtonEdit extends Component {
 					connected === API_STATE_CONNECTED &&
 					products.length > 0 && (
 						<div className="wp-block-jetpack-recurring-payments">
-							<Placeholder
-								icon={ <BlockIcon icon={ icon } /> }
-								label={ __( 'Payments', 'jetpack' ) }
-								notices={ notices }
-							>
+							<Placeholder icon={ icon } label={ __( 'Payments', 'jetpack' ) } notices={ notices }>
 								<div className="components-placeholder__instructions">
 									<p>
 										{ __(
diff --git a/projects/plugins/jetpack/extensions/blocks/recurring-payments/index.js b/projects/plugins/jetpack/extensions/blocks/recurring-payments/index.js
index 885d702755097..71185627e77e9 100644
--- a/projects/plugins/jetpack/extensions/blocks/recurring-payments/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/recurring-payments/index.js
@@ -7,6 +7,7 @@ import { Path, Rect, SVG, G } from '@wordpress/components';
  * WordPress dependencies
  */
 import { InnerBlocks } from '@wordpress/block-editor';
+import { createBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -64,6 +65,53 @@ export const settings = {
 		align: true,
 	},
 	deprecated: [ deprecatedV1 ],
+	transforms: {
+		from: [
+			{
+				type: 'block',
+				blocks: [ 'core/buttons' ],
+				isMatch: ( _, block ) => {
+					// core/buttons blocks contain one or more core/button block, it's these that
+					// should be equivalent to a payment button but as the result of the transformation
+					// must be of the same type as the block that defines the transformation, only one
+					// can be transformed.
+					// Detecting this is only possible from Gutenberg 11.5+ when the isMatch API was changed
+					// to provide the block parameters.
+					return (
+						block !== undefined &&
+						1 === block.innerBlocks.length &&
+						'core/button' === block.innerBlocks[ 0 ].name
+					);
+				},
+				transform: ( _, fromInnerBlocks ) => {
+					const fromInnerBlock = fromInnerBlocks[ 0 ];
+					const toButtonAttrs = {
+						element: 'a',
+						text: fromInnerBlock.attributes.text ?? '',
+						className: fromInnerBlock.attributes.className ?? '',
+					};
+
+					const width = fromInnerBlock.attributes.width;
+					if ( width ) {
+						toButtonAttrs.width = width.toString() + '%';
+					}
+
+					// Map borderRadius from nnpx to nn.
+					// core/button has a max button radius of 100, but jetpack/button has a max of 50
+					// this relies upon jetpack/button enforcing it's maximum.
+					const borderRadius = fromInnerBlock.attributes.style?.border?.radius;
+					if ( borderRadius ) {
+						toButtonAttrs.borderRadius = parseInt(
+							borderRadius.substring( 0, borderRadius.length - 2 )
+						);
+					}
+
+					const toJetpackButton = createBlock( 'jetpack/button', toButtonAttrs, [] );
+					return createBlock( 'jetpack/' + name, {}, [ toJetpackButton ] );
+				},
+			},
+		],
+	},
 };
 
 /**
diff --git a/projects/plugins/jetpack/extensions/blocks/revue/revue.php b/projects/plugins/jetpack/extensions/blocks/revue/revue.php
index d0313af02973d..b726edd9e607c 100644
--- a/projects/plugins/jetpack/extensions/blocks/revue/revue.php
+++ b/projects/plugins/jetpack/extensions/blocks/revue/revue.php
@@ -226,7 +226,7 @@ function get_deprecated_v1_revue_button( $attributes ) {
 	}
 
 	if ( $has_border_radius ) {
-		// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		// phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 		if ( 0 == $attributes['borderRadius'] ) {
 			$classes[] = 'no-border-radius';
 		} else {
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/test/controls.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/test/controls.js
index ffb6148c39396..af73b9ddacfcf 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/test/controls.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/test/controls.js
@@ -9,9 +9,7 @@ import '@testing-library/jest-dom/extend-expect';
  * Internal dependencies
  */
 import SubscriptionsInspectorControls from '../controls';
-import {
-	DEFAULT_FONTSIZE_VALUE,
-} from '../constants';
+import { DEFAULT_FONTSIZE_VALUE } from '../constants';
 
 // Temporarily mock out the ButtonWidthControl, which is causing errors due to missing
 // dependencies in the jest test runner.
@@ -68,17 +66,23 @@ describe( 'Inspector controls', () => {
 
 		test( 'sets solid background color', async () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
+			userEvent.click(
+				screen.getByText( 'Button Background Color', { ignore: '[aria-hidden=true]' } )
+			);
 			userEvent.click( screen.getByText( 'Solid', { ignore: '[aria-hidden=true]' } ) );
-			userEvent.click( screen.queryAllByLabelText( /Color\: (?!Black)/i, { selector: 'button' } )[0] );
+			userEvent.click(
+				screen.queryAllByLabelText( /Color\: (?!Black)/i, { selector: 'button' } )[ 0 ]
+			);
 
-			expect( setButtonBackgroundColor.mock.calls[0][0] ).toMatch(/#[a-z0-9]{6,6}/);
+			expect( setButtonBackgroundColor.mock.calls[ 0 ][ 0 ] ).toMatch( /#[a-z0-9]{6,6}/ );
 		} );
-
 	} );
 
 	describe( 'Color settings panel', () => {
 		test( 'hides gradient settings control panel', () => {
-			render( <SubscriptionsInspectorControls { ...defaultProps } isGradientAvailable={ false }/> );
+			render(
+				<SubscriptionsInspectorControls { ...defaultProps } isGradientAvailable={ false } />
+			);
 
 			expect( screen.getByText( 'Background Colors' ) ).toBeInTheDocument();
 			expect( screen.queryByText( 'Color Settings' ) ).not.toBeInTheDocument();
@@ -86,10 +90,13 @@ describe( 'Inspector controls', () => {
 
 		test( 'sets gradient background color', async () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
+			userEvent.click(
+				screen.getByText( 'Button Background Color', { ignore: '[aria-hidden=true]' } )
+			);
 			userEvent.click( screen.getByText( 'Gradient', { ignore: '[aria-hidden=true]' } ) );
-			userEvent.click( screen.queryAllByLabelText( /Gradient\:/i, { selector: 'button' } )[0] );
+			userEvent.click( screen.queryAllByLabelText( /Gradient\:/i, { selector: 'button' } )[ 0 ] );
 
-			expect( setGradient.mock.calls[0][0] ).toMatch(/linear\-gradient\((.+)\)/);
+			expect( setGradient.mock.calls[ 0 ][ 0 ] ).toMatch( /linear\-gradient\((.+)\)/ );
 		} );
 	} );
 
@@ -103,7 +110,7 @@ describe( 'Inspector controls', () => {
 		test( 'set custom text ', () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
 			userEvent.click( screen.getByText( 'Text Settings' ), { selector: 'button' } );
-			userEvent.type( screen.getAllByLabelText( 'Custom Size' )[1], '18' );
+			userEvent.type( screen.getAllByLabelText( 'Custom Size' )[ 1 ], '18' );
 
 			expect( setAttributes ).toHaveBeenLastCalledWith( {
 				fontSize: 18,
@@ -122,7 +129,7 @@ describe( 'Inspector controls', () => {
 		test( 'set border radius', () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
 			userEvent.click( screen.getByText( 'Border Settings' ), { selector: 'button' } );
-			const rangeControlElement = screen.getAllByLabelText( 'Border Radius' )[1];
+			const rangeControlElement = screen.getAllByLabelText( 'Border Radius' )[ 1 ];
 			userEvent.clear( rangeControlElement );
 			userEvent.type( rangeControlElement, '5' );
 
@@ -134,7 +141,7 @@ describe( 'Inspector controls', () => {
 		test( 'set border weight', () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
 			userEvent.click( screen.getByText( 'Border Settings' ), { selector: 'button' } );
-			const rangeControlElement = screen.getAllByLabelText( 'Border Weight' )[1];
+			const rangeControlElement = screen.getAllByLabelText( 'Border Weight' )[ 1 ];
 			userEvent.clear( rangeControlElement );
 			userEvent.type( rangeControlElement, '5' );
 
@@ -154,7 +161,7 @@ describe( 'Inspector controls', () => {
 		test( 'set space inside', () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
 			userEvent.click( screen.getByText( 'Spacing Settings' ), { selector: 'button' } );
-			const rangeControlElement = screen.getAllByLabelText( 'Space Inside' )[1];
+			const rangeControlElement = screen.getAllByLabelText( 'Space Inside' )[ 1 ];
 			userEvent.clear( rangeControlElement );
 			userEvent.type( rangeControlElement, '5' );
 
@@ -166,7 +173,7 @@ describe( 'Inspector controls', () => {
 		test( 'set space between', () => {
 			render( <SubscriptionsInspectorControls { ...defaultProps } /> );
 			userEvent.click( screen.getByText( 'Spacing Settings' ), { selector: 'button' } );
-			const rangeControlElement = screen.getAllByLabelText( 'Space Between' )[1];
+			const rangeControlElement = screen.getAllByLabelText( 'Space Between' )[ 1 ];
 			userEvent.clear( rangeControlElement );
 			userEvent.type( rangeControlElement, '5' );
 
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/index.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/index.js
index b1d029bce79b9..b222e77afd186 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/index.js
@@ -10,7 +10,7 @@ import ResizeObserver from 'resize-observer-polyfill';
 import Column from '../column';
 import Gallery from '../gallery';
 import Row from '../row';
-import { getGalleryRows, handleRowResize, getColumnWidths } from './resize';
+import { getGalleryRows, handleRowResize } from './resize';
 import { imagesToRatios, ratiosToColumns, ratiosToMosaicRows } from './ratios';
 
 export default class Mosaic extends Component {
@@ -83,6 +83,20 @@ export default class Mosaic extends Component {
 		}
 	}
 
+	getColumnWidths( rows, images, width ) {
+		let cursor = 0;
+		const content = rows.map( row => {
+			return row.map( colSize => {
+				const columnImages = images.slice( cursor, cursor + colSize );
+				cursor += colSize;
+				return columnImages;
+			} );
+		} );
+
+		const result = content.map( row => handleRowResize( row, width ) );
+		return result;
+	}
+
 	render() {
 		const { align, columns, images, layoutStyle, renderedImages } = this.props;
 
@@ -94,7 +108,7 @@ export default class Mosaic extends Component {
 
 		const columnWidths = Platform.select( {
 			web: () => this.props.columnWidths,
-			native: () => getColumnWidths( rows, renderedImages, 1000 ),
+			native: () => this.getColumnWidths( rows, renderedImages, 1000 ),
 		} )();
 
 		let cursor = 0;
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.js
index 40db9313888c6..4056517d46e6c 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { Platform } from '@wordpress/element';
-
 /**
  * Internal dependencies
  */
@@ -37,39 +32,18 @@ function getRowRatio( row ) {
 	return result;
 }
 
-export function getColumnWidths( rows, images, width ) {
-	let cursor = 0;
-	const content = rows.map( row => {
-		return row.map( colSize => {
-			const columnImages = images.slice( cursor, cursor + colSize );
-			cursor += colSize;
-			return columnImages;
-		} );
-	} );
-
-	const result = content.map( row => handleRowResize( row, width ) );
-	return result;
-}
-
 export function getGalleryRows( gallery ) {
 	return Array.from( gallery.querySelectorAll( '.tiled-gallery__row' ) );
 }
 
 function getRowCols( row ) {
-	return Platform.select( {
-		web: () => Array.from( row.querySelectorAll( '.tiled-gallery__col' ) ),
-		native: () => row,
-	} )();
+	return Array.from( row.querySelectorAll( '.tiled-gallery__col' ) );
 }
 
 function getColImgs( col ) {
-	return Platform.select( {
-		web: () =>
-			Array.from(
-				col.querySelectorAll( '.tiled-gallery__item > img, .tiled-gallery__item > a > img' )
-			),
-		native: () => col.map( img => img.props ),
-	} )();
+	return Array.from(
+		col.querySelectorAll( '.tiled-gallery__item > img, .tiled-gallery__item > a > img' )
+	);
 }
 
 function getColumnRatio( col ) {
@@ -85,53 +59,36 @@ function getColumnRatio( col ) {
 }
 
 function getImageRatio( img ) {
-	const w = Platform.select( {
-		web: () => parseInt( img.dataset.width, 10 ),
-		native: () => img.width,
-	} )();
-	const h = Platform.select( {
-		web: () => parseInt( img.dataset.height, 10 ),
-		native: () => img.height,
-	} )();
+	const w = parseInt( img.dataset.width, 10 );
+	const h = parseInt( img.dataset.height, 10 );
 	const result = w && ! Number.isNaN( w ) && h && ! Number.isNaN( h ) ? w / h : 1;
 	return result;
 }
 
 function applyRowRatio( row, [ ratio, weightedRatio ], width ) {
-	const colCount = Platform.select( {
-		web: () => row.childElementCount,
-		native: () => row.length,
-	} )();
-	const rawHeight = ( 1 / ratio ) * ( width - GUTTER_WIDTH * ( colCount - 1 ) - weightedRatio );
+	const rawHeight =
+		( 1 / ratio ) * ( width - GUTTER_WIDTH * ( row.childElementCount - 1 ) - weightedRatio );
 
 	return applyColRatio( row, {
 		rawHeight,
-		rowWidth: width - GUTTER_WIDTH * ( colCount - 1 ),
+		rowWidth: width - GUTTER_WIDTH * ( row.childElementCount - 1 ),
 	} );
 }
 
 function applyColRatio( row, { rawHeight, rowWidth } ) {
 	const cols = getRowCols( row );
 
-	const colWidths = cols.map( col => {
-		const imgCount = Platform.select( {
-			web: () => col.childElementCount,
-			native: () => col.length,
-		} )();
-		return ( rawHeight - GUTTER_WIDTH * ( imgCount - 1 ) ) * getColumnRatio( col )[ 0 ];
-	} );
+	const colWidths = cols.map(
+		col => ( rawHeight - GUTTER_WIDTH * ( col.childElementCount - 1 ) ) * getColumnRatio( col )[ 0 ]
+	);
 
 	const adjustedWidths = adjustFit( colWidths, rowWidth );
 
 	cols.forEach( ( col, i ) => {
 		const rawWidth = colWidths[ i ];
 		const width = adjustedWidths[ i ];
-		const imgCount = Platform.select( {
-			web: () => col.childElementCount,
-			native: () => col.length,
-		} )();
 		applyImgRatio( col, {
-			colHeight: rawHeight - GUTTER_WIDTH * ( imgCount - 1 ),
+			colHeight: rawHeight - GUTTER_WIDTH * ( col.childElementCount - 1 ),
 			width,
 			rawWidth,
 		} );
@@ -148,13 +105,9 @@ function applyImgRatio( col, { colHeight, width, rawWidth } ) {
 	const imgHeights = getColImgs( col ).map( img => rawWidth / getImageRatio( img ) );
 	const adjustedHeights = adjustFit( imgHeights, colHeight );
 
-	Platform.select( {
-		web: () => {
-			// Set size of col children, not the <img /> element
-			Array.from( col.children ).forEach( ( item, i ) => {
-				const height = adjustedHeights[ i ];
-				item.setAttribute( 'style', `height:${ height }px;width:${ width }px;` );
-			} );
-		},
-	} )();
+	// Set size of col children, not the <img /> element
+	Array.from( col.children ).forEach( ( item, i ) => {
+		const height = adjustedHeights[ i ];
+		item.setAttribute( 'style', `height:${ height }px;width:${ width }px;` );
+	} );
 }
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.native.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.native.js
new file mode 100644
index 0000000000000..6aa93bfba5555
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/layout/mosaic/resize.native.js
@@ -0,0 +1,146 @@
+/**
+ * WordPress dependencies
+ */
+import { Platform } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { GUTTER_WIDTH } from '../../constants';
+
+/**
+ * Distribute a difference across ns so that their sum matches the target
+ *
+ * @param   {Array<number>}  parts  - Array of numbers to fit
+ * @param   {number}         target - Number that sum should match
+ * @returns {Array<number>}         - Adjusted parts
+ */
+function adjustFit( parts, target ) {
+	const diff = target - parts.reduce( ( sum, n ) => sum + n, 0 );
+	const partialDiff = diff / parts.length;
+	return parts.map( p => p + partialDiff );
+}
+
+export function handleRowResize( row, width ) {
+	return applyRowRatio( row, getRowRatio( row ), width );
+}
+
+function getRowRatio( row ) {
+	const result = getRowCols( row )
+		.map( getColumnRatio )
+		.reduce(
+			( [ ratioA, weightedRatioA ], [ ratioB, weightedRatioB ] ) => {
+				return [ ratioA + ratioB, weightedRatioA + weightedRatioB ];
+			},
+			[ 0, 0 ]
+		);
+	return result;
+}
+
+export function getGalleryRows( gallery ) {
+	return Array.from( gallery.querySelectorAll( '.tiled-gallery__row' ) );
+}
+
+function getRowCols( row ) {
+	return Platform.select( {
+		web: () => Array.from( row.querySelectorAll( '.tiled-gallery__col' ) ),
+		native: () => row,
+	} )();
+}
+
+function getColImgs( col ) {
+	return Platform.select( {
+		web: () =>
+			Array.from(
+				col.querySelectorAll( '.tiled-gallery__item > img, .tiled-gallery__item > a > img' )
+			),
+		native: () => col.map( img => img.props ),
+	} )();
+}
+
+function getColumnRatio( col ) {
+	const imgs = getColImgs( col );
+	const imgCount = imgs.length;
+	const ratio =
+		1 /
+		imgs.map( getImageRatio ).reduce( ( partialColRatio, imgRatio ) => {
+			return partialColRatio + 1 / imgRatio;
+		}, 0 );
+	const result = [ ratio, ratio * imgCount || 1 ];
+	return result;
+}
+
+function getImageRatio( img ) {
+	const w = Platform.select( {
+		web: () => parseInt( img.dataset.width, 10 ),
+		native: () => img.width,
+	} )();
+	const h = Platform.select( {
+		web: () => parseInt( img.dataset.height, 10 ),
+		native: () => img.height,
+	} )();
+	const result = w && ! Number.isNaN( w ) && h && ! Number.isNaN( h ) ? w / h : 1;
+	return result;
+}
+
+function applyRowRatio( row, [ ratio, weightedRatio ], width ) {
+	const colCount = Platform.select( {
+		web: () => row.childElementCount,
+		native: () => row.length,
+	} )();
+	const rawHeight = ( 1 / ratio ) * ( width - GUTTER_WIDTH * ( colCount - 1 ) - weightedRatio );
+
+	return applyColRatio( row, {
+		rawHeight,
+		rowWidth: width - GUTTER_WIDTH * ( colCount - 1 ),
+	} );
+}
+
+function applyColRatio( row, { rawHeight, rowWidth } ) {
+	const cols = getRowCols( row );
+
+	const colWidths = cols.map( col => {
+		const imgCount = Platform.select( {
+			web: () => col.childElementCount,
+			native: () => col.length,
+		} )();
+		return ( rawHeight - GUTTER_WIDTH * ( imgCount - 1 ) ) * getColumnRatio( col )[ 0 ];
+	} );
+
+	const adjustedWidths = adjustFit( colWidths, rowWidth );
+
+	cols.forEach( ( col, i ) => {
+		const rawWidth = colWidths[ i ];
+		const width = adjustedWidths[ i ];
+		const imgCount = Platform.select( {
+			web: () => col.childElementCount,
+			native: () => col.length,
+		} )();
+		applyImgRatio( col, {
+			colHeight: rawHeight - GUTTER_WIDTH * ( imgCount - 1 ),
+			width,
+			rawWidth,
+		} );
+	} );
+
+	const colWidthPercentages = adjustedWidths.map( adjustedWidth =>
+		parseFloat( ( adjustedWidth / rowWidth ) * 100 ).toFixed( 5 )
+	);
+
+	return colWidthPercentages;
+}
+
+function applyImgRatio( col, { colHeight, width, rawWidth } ) {
+	const imgHeights = getColImgs( col ).map( img => rawWidth / getImageRatio( img ) );
+	const adjustedHeights = adjustFit( imgHeights, colHeight );
+
+	Platform.select( {
+		web: () => {
+			// Set size of col children, not the <img /> element
+			Array.from( col.children ).forEach( ( item, i ) => {
+				const height = adjustedHeights[ i ];
+				item.setAttribute( 'style', `height:${ height }px;width:${ width }px;` );
+			} );
+		},
+	} )();
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/index.js b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/index.js
new file mode 100644
index 0000000000000..792848742b7ac
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/index.js
@@ -0,0 +1,92 @@
+/**
+ * Internal dependencies
+ */
+import save from './save';
+
+// This deprecation is a result of:
+// - changing the default of `useAverageColor` resulting in old blocks not passing validation.
+export default {
+	attributes: {
+		autoplay: {
+			type: 'boolean',
+		},
+		caption: {
+			type: 'string',
+			source: 'html',
+			selector: 'figcaption',
+		},
+		controls: {
+			type: 'boolean',
+			default: true,
+		},
+		maxWidth: {
+			type: 'string',
+			default: '100%',
+		},
+		guid: {
+			type: 'string',
+		},
+		id: {
+			type: 'number',
+		},
+		loop: {
+			type: 'boolean',
+		},
+		isVideoPressExample: {
+			type: 'boolean',
+			default: false,
+		},
+		muted: {
+			type: 'boolean',
+		},
+		playsinline: {
+			type: 'boolean',
+		},
+		poster: {
+			type: 'string',
+		},
+		preload: {
+			type: 'string',
+			default: 'metadata',
+		},
+		seekbarPlayedColor: {
+			type: 'string',
+			default: '',
+		},
+		seekbarLoadingColor: {
+			type: 'string',
+			default: '',
+		},
+		seekbarColor: {
+			type: 'string',
+			default: '',
+		},
+		src: {
+			type: 'string',
+		},
+		videoPressTracks: {
+			type: 'array',
+			items: {
+				type: 'object',
+			},
+			default: [],
+		},
+		videoPressClassNames: {
+			type: 'string',
+		},
+	},
+	support: {
+		reusable: false,
+	},
+	isEligible: attrs => {
+		return attrs.guid;
+	},
+	migrate: attributes => {
+		return {
+			...attributes,
+			useAverageColor: false,
+		};
+	},
+	save,
+	isDeprecation: true,
+};
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/save.js b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/save.js
new file mode 100644
index 0000000000000..0dc7078751177
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/save.js
@@ -0,0 +1,71 @@
+/**
+ * External dependencies
+ */
+import { RichText, useBlockProps } from '@wordpress/block-editor';
+import classnames from 'classnames';
+
+/**
+ * Internal dependencies
+ */
+import { getVideoPressUrl } from './url';
+
+export default function VideoPressSave( props ) {
+	const {
+		attributes: {
+			autoplay,
+			caption,
+			controls,
+			guid,
+			loop,
+			muted,
+			playsinline,
+			poster,
+			preload,
+			videoPressClassNames,
+			className,
+			align,
+			seekbarColor,
+			seekbarPlayedColor,
+			seekbarLoadingColor,
+			maxWidth,
+		} = {},
+	} = props;
+
+	const blockProps = useBlockProps.save( {
+		className: classnames( 'wp-block-video', className, videoPressClassNames, {
+			[ `align${ align }` ]: align,
+		} ),
+	} );
+
+	const url = getVideoPressUrl( guid, {
+		autoplay,
+		controls,
+		loop,
+		muted,
+		playsinline,
+		poster,
+		preload,
+		seekbarColor,
+		seekbarPlayedColor,
+		seekbarLoadingColor,
+	} );
+
+	let embedWrapperStyle = {};
+	if ( maxWidth && maxWidth.length > 0 && '100%' !== maxWidth ) {
+		embedWrapperStyle = {
+			maxWidth,
+			margin: 'auto',
+		};
+	}
+
+	return (
+		<figure { ...blockProps }>
+			<div className="wp-block-embed__wrapper" style={ embedWrapperStyle }>
+				{ `\n${ url }\n` /* URL needs to be on its own line. */ }
+			</div>
+			{ ! RichText.isEmpty( caption ) && (
+				<RichText.Content tagName="figcaption" value={ caption } />
+			) }
+		</figure>
+	);
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/url.js b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/url.js
new file mode 100644
index 0000000000000..e4fba3df09a45
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/deprecated/v4/url.js
@@ -0,0 +1,48 @@
+/**
+ * External dependencies
+ */
+import { addQueryArgs } from '@wordpress/url';
+
+export const getVideoPressUrl = (
+	guid,
+	{
+		autoplay,
+		controls,
+		loop,
+		muted,
+		playsinline,
+		poster,
+		preload,
+		seekbarColor,
+		seekbarPlayedColor,
+		seekbarLoadingColor,
+	}
+) => {
+	if ( ! guid ) {
+		return null;
+	}
+
+	// In order to have a cleaner URL, we only set the options differing from the default VideoPress player settings:
+	// - Autoplay: Turned off by default.
+	// - Controls: Turned on by default.
+	// - Loop: Turned off by default.
+	// - Muted: Turned off by default.
+	// - Plays Inline: Turned off by default.
+	// - Poster: No image by default.
+	// - Preload: None by default.
+	const options = {
+		resizeToParent: true,
+		cover: true,
+		...( autoplay && { autoPlay: true } ),
+		...( ! controls && { controls: false } ),
+		...( loop && { loop: true } ),
+		...( muted && { muted: true, persistVolume: false } ),
+		...( playsinline && { playsinline: true } ),
+		...( poster && { posterUrl: poster } ),
+		...( preload !== 'none' && { preloadContent: preload } ),
+		...( seekbarColor !== '' && { sbc: seekbarColor } ),
+		...( seekbarPlayedColor !== '' && { sbpc: seekbarPlayedColor } ),
+		...( seekbarLoadingColor !== '' && { sblc: seekbarLoadingColor } ),
+	};
+	return addQueryArgs( `https://videopress.com/v/${ guid }`, options );
+};
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
index 1ef11597133b5..3850cacf75485 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
@@ -20,6 +20,7 @@ import getJetpackExtensionAvailability from '../../shared/get-jetpack-extension-
 import deprecatedV1 from './deprecated/v1';
 import deprecatedV2 from './deprecated/v2';
 import deprecatedV3 from './deprecated/v3';
+import deprecatedV4 from './deprecated/v4';
 import { isAtomicSite, isSimpleSite } from '../../shared/site-type-utils';
 import withHasWarningIsInteractiveClassNames from '../../shared/with-has-warning-is-interactive-class-names';
 import './editor.scss';
@@ -230,6 +231,7 @@ const addVideoPressSupport = ( settings, name ) => {
 			},
 			useAverageColor: {
 				type: 'boolean',
+				default: true,
 			},
 			videoPressTracks: {
 				type: 'array',
@@ -303,6 +305,7 @@ const addVideoPressSupport = ( settings, name ) => {
 
 			deprecated: [
 				...( deprecated || [] ),
+				deprecatedV4,
 				deprecatedV3,
 				{
 					attributes: attributesDefinition,
diff --git a/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/upgrade-plan-banner.jsx b/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/upgrade-plan-banner.jsx
index 28ca458ae09cb..d1dbc44f02b53 100644
--- a/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/upgrade-plan-banner.jsx
+++ b/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/upgrade-plan-banner.jsx
@@ -1,7 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -10,6 +11,10 @@ import useUpgradeFlow from '../../shared/use-upgrade-flow/index';
 import { Nudge } from '../../shared/components/upgrade-nudge';
 
 export const UPGRADE_NUDGE_TITLE = __( 'Premium Block', 'jetpack' );
+
+export const /** translators: %s: name of the plan. */
+	UPGRADE_NUDGE_PLAN_DESCRIPTION = __( 'Upgrade to %s to use this premium block', 'jetpack' );
+
 export const UPGRADE_NUDGE_DESCRIPTION = __(
 	'Upgrade your plan to use this premium block',
 	'jetpack'
@@ -21,7 +26,7 @@ const UpgradePlanBanner = ( {
 	align,
 	className,
 	title = UPGRADE_NUDGE_TITLE,
-	description = UPGRADE_NUDGE_DESCRIPTION,
+	description = null,
 	buttonText = UPGRADE_NUDGE_BUTTON_TEXT,
 	visible = true,
 	requiredPlan,
@@ -32,19 +37,38 @@ const UpgradePlanBanner = ( {
 		onRedirect
 	);
 
+	const upgradeDescription = useSelect(
+		select => {
+			if ( description ) {
+				return description;
+			}
+
+			const planSelector = select( 'wordpress-com/plans' );
+			const plan = planSelector && planSelector.getPlan( requiredPlan );
+			if ( plan ) {
+				return sprintf( UPGRADE_NUDGE_PLAN_DESCRIPTION, plan.product_name_short );
+			}
+
+			return null;
+		},
+		[ description ]
+	);
+
 	return (
-		<Nudge
-			align={ align }
-			buttonText={ buttonText }
-			checkoutUrl={ checkoutUrl }
-			className={ className }
-			context={ context }
-			description={ description }
-			goToCheckoutPage={ goToCheckoutPage }
-			isRedirecting={ isRedirecting }
-			title={ title }
-			visible={ visible }
-		/>
+		upgradeDescription && (
+			<Nudge
+				align={ align }
+				buttonText={ buttonText }
+				checkoutUrl={ checkoutUrl }
+				className={ className }
+				context={ context }
+				description={ upgradeDescription }
+				goToCheckoutPage={ goToCheckoutPage }
+				isRedirecting={ isRedirecting }
+				title={ title }
+				visible={ visible }
+			/>
+		)
 	);
 };
 
diff --git a/projects/plugins/jetpack/extensions/index.json b/projects/plugins/jetpack/extensions/index.json
index 14b01afb7b7e6..1a5335279a39f 100644
--- a/projects/plugins/jetpack/extensions/index.json
+++ b/projects/plugins/jetpack/extensions/index.json
@@ -39,15 +39,8 @@
 		"videopress",
 		"wordads"
 	],
-	"beta": [
-		"amazon"
-	],
-	"experimental": [
-		"anchor-fm",
-		"premium-content",
-		"conversation",
-		"dialogue"
-	],
+	"beta": [ "amazon" ],
+	"experimental": [ "anchor-fm", "premium-content", "conversation", "dialogue" ],
 	"no-post-editor": [
 		"business-hours",
 		"button",
diff --git a/projects/plugins/jetpack/extensions/shared/test/block-fixtures.md b/projects/plugins/jetpack/extensions/shared/test/block-fixtures.md
index 42a67414e470b..f7349bea35e33 100644
--- a/projects/plugins/jetpack/extensions/shared/test/block-fixtures.md
+++ b/projects/plugins/jetpack/extensions/shared/test/block-fixtures.md
@@ -126,7 +126,7 @@ The provided `generate_server_side_rendering_based_on_serialized_fixtures` metho
 To run (or generate) server-rendered fixture tests:
 
 ```sh
-pnpm docker:phpunit -- --testsuite=extensions
+jetpack docker phpunit -- --testsuite=extensions
 ```
 
 To regenerate server-rendered fixtures, delete the fixtures with the `.server-rendered.html` extension and re-run the above command. The tests will fail, and report that the fixtures have been generated. Re-run the command again, and the tests should pass. Be sure to commit any updated or generated fixtures.
diff --git a/projects/plugins/jetpack/images/jetpack-banner-gradient.png b/projects/plugins/jetpack/images/jetpack-banner-gradient.png
new file mode 100644
index 0000000000000..7f30bc0982f9b
Binary files /dev/null and b/projects/plugins/jetpack/images/jetpack-banner-gradient.png differ
diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php
index cefcc06bc0a06..399ea42b0c932 100644
--- a/projects/plugins/jetpack/jetpack.php
+++ b/projects/plugins/jetpack/jetpack.php
@@ -4,7 +4,7 @@
  * Plugin URI: https://jetpack.com
  * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
  * Author: Automattic
- * Version: 10.6-a.4
+ * Version: 10.7-a.2
  * Author URI: https://jetpack.com
  * License: GPL2+
  * Text Domain: jetpack
@@ -32,7 +32,7 @@
 
 define( 'JETPACK__MINIMUM_WP_VERSION', '5.8' );
 define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' );
-define( 'JETPACK__VERSION', '10.6-a.4' );
+define( 'JETPACK__VERSION', '10.7-a.2' );
 
 /**
  * Constant used to fetch the connection owner token
diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
index 489223b78ee49..113e9fd012954 100644
--- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php
@@ -113,15 +113,21 @@ function callback( $path = '', $blog_id = 0 ) {
 		}
 
 		$query = array(
-			'number'    => $args['number'],
-			'offset'    => $args['offset'],
-			'order'     => $args['order'],
-			'orderby'   => $args['order_by'],
-			'fields'    => 'ID',
+			'number'  => $args['number'],
+			'offset'  => $args['offset'],
+			'order'   => $args['order'],
+			'orderby' => $args['order_by'],
+			'fields'  => 'ID',
 		);
 
 		if ( $authors_only ) {
-			$query['who'] = 'authors';
+			$query['capability'] = array( 'edit_posts' );
+			// To-do: remove this once Jetpack requires WordPress 5.9.
+			global $wp_version;
+			if ( version_compare( $wp_version, '5.9-alpha', '<' ) ) {
+				$query['who'] = 'authors';
+				unset( $query['capability'] );
+			}
 		}
 
 		if ( ! empty( $args['search'] ) ) {
diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
index a36efe95a0b17..9bd1d5b8d41b7 100644
--- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
@@ -573,7 +573,7 @@ public function update_settings() {
 					$coerce_value = ( $value ) ? 'open' : 'closed';
 					if ( update_option( $key, $coerce_value ) ) {
 						$updated[ $key ] = $value;
-					};
+					}
 					break;
 				case 'jetpack_protect_whitelist':
 					if ( function_exists( 'jetpack_protect_save_whitelist' ) ) {
diff --git a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-install-endpoint.php b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-install-endpoint.php
index 77e09c887f623..b5ddf0ce3a7ad 100644
--- a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-install-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-install-endpoint.php
@@ -1,5 +1,7 @@
 <?php
 
+use Automattic\Jetpack\Plugins_Installer;
+
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 include_once ABSPATH . 'wp-admin/includes/file.php';
 // POST /sites/%s/plugins/%s/install
@@ -57,10 +59,9 @@ class Jetpack_JSON_API_Plugins_Install_Endpoint extends Jetpack_JSON_API_Plugins
 	protected $action = 'install';
 
 	protected function install() {
-		jetpack_require_lib( 'plugins' );
 		$result = '';
 		foreach ( $this->plugins as $index => $slug ) {
-			$result = Jetpack_Plugins::install_plugin( $slug );
+			$result = Plugins_Installer::install_plugin( $slug );
 			if ( is_wp_error( $result ) ) {
 				$this->log[ $slug ][] = $result->get_error_message();
 				if ( ! $this->bulk ) {
@@ -74,7 +75,7 @@ protected function install() {
 		}
 
 		// No errors, install worked. Now replace the slug with the actual plugin id
-		$this->plugins[$index] = Jetpack_Plugins::get_plugin_id_by_slug( $slug );
+		$this->plugins[ $index ] = Plugins_Installer::get_plugin_id_by_slug( $slug );
 
 		return true;
 	}
@@ -84,10 +85,9 @@ protected function validate_plugins() {
 			return new WP_Error( 'missing_plugins', __( 'No plugins found.', 'jetpack' ) );
 		}
 
-		jetpack_require_lib( 'plugins' );
 		foreach ( $this->plugins as $index => $slug ) {
 			// make sure it is not already installed
-			if ( Jetpack_Plugins::get_plugin_id_by_slug( $slug ) ) {
+			if ( Plugins_Installer::get_plugin_id_by_slug( $slug ) ) {
 				return new WP_Error( 'plugin_already_installed', __( 'The plugin is already installed', 'jetpack' ) );
 			}
 
diff --git a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-new-endpoint.php b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-new-endpoint.php
index 3a16b1b0c7f46..ff2732867f010 100644
--- a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-new-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-new-endpoint.php
@@ -3,6 +3,7 @@
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 include_once ABSPATH . 'wp-admin/includes/file.php';
 
+use Automattic\Jetpack\Automatic_Install_Skin;
 
 // POST /sites/%s/plugins/new
 new Jetpack_JSON_API_Plugins_New_Endpoint(
@@ -92,8 +93,7 @@ function install() {
 			if ( ! $local_file ) {
 				return new WP_Error( 'local-file-does-not-exist' );
 			}
-			jetpack_require_lib( 'class.jetpack-automatic-install-skin' );
-			$skin     = new Jetpack_Automatic_Install_Skin();
+			$skin     = new Automatic_Install_Skin();
 			$upgrader = new Plugin_Upgrader( $skin );
 
 			$pre_install_plugin_list = get_plugins();
diff --git a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-install-endpoint.php b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-install-endpoint.php
index 5c69b4dd93265..f4cb2a4f10377 100644
--- a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-install-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-install-endpoint.php
@@ -3,6 +3,7 @@
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 include_once ABSPATH . 'wp-admin/includes/file.php';
 
+use Automattic\Jetpack\Automatic_Install_Skin;
 use Automattic\Jetpack\Connection\Client;
 
 class Jetpack_JSON_API_Themes_Install_Endpoint extends Jetpack_JSON_API_Themes_Endpoint {
@@ -40,8 +41,7 @@ protected function install() {
 
 			// If the alternative install method was not used, use the standard method.
 			if ( ! $result ) {
-				jetpack_require_lib( 'class.jetpack-automatic-install-skin' );
-				$skin     = new Jetpack_Automatic_Install_Skin();
+				$skin     = new Automatic_Install_Skin();
 				$upgrader = new Theme_Upgrader( $skin );
 
 				$link   = $this->download_links[ $theme ];
diff --git a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-new-endpoint.php b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-new-endpoint.php
index 757681838fc33..adb3252a80052 100644
--- a/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-new-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-new-endpoint.php
@@ -3,6 +3,8 @@
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 include_once ABSPATH . 'wp-admin/includes/file.php';
 
+use Automattic\Jetpack\Automatic_Install_Skin;
+
 class Jetpack_JSON_API_Themes_New_Endpoint extends Jetpack_JSON_API_Themes_Endpoint {
 
 	// POST  /sites/%s/themes/%s/install
@@ -37,9 +39,8 @@ function install() {
 			if ( ! $local_file ) {
 				return new WP_Error( 'local-file-does-not-exist' );
 			}
-			jetpack_require_lib( 'class.jetpack-automatic-install-skin' );
-			$skin      = new Jetpack_Automatic_Install_Skin();
-			$upgrader  = new Theme_Upgrader( $skin );
+			$skin     = new Automatic_Install_Skin();
+			$upgrader = new Theme_Upgrader( $skin );
 
 			$pre_install_list = wp_get_themes();
 			$result           = $upgrader->install( $local_file );
diff --git a/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php b/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php
index 63b2a81481d48..ee57cc08cace5 100644
--- a/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php
+++ b/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php
@@ -25,6 +25,7 @@ function insert_tracking_id() {
 		&& ( class_exists( 'Jetpack_AMP_Support' ) && ! \Jetpack_AMP_Support::is_amp_request() )
 		&& ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() )
 	) {
+		// phpcs:disable WordPress.WP.EnqueuedResources.NonEnqueuedScript
 		printf(
 			"<!-- Jetpack Cloudflare Web Analytics -->
 <script defer
@@ -34,6 +35,7 @@ function insert_tracking_id() {
 <!-- End Jetpack Cloudflare Web Analytics -->\r\n",
 			esc_html( $option['code'] )
 		);
+		// phpcs:enable WordPress.WP.EnqueuedResources.NonEnqueuedScript
 	}
 }
 add_action( 'wp_footer', __NAMESPACE__ . '\insert_tracking_id', 999 );
diff --git a/projects/plugins/jetpack/modules/contact-form/grunion-contact-form.php b/projects/plugins/jetpack/modules/contact-form/grunion-contact-form.php
index 3eaa34c3fbed2..48982ed172726 100644
--- a/projects/plugins/jetpack/modules/contact-form/grunion-contact-form.php
+++ b/projects/plugins/jetpack/modules/contact-form/grunion-contact-form.php
@@ -510,13 +510,17 @@ function unread_count( $screen ) {
 	 *
 	 * Conditionally attached to `template_redirect`
 	 */
-	function process_form_submission() {
-		// Add a filter to replace tokens in the subject field with sanitized field values
+	public function process_form_submission() {
+		// Add a filter to replace tokens in the subject field with sanitized field values.
 		add_filter( 'contact_form_subject', array( $this, 'replace_tokens_with_input' ), 10, 2 );
 
-		$id   = stripslashes( $_POST['contact-form-id'] );
-		$hash = isset( $_POST['contact-form-hash'] ) ? $_POST['contact-form-hash'] : '';
+		// phpcs:disable WordPress.Security.NonceVerification.Missing
+		$id   = isset( $_POST['contact-form-id'] ) ? wp_unslash( $_POST['contact-form-id'] ) : null;
+		$id   = is_string( $id ) ? $id : null;
+		$hash = isset( $_POST['contact-form-hash'] ) ? wp_unslash( $_POST['contact-form-hash'] ) : null;
+		$hash = is_string( $hash ) ? $hash : null;
 		$hash = preg_replace( '/[^\da-f]/i', '', $hash );
+		// phpcs:enable
 
 		if ( ! is_string( $id ) || ! is_string( $hash ) ) {
 			return false;
@@ -2532,13 +2536,13 @@ static function parse_contact_field( $attributes, $content ) {
 			$form->fields[] = $field;
 		}
 
-		if (
+		if ( // phpcs:disable WordPress.Security.NonceVerification.Missing
 			isset( $_POST['action'] ) && 'grunion-contact-form' === $_POST['action']
 			&&
 			isset( $_POST['contact-form-id'] ) && $form->get_attribute( 'id' ) == $_POST['contact-form-id']
 			&&
-			isset( $_POST['contact-form-hash'] ) && hash_equals( $form->hash, $_POST['contact-form-hash'] )
-		) {
+			isset( $_POST['contact-form-hash'] ) && is_string( $_POST['contact-form-hash'] ) && hash_equals( $form->hash, $_POST['contact-form-hash'] )
+		) { // phpcs:enable
 			// If we're processing a POST submission for this contact form, validate the field value so we can show errors as necessary.
 			$field->validate();
 		}
diff --git a/projects/plugins/jetpack/modules/markdown/easy-markdown.php b/projects/plugins/jetpack/modules/markdown/easy-markdown.php
index e030b8bbf9eb4..d0f67f9b1f401 100644
--- a/projects/plugins/jetpack/modules/markdown/easy-markdown.php
+++ b/projects/plugins/jetpack/modules/markdown/easy-markdown.php
@@ -412,8 +412,8 @@ public function add_default_post_type_support() {
 	 */
 	protected function get_post_screen_post_type() {
 		global $pagenow;
-		$post_type = filter_var( INPUT_GET, 'post_type', FILTER_SANITIZE_STRING );
-		$post_id   = filter_var( INPUT_GET, 'post', FILTER_SANITIZE_NUMBER_INT );
+		$post_type = filter_input( INPUT_GET, 'post_type', FILTER_SANITIZE_STRING );
+		$post_id   = filter_input( INPUT_GET, 'post', FILTER_SANITIZE_NUMBER_INT );
 
 		if ( 'post-new.php' === $pagenow ) {
 			return ! empty( $post_type ) ? $post_type : 'post';
diff --git a/projects/plugins/jetpack/modules/publicize/publicize.php b/projects/plugins/jetpack/modules/publicize/publicize.php
index 32d43d092a232..d4b73d63097ba 100644
--- a/projects/plugins/jetpack/modules/publicize/publicize.php
+++ b/projects/plugins/jetpack/modules/publicize/publicize.php
@@ -746,7 +746,7 @@ public function get_filtered_connection_data( $selected_post_id = null ) {
 					'enabled'         => $enabled,
 					'done'            => $done,
 					'toggleable'      => $toggleable,
-					'global'          => 0 == $connection_data['user_id'], // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Other types can be used at times.
+					'global'          => 0 == $connection_data['user_id'], // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- Other types can be used at times.
 				);
 			}
 		}
diff --git a/projects/plugins/jetpack/modules/related-posts.php b/projects/plugins/jetpack/modules/related-posts.php
index 24591fe9049f6..e3e4bfe9884bf 100644
--- a/projects/plugins/jetpack/modules/related-posts.php
+++ b/projects/plugins/jetpack/modules/related-posts.php
@@ -45,7 +45,7 @@ private function __construct() {
 	 * @return null
 	 */
 	public function action_on_load() {
-		require_once 'related-posts/jetpack-related-posts.php';
+		require_once __DIR__ . '/related-posts/jetpack-related-posts.php';
 		Jetpack_RelatedPosts::init();
 
 		if ( is_admin() ) {
@@ -54,7 +54,7 @@ public function action_on_load() {
 
 		// Load Customizer controls.
 		if ( class_exists( WP_Customize_Manager::class ) && class_exists( WP_Customize_Control::class ) ) {
-			require_once 'related-posts/class.related-posts-customize.php';
+			require_once __DIR__ . '/related-posts/class.related-posts-customize.php';
 		}
 	}
 }
diff --git a/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php b/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php
index 1927e21c960a8..8d643ccaee8a2 100644
--- a/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php
+++ b/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php
@@ -363,6 +363,7 @@ public function render_block_row( $posts, $block_attributes ) {
 	 * @return string
 	 */
 	public function render_block( $attributes ) {
+		$post_id          = get_the_ID();
 		$block_attributes = array(
 			'headline'        => isset( $attributes['headline'] ) ? $attributes['headline'] : null,
 			'show_thumbnails' => isset( $attributes['displayThumbnails'] ) && $attributes['displayThumbnails'],
@@ -375,7 +376,7 @@ public function render_block( $attributes ) {
 		$excludes = $this->parse_numeric_get_arg( 'relatedposts_origin' );
 
 		$related_posts = $this->get_for_post_id(
-			get_the_ID(),
+			$post_id,
 			array(
 				'size'             => $block_attributes['size'],
 				'exclude_post_ids' => $excludes,
@@ -408,12 +409,26 @@ public function render_block( $attributes ) {
 			$rows_markup .= $this->render_block_row( $lower_row_posts, $block_attributes );
 		}
 
-		return sprintf(
+		$display_markup = sprintf(
 			'<nav class="jp-relatedposts-i2" data-layout="%1$s">%2$s%3$s</nav>',
 			esc_attr( $block_attributes['layout'] ),
 			$block_attributes['headline'],
 			$rows_markup
 		);
+
+		/**
+		 * Filter the output HTML of Related Posts.
+		 *
+		 * @module related-posts
+		 *
+		 * @since 10.7
+		 *
+		 * @param string $display_markup HTML output of Related Posts.
+		 * @param int|false get_the_ID() Post ID of the post for which we are retrieving Related Posts.
+		 * @param array $related_posts Array of related posts.
+		 * @param array $block_attributes Array of Block attributes.
+		 */
+		return apply_filters( 'jetpack_related_posts_display_markup', $display_markup, $post_id, $related_posts, $block_attributes );
 	}
 
 	/**
@@ -1183,9 +1198,8 @@ protected function _action_frontend_init_ajax( array $excludes ) {
 	 * @return array
 	 */
 	public function get_related_post_data_for_post( $post_id, $position, $origin ) {
-		$post = get_post( $post_id );
-
-		return array(
+		$post          = get_post( $post_id );
+		$related_posts = array(
 			'id'       => $post->ID,
 			'url'      => get_permalink( $post->ID ),
 			'url_meta' => array(
@@ -1216,7 +1230,7 @@ public function get_related_post_data_for_post( $post_id, $position, $origin ) {
 			 * @since 3.0.0
 			 *
 			 * @param string $this->_to_utf8( $this->_generate_related_post_context( $post->ID ) ) Context displayed below each related post.
-			 * @param string $post_id Post ID of the post for which we are retrieving Related Posts.
+			 * @param int $post_id Post ID of the post for which we are retrieving Related Posts.
 			 */
 			'context' => apply_filters(
 				'jetpack_relatedposts_filter_post_context',
@@ -1240,6 +1254,18 @@ public function get_related_post_data_for_post( $post_id, $position, $origin ) {
 				$post->ID
 			),
 		);
+
+		/**
+		 * Filter the array of related posts.
+		 *
+		 * @module related-posts
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param array $results Array of related posts.
+		 * @param int $post_id Post ID of the post for which we are retrieving Related Posts.
+		 */
+		return apply_filters( 'jetpack_relatedposts_returned_results', $related_posts, $post_id );
 	}
 
 	/**
diff --git a/projects/plugins/jetpack/modules/scan/scan.php b/projects/plugins/jetpack/modules/scan/scan.php
index 11bcc6dab7252..15b9a927b0d98 100644
--- a/projects/plugins/jetpack/modules/scan/scan.php
+++ b/projects/plugins/jetpack/modules/scan/scan.php
@@ -8,8 +8,8 @@
 
 namespace Automattic\Jetpack\Scan;
 
-require_once 'class-admin-bar-notice.php';
-require_once 'class-admin-sidebar-link.php';
+require_once __DIR__ . '/class-admin-bar-notice.php';
+require_once __DIR__ . '/class-admin-sidebar-link.php';
 
 Admin_Bar_Notice::instance();
 Admin_Sidebar_Link::instance();
diff --git a/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css b/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css
index 5d7932e0868b4..ad739cc41a107 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css
+++ b/projects/plugins/jetpack/modules/sharedaddy/amp-sharing.css
@@ -37,6 +37,15 @@ amp-social-share::before,
 	color: #656565;
 }
 
+amp-social-share[type='email'] {
+	background: #e9e9e9;
+	color: #656565;
+}
+
+amp-social-share[type='email']::before {
+	content: '\f410';
+}
+
 amp-social-share[type='tumblr'] {
 	background: #2c4762;
 }
diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharedaddy.php b/projects/plugins/jetpack/modules/sharedaddy/sharedaddy.php
index 1abe651d47ca5..be3d340c3e1ec 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/sharedaddy.php
+++ b/projects/plugins/jetpack/modules/sharedaddy/sharedaddy.php
@@ -248,7 +248,7 @@ function sharing_global_resources() {
 		<?php
 		printf(
 			'<input id="disable_css" type="checkbox" name="disable_resources"%1$s />  <small><em>%2$s</em></small>',
-			( 1 == $disable ) ? ' checked="checked"' : '', // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			( 1 == $disable ) ? ' checked="checked"' : '', // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 			esc_html__( 'Advanced. If this option is checked, you must include these files in your theme manually for the sharing links to work.', 'jetpack' )
 		);
 		?>
diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharing-sources.php b/projects/plugins/jetpack/modules/sharedaddy/sharing-sources.php
index d4632e79970c6..80d3072a6264a 100644
--- a/projects/plugins/jetpack/modules/sharedaddy/sharing-sources.php
+++ b/projects/plugins/jetpack/modules/sharedaddy/sharing-sources.php
@@ -658,12 +658,17 @@ public function get_display( $post ) {
 	}
 
 	/**
-	 * No AMP display for email.
+	 * AMP display for email.
 	 *
 	 * @param \WP_Post $post The current post being viewed.
 	 */
 	public function get_amp_display( $post ) { // phpcs:ignore
-		return false;
+		$attrs = array(
+			// Prevents an empty window from opening on desktop: https://github.com/ampproject/amphtml/issues/9157.
+			'data-target' => '_self',
+		);
+
+		return $this->build_amp_markup( $attrs );
 	}
 
 	/**
diff --git a/projects/plugins/jetpack/modules/shortcodes/slideshow.php b/projects/plugins/jetpack/modules/shortcodes/slideshow.php
index 68357947d921c..65bd3f61ba948 100644
--- a/projects/plugins/jetpack/modules/shortcodes/slideshow.php
+++ b/projects/plugins/jetpack/modules/shortcodes/slideshow.php
@@ -191,7 +191,7 @@ public function shortcode_callback( $attr ) {
 				'ids' => wp_list_pluck( $gallery, 'id' ),
 			);
 
-			if ( 'true' == $autostart ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- attribute can be stored as boolean or string.
+			if ( 'true' == $autostart ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- attribute can be stored as boolean or string.
 				$amp_args['autoplay'] = true;
 			}
 
diff --git a/projects/plugins/jetpack/modules/shortcodes/wufoo.php b/projects/plugins/jetpack/modules/shortcodes/wufoo.php
index 0af8b51aca969..f399c807a682f 100644
--- a/projects/plugins/jetpack/modules/shortcodes/wufoo.php
+++ b/projects/plugins/jetpack/modules/shortcodes/wufoo.php
@@ -71,7 +71,7 @@ function wufoo_shortcode( $atts ) {
 		'(function(){try{var wufoo_%1$s = new WufooForm();wufoo_%1$s.initialize({"userName":"%2$s","formHash":"%1$s","autoResize":%3$s,"height":"%4$d","header":"%5$s","ssl":true,"async":true});wufoo_%1$s.display();}catch(e){}})();',
 		esc_attr( $attr['formhash'] ),
 		esc_attr( $attr['username'] ),
-		'true' == $attr['autoresize'] ? 'true' : 'false', // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+		'true' == $attr['autoresize'] ? 'true' : 'false', // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 		absint( $attr['height'] ),
 		'show' === $attr['header'] ? 'show' : 'hide'
 	);
diff --git a/projects/plugins/jetpack/modules/sso.php b/projects/plugins/jetpack/modules/sso.php
index c5f5538e9e334..8641c906a5a56 100644
--- a/projects/plugins/jetpack/modules/sso.php
+++ b/projects/plugins/jetpack/modules/sso.php
@@ -725,7 +725,7 @@ function handle_login() {
 			$user = get_user_by( 'id', (int) $user_data->external_user_id );
 			if ( $user ) {
 				$expected_id = get_user_meta( $user->ID, 'wpcom_user_id', true );
-				if ( $expected_id && $expected_id != $user_data->ID ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+				if ( $expected_id && $expected_id != $user_data->ID ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseNotEqual
 					$error = new WP_Error( 'expected_wpcom_user', __( 'Something got a little mixed up and an unexpected WordPress.com user logged in.', 'jetpack' ) );
 
 					/** This filter is documented in core/src/wp-includes/pluggable.php */
diff --git a/projects/plugins/jetpack/modules/stats/class-jetpack-stats-upgrade-nudges.php b/projects/plugins/jetpack/modules/stats/class-jetpack-stats-upgrade-nudges.php
index 6557f972d5142..54f79d76d0dbe 100644
--- a/projects/plugins/jetpack/modules/stats/class-jetpack-stats-upgrade-nudges.php
+++ b/projects/plugins/jetpack/modules/stats/class-jetpack-stats-upgrade-nudges.php
@@ -7,11 +7,10 @@
 
 use Automattic\Jetpack\Connection\Manager;
 use Automattic\Jetpack\Jetpack_CRM_Data;
+use Automattic\Jetpack\Plugins_Installer;
 use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Tracking;
 
-jetpack_require_lib( 'plugins' );
-
 /**
  * Class that adds a new section to the Stats Report page
  */
@@ -65,7 +64,7 @@ private static function is_backup_active() {
 	 * @return boolean
 	 */
 	private static function is_plugin_installed( $plugin_file ) {
-		$plugins = Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 		return isset( $plugins[ $plugin_file ] );
 	}
 
@@ -76,7 +75,7 @@ private static function is_plugin_installed( $plugin_file ) {
 	 * @return boolean
 	 */
 	private static function is_plugin_active( $plugin_file ) {
-		$plugins = Jetpack_Plugins::get_plugins();
+		$plugins = Plugins_Installer::get_plugins();
 		return isset( $plugins[ $plugin_file ] ) && isset( $plugins[ $plugin_file ]['active'] ) && $plugins[ $plugin_file ]['active'];
 	}
 
diff --git a/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php b/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php
index ce4688b0579f5..57c86b88fb692 100644
--- a/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php
+++ b/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php
@@ -308,7 +308,7 @@ protected function display_download_choice( $info ) {
 			"attachments-{$info->post_id}-allowdownload",
 			"attachments[{$info->post_id}][allow_download]",
 			__( 'Display download option and allow viewers to download this video', 'jetpack' ),
-			$info->allow_download
+			isset( $info->allow_download ) && $info->allow_download
 		);
 	}
 
diff --git a/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx b/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
index 738a980f5bf3a..ca7deac51f177 100644
--- a/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
+++ b/projects/plugins/jetpack/modules/widget-visibility/editor/index.jsx
@@ -9,7 +9,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
 import analytics from '../../../_inc/client/lib/analytics';
 
-/* global widget_conditions_data, wpcom */
+/* global widget_conditions_data */
 /* eslint-disable react/react-in-jsx-scope */
 
 //// Unescape utility
@@ -124,6 +124,17 @@ const buildOptions = ( options, level = 0 ) =>
 		return acc.concat( [ newItem ] );
 	}, [] );
 
+/**
+ * Get the site type.
+ *
+ * @return {string} - jetpack, atomic, or simple.
+ */
+const getSiteType = () => {
+	return 'object' === typeof window && typeof window._currentSiteType === 'string'
+		? window._currentSiteType
+		: 'jetpack';
+};
+
 const VisibilityRule = props => {
 	const { rule, onDelete, setMajor, setMinor } = props;
 
@@ -132,7 +143,6 @@ const VisibilityRule = props => {
 		{ label: __( 'User', 'jetpack' ), value: 'loggedin' },
 		{ label: __( 'Role', 'jetpack' ), value: 'role' },
 	];
-	const isWpcom = typeof wpcom !== 'undefined';
 
 	// "Taxonomy" is shown if there is at least one taxonomy (or if the current
 	// rule is taxonomy, so they can delete an invalid rule after removing
@@ -148,7 +158,7 @@ const VisibilityRule = props => {
 		{ label: __( 'Category', 'jetpack' ), value: 'category' },
 		{ label: __( 'Author', 'jetpack' ), value: 'author' },
 	]
-		.concat( isWpcom ? [] : optionsDisabledOnWpcom )
+		.concat( 'simple' === getSiteType() ? [] : optionsDisabledOnWpcom )
 		.concat( [
 			{ label: __( 'Tag', 'jetpack' ), value: 'tag' },
 			{ label: __( 'Date', 'jetpack' ), value: 'date' },
diff --git a/projects/plugins/jetpack/modules/widget-visibility/widget-conditions.php b/projects/plugins/jetpack/modules/widget-visibility/widget-conditions.php
index 2d0a9f815714f..5423f049ee3aa 100644
--- a/projects/plugins/jetpack/modules/widget-visibility/widget-conditions.php
+++ b/projects/plugins/jetpack/modules/widget-visibility/widget-conditions.php
@@ -230,15 +230,24 @@ public static function widget_admin_setup() {
 		$widget_conditions_data['author']   = array();
 		$widget_conditions_data['author'][] = array( '', __( 'All author pages', 'jetpack' ) );
 
-		// Only users with publish caps.
-		$authors = get_users(
-			array(
-				'orderby' => 'name',
-				'who'     => 'authors',
-				'fields'  => array( 'ID', 'display_name' ),
-			)
+		/*
+		 * Query for users with publish caps.
+		 */
+		$authors_args = array(
+			'orderby'    => 'name',
+			'capability' => array( 'edit_posts' ),
+			'fields'     => array( 'ID', 'display_name' ),
 		);
 
+		// To-do: remove this once Jetpack requires WordPress 5.9.
+		global $wp_version;
+		if ( version_compare( $wp_version, '5.9-alpha', '<' ) ) {
+			$authors_args['who'] = 'authors';
+			unset( $authors_args['capability'] );
+		}
+
+		$authors = get_users( $authors_args );
+
 		foreach ( $authors as $author ) {
 			$widget_conditions_data['author'][] = array( (string) $author->ID, $author->display_name );
 		}
@@ -892,11 +901,11 @@ public static function filter_widget_check_conditions( $conditions ) {
 									$condition_result = $wp_query->is_posts_page;
 								} else {
 									// $rule['minor'] is a page ID
-									$condition_result = is_page() && ( get_the_ID() === $rule['minor'] );
+									$condition_result = is_page() && ( get_the_ID() === (int) $rule['minor'] );
 
 									// Check if $rule['minor'] is parent of page ID.
 									if ( ! $condition_result && isset( $rule['has_children'] ) && $rule['has_children'] ) {
-										$condition_result = wp_get_post_parent_id( get_the_ID() ) === $rule['minor'];
+										$condition_result = wp_get_post_parent_id( get_the_ID() ) === (int) $rule['minor'];
 									}
 								}
 								break;
diff --git a/projects/plugins/jetpack/modules/widgets/authors.php b/projects/plugins/jetpack/modules/widgets/authors.php
index 402794fc9cc97..4ed2e8d1e483b 100644
--- a/projects/plugins/jetpack/modules/widgets/authors.php
+++ b/projects/plugins/jetpack/modules/widgets/authors.php
@@ -106,11 +106,18 @@ public function widget( $args, $instance ) {
 		$get_author_params = apply_filters(
 			'jetpack_widget_authors_params',
 			array(
-				'who'     => 'authors',
-				'exclude' => (array) $excluded_authors,
+				'capability' => array( 'edit_posts' ),
+				'exclude'    => (array) $excluded_authors,
 			)
 		);
 
+		// To-do: remove this once Jetpack requires WordPress 5.9.
+		global $wp_version;
+		if ( version_compare( $wp_version, '5.9-alpha', '<' ) ) {
+			$get_author_params['who'] = 'authors';
+			unset( $get_author_params['capability'] );
+		}
+
 		$authors = get_users( $get_author_params );
 
 		echo $args['before_widget'];
diff --git a/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php b/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php
index ca23189777cf0..75938241364b1 100644
--- a/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php
+++ b/projects/plugins/jetpack/modules/widgets/class-jetpack-eu-cookie-law-widget.php
@@ -331,7 +331,7 @@ public function filter_value( $value, $allowed = array() ) {
 	 */
 	function jetpack_register_eu_cookie_law_widget() {
 		register_widget( 'Jetpack_EU_Cookie_Law_Widget' );
-	};
+	}
 
 	add_action( 'widgets_init', 'jetpack_register_eu_cookie_law_widget' );
 }
diff --git a/projects/plugins/jetpack/modules/widgets/internet-defense-league.php b/projects/plugins/jetpack/modules/widgets/internet-defense-league.php
index ba4170fa57575..3aa22ae80a8a8 100644
--- a/projects/plugins/jetpack/modules/widgets/internet-defense-league.php
+++ b/projects/plugins/jetpack/modules/widgets/internet-defense-league.php
@@ -51,6 +51,19 @@ function __construct() {
 			'variant'  => key( $this->variants ),
 			'badge'    => key( $this->badges ),
 		);
+
+		add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget_in_block_editor' ) );
+	}
+
+	/**
+	 * Remove the "Internet Defense League" widget from the Legacy Widget block
+	 *
+	 * @param array $widget_types List of widgets that are currently removed from the Legacy Widget block.
+	 * @return array $widget_types New list of widgets that will be removed.
+	 */
+	public function hide_widget_in_block_editor( $widget_types ) {
+		$widget_types[] = 'internet_defense_league_widget';
+		return $widget_types;
 	}
 
 	public function widget( $args, $instance ) {
diff --git a/projects/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php b/projects/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
index 06f317ff496d3..9acdb337def4f 100644
--- a/projects/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
+++ b/projects/plugins/jetpack/modules/widgets/migrate-to-core/image-widget.php
@@ -155,8 +155,8 @@ function jetpack_migrate_image_widget() {
 
 				// Set correct size if dimensions fit.
 				if (
-					$media_image[ $id ]['width'] == $image_meta['width'] || // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
-					$media_image[ $id ]['height'] == $image_meta['height'] // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+					$media_image[ $id ]['width'] == $image_meta['width'] || // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
+					$media_image[ $id ]['height'] == $image_meta['height'] // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				) {
 					$media_image[ $id ]['size'] = 'full';
 				}
@@ -170,8 +170,8 @@ function jetpack_migrate_image_widget() {
 
 					// Set correct size if dimensions fit.
 					if (
-						$media_image[ $id ]['width'] == $image['width'] || // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
-						$media_image[ $id ]['height'] == $image['height'] // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+						$media_image[ $id ]['width'] == $image['width'] || // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
+						$media_image[ $id ]['height'] == $image['height'] // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 					) {
 						$media_image[ $id ]['size'] = $size;
 					}
diff --git a/projects/plugins/jetpack/modules/widgets/my-community.php b/projects/plugins/jetpack/modules/widgets/my-community.php
index c16baf21ccdc4..cbd515aad79bf 100644
--- a/projects/plugins/jetpack/modules/widgets/my-community.php
+++ b/projects/plugins/jetpack/modules/widgets/my-community.php
@@ -49,6 +49,19 @@ public function __construct() {
 		}
 
 		$this->default_title = esc_html__( 'Community', 'jetpack' );
+
+		add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget_in_block_editor' ) );
+	}
+
+	/**
+	 * Remove the "My Community" widget from the Legacy Widget block
+	 *
+	 * @param array $widget_types List of widgets that are currently removed from the Legacy Widget block.
+	 * @return array $widget_types New list of widgets that will be removed.
+	 */
+	public function hide_widget_in_block_editor( $widget_types ) {
+		$widget_types[] = 'jetpack_my_community';
+		return $widget_types;
 	}
 
 	/**
diff --git a/projects/plugins/jetpack/modules/widgets/top-posts.php b/projects/plugins/jetpack/modules/widgets/top-posts.php
index 4f3fe9120f803..04c4a2cb2d40b 100644
--- a/projects/plugins/jetpack/modules/widgets/top-posts.php
+++ b/projects/plugins/jetpack/modules/widgets/top-posts.php
@@ -765,7 +765,7 @@ public function get_posts( $post_ids, $count, $types = array( 'post', 'page' ) )
 			$posts[] = compact( 'title', 'permalink', 'post_id', 'post_type' );
 			$counter++;
 
-			if ( $counter == $count ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+			if ( $counter == $count ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 				break; // only need to load and show x number of likes.
 			}
 		}
diff --git a/projects/plugins/jetpack/modules/wordads/php/class-wordads-sidebar-widget.php b/projects/plugins/jetpack/modules/wordads/php/class-wordads-sidebar-widget.php
index 5d59737ad3123..226204d195b71 100644
--- a/projects/plugins/jetpack/modules/wordads/php/class-wordads-sidebar-widget.php
+++ b/projects/plugins/jetpack/modules/wordads/php/class-wordads-sidebar-widget.php
@@ -39,6 +39,20 @@ public function __construct() {
 				'customize_selective_refresh' => true,
 			)
 		);
+
+		add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget_in_block_editor' ) );
+	}
+
+	/**
+	 * Remove the Ad widget from the Legacy Widget block
+	 *
+	 * @param array $widget_types List of widgets that are currently removed from the Legacy Widget block.
+	 *
+	 * @return array $widget_types New list of widgets that will be removed.
+	 */
+	public function hide_widget_in_block_editor( $widget_types ) {
+		$widget_types[] = 'wordads_sidebar_widget';
+		return $widget_types;
 	}
 
 	/**
diff --git a/projects/plugins/jetpack/modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php b/projects/plugins/jetpack/modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php
index 6fc489678026b..ce29436d6c7a5 100644
--- a/projects/plugins/jetpack/modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php
+++ b/projects/plugins/jetpack/modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php
@@ -414,7 +414,7 @@ public function has_justified_block() {
 		global $post;
 		if ( ! $post instanceof WP_Post ) {
 			return false;
-		};
+		}
 
 		if ( ! has_blocks( $post ) ) {
 			return false;
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index 067abdde37f0e..07fd5cf64555e 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Jetpack",
-	"version": "10.6.0-a.4",
+	"version": "10.7.0-a.2",
 	"private": true,
 	"description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).",
 	"homepage": "https://jetpack.com",
@@ -48,30 +48,30 @@
 		"@automattic/calypso-color-schemes": "2.1.1",
 		"@automattic/components": "1.0.0-alpha.3",
 		"@automattic/format-currency": "1.0.0-alpha.0",
-		"@automattic/jetpack-analytics": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-api": "workspace:^0.8.3-alpha",
-		"@automattic/jetpack-components": "workspace:^0.10.3-alpha",
-		"@automattic/jetpack-connection": "workspace:^0.14.0-alpha",
-		"@automattic/jetpack-licensing": "workspace:^0.4.4-alpha",
-		"@automattic/jetpack-partner-coupon": "workspace:^0.1.6-alpha",
+		"@automattic/jetpack-analytics": "workspace:^0.1.7",
+		"@automattic/jetpack-api": "workspace:^0.8.4-alpha",
+		"@automattic/jetpack-components": "workspace:^0.10.5-alpha",
+		"@automattic/jetpack-connection": "workspace:^0.15.1-alpha",
+		"@automattic/jetpack-licensing": "workspace:^0.4.6-alpha",
+		"@automattic/jetpack-partner-coupon": "workspace:^0.1.8-alpha",
 		"@automattic/popup-monitor": "1.0.0",
 		"@automattic/request-external-access": "1.0.0",
 		"@automattic/social-previews": "1.1.1",
 		"@automattic/viewport": "1.0.0",
-		"@wordpress/annotations": "2.2.8",
-		"@wordpress/base-styles": "4.0.4",
-		"@wordpress/block-editor": "8.0.12",
-		"@wordpress/blocks": "11.1.5",
+		"@wordpress/annotations": "2.3.0",
+		"@wordpress/base-styles": "4.1.0",
+		"@wordpress/block-editor": "8.1.0",
+		"@wordpress/blocks": "11.2.0",
 		"@wordpress/browserslist-config": "4.1.0",
-		"@wordpress/compose": "5.0.7",
-		"@wordpress/data": "6.1.5",
-		"@wordpress/date": "4.2.3",
-		"@wordpress/element": "4.0.4",
-		"@wordpress/hooks": "3.2.2",
-		"@wordpress/i18n": "4.2.4",
-		"@wordpress/icons": "6.1.1",
-		"@wordpress/url": "3.3.1",
-		"@wordpress/viewport": "4.0.7",
+		"@wordpress/compose": "5.1.0",
+		"@wordpress/data": "6.2.0",
+		"@wordpress/date": "4.3.0",
+		"@wordpress/element": "4.1.0",
+		"@wordpress/hooks": "3.3.0",
+		"@wordpress/i18n": "4.3.0",
+		"@wordpress/icons": "6.2.0",
+		"@wordpress/url": "3.4.0",
+		"@wordpress/viewport": "4.1.0",
 		"bounding-client-rect": "1.0.5",
 		"classnames": "2.3.1",
 		"click-outside": "2.0.2",
@@ -135,9 +135,9 @@
 	},
 	"devDependencies": {
 		"@automattic/color-studio": "2.5.0",
-		"@automattic/jetpack-base-styles": "workspace:^0.1.7-alpha",
-		"@automattic/jetpack-webpack-config": "workspace:^1.0.3-alpha",
-		"@automattic/remove-asset-webpack-plugin": "workspace:^1.0.3-alpha",
+		"@automattic/jetpack-base-styles": "workspace:^0.1.8-alpha",
+		"@automattic/jetpack-webpack-config": "workspace:^1.1.2-alpha",
+		"@automattic/remove-asset-webpack-plugin": "workspace:^1.0.3",
 		"@babel/core": "7.16.0",
 		"@babel/plugin-proposal-nullish-coalescing-operator": "7.16.0",
 		"@babel/plugin-transform-react-jsx": "7.16.0",
@@ -155,11 +155,11 @@
 		"@testing-library/react-hooks": "4.0.1",
 		"@testing-library/user-event": "12.8.3",
 		"@wordpress/babel-plugin-import-jsx-pragma": "3.1.0",
-		"@wordpress/components": "19.1.6",
-		"@wordpress/core-data": "4.0.9",
-		"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
-		"@wordpress/editor": "12.0.15",
-		"@wordpress/server-side-render": "3.0.16",
+		"@wordpress/components": "19.3.0",
+		"@wordpress/core-data": "4.1.0",
+		"@wordpress/dependency-extraction-webpack-plugin": "3.3.0",
+		"@wordpress/editor": "12.1.0",
+		"@wordpress/server-side-render": "3.1.0",
 		"chai": "4.3.4",
 		"chalk": "4.1.2",
 		"commander": "7.2.0",
@@ -167,7 +167,7 @@
 		"css-loader": "6.5.1",
 		"enzyme": "3.11.0",
 		"enzyme-to-json": "3.6.2",
-		"eslint": "7.32.0",
+		"eslint": "8.8.0",
 		"fs-extra": "10.0.0",
 		"glob": "7.1.6",
 		"jest": "27.3.1",
diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt
index 93be0528b2318..e1e3e8c897e48 100644
--- a/projects/plugins/jetpack/readme.txt
+++ b/projects/plugins/jetpack/readme.txt
@@ -1,7 +1,7 @@
 === Jetpack - WP Security, Backup, Speed, & Growth ===
 Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav, alternatekev, andy, annamcphee, annezazu, apeatling, arcangelini, azaozz, batmoo, barry, beaulebens, biskobe, blobaugh, bjorsch, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, samiff, scarstocea, scottsweb, sdixon194, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, yoavf, zinigor
 Tags: Security, backup, Woo, malware, scan, spam, CDN, search, social
-Stable tag: 10.5
+Stable tag: 10.6
 Requires at least: 5.8
 Requires PHP: 5.6
 Tested up to: 5.9
@@ -242,12 +242,21 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file
 4. Promote your newest posts, pages, and products across your social media channels.
 
 == Changelog ==
-### 10.6-a.3 - 2022-01-18
+### 10.7-a.1 - 2022-02-02
 #### Enhancements
-- Embeds: add support for Descript.com embeds.
-- Image Compare Block: Add `wide` and `full` alignment options
-- Pay with PayPal Block: do not display the block on the frontend if PayPal is misconfigured.
-- Stats: add new filter allowing site owners to exclude IP addresses from being tracked in stats.
+- Add an AMP-compatible version of the email share button.
+- Add transformation from core/buttons to jetpack/recurring-payments block (requires gutenberg >= 11.5.0).
+- Business Hours: Add support for color & spacing design tool.
+- Changed the plan description for invalid plans and added a Warning message for Premium content blocks with invalid plans.
+- Dashboard: update the links used to purchase plans when in Jetpack settings.
+
+#### Improved compatibility
+- My Community widget: Hide widget from the block inserter and Legacy widget block drop-down menu
+
+#### Bug fixes
+- Fixed several React warnings shown on the console when SCRIPT_DEBUG is active
+- Search: avoid PHP warning when using Search widget.
+- Widget Visibility: ensure role and logged in features are available.
 
 --------
 
diff --git a/projects/plugins/jetpack/tests/e2e/package.json b/projects/plugins/jetpack/tests/e2e/package.json
index e684330d8d2e4..973d94d267d37 100644
--- a/projects/plugins/jetpack/tests/e2e/package.json
+++ b/projects/plugins/jetpack/tests/e2e/package.json
@@ -14,17 +14,19 @@
 	"license": "GPL-2.0-or-later",
 	"author": "Automattic",
 	"scripts": {
+		"build": "pnpx jetpack build packages/search plugins/jetpack -v --no-pnpm-install --production",
 		"clean": "rm -rf output",
+		"config:decrypt": "pnpm test-decrypt-default-config && pnpm test-decrypt-config",
 		"distclean": "rm -rf node_modules",
-		"env-start": "e2e-env start",
-		"env-stop": "e2e-env stop",
-		"env-reset": "e2e-env reset",
-		"tunnel-on": "tunnel up",
-		"tunnel-reset": "tunnel reset",
-		"tunnel-off": "tunnel down",
-		"tunnel-write-logs": "tunnel logs output/logs/tunnel.log",
+		"env:up": "e2e-env start",
+		"env:down": "e2e-env stop",
+		"env:reset": "e2e-env reset",
+		"tunnel:up": "tunnel up",
+		"tunnel:reset": "tunnel reset",
+		"tunnel:down": "tunnel down",
+		"tunnel:write-logs": "tunnel logs output/logs/tunnel.log",
 		"pretest-e2e": "pnpm run clean",
-		"test-e2e": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results playwright test --config=playwright.config.cjs",
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results playwright test --config=playwright.config.cjs",
 		"test-decrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./node_modules/jetpack-e2e-commons/config/local.cjs",
 		"test-decrypt-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./config/encrypted.enc -out config/local.cjs",
 		"test-decrypt-all-config": "pnpm test-decrypt-default-config && pnpm test-decrypt-config",
@@ -35,11 +37,11 @@
 	},
 	"devDependencies": {
 		"@playwright/test": "1.17.1",
-		"@wordpress/eslint-plugin": "9.3.0",
+		"@wordpress/eslint-plugin": "10.0.0",
 		"allure-playwright": "2.0.0-beta.14",
 		"config": "3.3.6",
-		"eslint": "7.32.0",
-		"eslint-plugin-playwright": "0.6.0",
+		"eslint": "8.8.0",
+		"eslint-plugin-playwright": "0.8.0",
 		"jetpack-cli": "link:../../../../../tools/cli",
 		"jetpack-e2e-commons": "link:../../../../../tools/e2e-commons"
 	},
@@ -48,5 +50,8 @@
 		"pnpm": "^6.23.6",
 		"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
 	},
-	"browserslist": []
+	"browserslist": [],
+	"ci": {
+		"targets": []
+	}
 }
diff --git a/projects/plugins/jetpack/tests/e2e/pnpm-lock.yaml b/projects/plugins/jetpack/tests/e2e/pnpm-lock.yaml
index a0efa3f32e8e5..d29a68b87920c 100644
--- a/projects/plugins/jetpack/tests/e2e/pnpm-lock.yaml
+++ b/projects/plugins/jetpack/tests/e2e/pnpm-lock.yaml
@@ -5,36 +5,37 @@ importers:
   .:
     specifiers:
       '@playwright/test': 1.17.1
-      '@wordpress/eslint-plugin': 9.3.0
+      '@wordpress/eslint-plugin': 10.0.0
       allure-playwright: 2.0.0-beta.14
       config: 3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.6.0
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0
       jetpack-cli: link:../../../../../tools/cli
       jetpack-e2e-commons: link:../../../../../tools/e2e-commons
     devDependencies:
       '@playwright/test': 1.17.1
-      '@wordpress/eslint-plugin': 9.3.0_eslint@7.32.0
+      '@wordpress/eslint-plugin': 10.0.0_eslint@8.8.0
       allure-playwright: 2.0.0-beta.14
       config: 3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.6.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0_eslint@8.8.0
       jetpack-cli: link:../../../../../tools/cli
       jetpack-e2e-commons: link:../../../../../tools/e2e-commons
 
 packages:
 
-  /@babel/code-frame/7.12.11:
-    resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
+  /@babel/code-frame/7.16.0:
+    resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==}
+    engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.16.0
     dev: true
 
-  /@babel/code-frame/7.16.0:
-    resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==}
+  /@babel/code-frame/7.16.7:
+    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.16.0
+      '@babel/highlight': 7.16.10
     dev: true
 
   /@babel/compat-data/7.16.0:
@@ -42,6 +43,11 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/compat-data/7.16.8:
+    resolution: {integrity: sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/core/7.16.0:
     resolution: {integrity: sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==}
     engines: {node: '>=6.9.0'}
@@ -65,14 +71,14 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/eslint-parser/7.16.5_eslint@7.32.0:
+  /@babel/eslint-parser/7.16.5_eslint@8.8.0:
     resolution: {integrity: sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
       '@babel/core': '>=7.11.0'
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-scope: 5.1.1
       eslint-visitor-keys: 2.1.0
       semver: 6.3.0
@@ -87,6 +93,15 @@ packages:
       source-map: 0.5.7
     dev: true
 
+  /@babel/generator/7.16.8:
+    resolution: {integrity: sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+      jsesc: 2.5.2
+      source-map: 0.5.7
+    dev: true
+
   /@babel/helper-annotate-as-pure/7.16.0:
     resolution: {integrity: sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==}
     engines: {node: '>=6.9.0'}
@@ -94,6 +109,21 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-annotate-as-pure/7.16.7:
+    resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
+    resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-explode-assignable-expression': 7.16.7
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-compilation-targets/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==}
     engines: {node: '>=6.9.0'}
@@ -107,6 +137,19 @@ packages:
       semver: 6.3.0
     dev: true
 
+  /@babel/helper-compilation-targets/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.0
+      '@babel/helper-validator-option': 7.16.7
+      browserslist: 4.17.6
+      semver: 6.3.0
+    dev: true
+
   /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==}
     engines: {node: '>=6.9.0'}
@@ -124,6 +167,67 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-create-class-features-plugin/7.16.10_@babel+core@7.16.0:
+    resolution: {integrity: sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-create-regexp-features-plugin/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      regexpu-core: 4.8.0
+    dev: true
+
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/traverse': 7.16.0
+      debug: 4.3.3
+      lodash.debounce: 4.0.8
+      resolve: 1.20.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-environment-visitor/7.16.7:
+    resolution: {integrity: sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-explode-assignable-expression/7.16.7:
+    resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-function-name/7.16.0:
     resolution: {integrity: sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==}
     engines: {node: '>=6.9.0'}
@@ -133,6 +237,15 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-function-name/7.16.7:
+    resolution: {integrity: sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-get-function-arity': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-get-function-arity/7.16.0:
     resolution: {integrity: sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==}
     engines: {node: '>=6.9.0'}
@@ -140,6 +253,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-get-function-arity/7.16.7:
+    resolution: {integrity: sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-hoist-variables/7.16.0:
     resolution: {integrity: sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==}
     engines: {node: '>=6.9.0'}
@@ -147,6 +267,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-hoist-variables/7.16.7:
+    resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-member-expression-to-functions/7.16.0:
     resolution: {integrity: sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==}
     engines: {node: '>=6.9.0'}
@@ -154,6 +281,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-member-expression-to-functions/7.16.7:
+    resolution: {integrity: sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-module-imports/7.16.0:
     resolution: {integrity: sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==}
     engines: {node: '>=6.9.0'}
@@ -161,6 +295,13 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/helper-module-imports/7.16.7:
+    resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-module-transforms/7.16.0:
     resolution: {integrity: sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==}
     engines: {node: '>=6.9.0'}
@@ -177,334 +318,1170 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-module-transforms/7.16.7:
+    resolution: {integrity: sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-optimise-call-expression/7.16.0:
     resolution: {integrity: sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.16.0
+      '@babel/types': 7.16.0
+    dev: true
+
+  /@babel/helper-optimise-call-expression/7.16.7:
+    resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-plugin-utils/7.14.5:
+    resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-plugin-utils/7.16.7:
+    resolution: {integrity: sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-remap-async-to-generator/7.16.8:
+    resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-wrap-function': 7.16.8
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-replace-supers/7.16.0:
+    resolution: {integrity: sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-member-expression-to-functions': 7.16.0
+      '@babel/helper-optimise-call-expression': 7.16.0
+      '@babel/traverse': 7.16.0
+      '@babel/types': 7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-replace-supers/7.16.7:
+    resolution: {integrity: sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-simple-access/7.16.0:
+    resolution: {integrity: sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.0
+    dev: true
+
+  /@babel/helper-simple-access/7.16.7:
+    resolution: {integrity: sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
+    resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.0
+    dev: true
+
+  /@babel/helper-split-export-declaration/7.16.0:
+    resolution: {integrity: sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.0
+    dev: true
+
+  /@babel/helper-split-export-declaration/7.16.7:
+    resolution: {integrity: sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
+  /@babel/helper-validator-identifier/7.15.7:
+    resolution: {integrity: sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-identifier/7.16.7:
+    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-option/7.14.5:
+    resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-validator-option/7.16.7:
+    resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-wrap-function/7.16.8:
+    resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-function-name': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helpers/7.16.0:
+    resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.16.0
+      '@babel/traverse': 7.16.0
+      '@babel/types': 7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/highlight/7.16.0:
+    resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.15.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+    dev: true
+
+  /@babel/highlight/7.16.10:
+    resolution: {integrity: sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+    dev: true
+
+  /@babel/parser/7.16.12:
+    resolution: {integrity: sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dev: true
+
+  /@babel/parser/7.16.2:
+    resolution: {integrity: sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dev: true
+
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-async-generator-functions/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-dynamic-import/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-export-namespace-from/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-export-namespace-from/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-json-strings/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-logical-assignment-operators/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-object-rest-spread/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-chaining/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.16.11_@babel+core@7.16.0:
+    resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-property-in-object/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-property-in-object/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-unicode-property-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.16.0:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.14.5
+    dev: true
+
+  /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-async-to-generator/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-plugin-utils/7.14.5:
-    resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==}
+  /@babel/plugin-transform-block-scoping/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-replace-supers/7.16.0:
-    resolution: {integrity: sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==}
+  /@babel/plugin-transform-classes/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/helper-member-expression-to-functions': 7.16.0
-      '@babel/helper-optimise-call-expression': 7.16.0
-      '@babel/traverse': 7.16.0
-      '@babel/types': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/helper-simple-access/7.16.0:
-    resolution: {integrity: sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==}
+  /@babel/plugin-transform-computed-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/types': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
-    resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
+  /@babel/plugin-transform-destructuring/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/types': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-split-export-declaration/7.16.0:
-    resolution: {integrity: sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==}
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/types': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-validator-identifier/7.15.7:
-    resolution: {integrity: sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==}
+  /@babel/plugin-transform-duplicate-keys/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helper-validator-option/7.14.5:
-    resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==}
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/helpers/7.16.0:
-    resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==}
+  /@babel/plugin-transform-for-of/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/template': 7.16.0
-      '@babel/traverse': 7.16.0
-      '@babel/types': 7.16.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/highlight/7.16.0:
-    resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==}
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/helper-validator-identifier': 7.15.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/parser/7.16.2:
-    resolution: {integrity: sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-proposal-class-properties/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A==}
+  /@babel/plugin-transform-modules-amd/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ==}
+  /@babel/plugin-transform-modules-commonjs/7.16.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
+      '@babel/helper-module-transforms': 7.16.0
       '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-simple-access': 7.16.0
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA==}
+  /@babel/plugin-transform-modules-commonjs/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q==}
+  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ==}
+  /@babel/plugin-transform-modules-umd/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q==}
+  /@babel/plugin-transform-named-capturing-groups-regex/7.16.8_@babel+core@7.16.0:
+    resolution: {integrity: sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg==}
+  /@babel/plugin-transform-new-target/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-proposal-private-methods/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg==}
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw==}
+  /@babel/plugin-transform-parameters/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-annotate-as-pure': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+  /@babel/plugin-transform-react-jsx/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.16.0
+      '@babel/types': 7.16.8
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+  /@babel/plugin-transform-regenerator/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      regenerator-transform: 0.14.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+  /@babel/plugin-transform-reserved-words/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+  /@babel/plugin-transform-runtime/7.16.10_@babel+core@7.16.0:
+    resolution: {integrity: sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.0
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.0:
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+  /@babel/plugin-transform-spread/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+  /@babel/plugin-transform-template-literals/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.0:
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+  /@babel/plugin-transform-typeof-symbol/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.16.0:
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+  /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
+      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
       '@babel/helper-plugin-utils': 7.14.5
+      '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==}
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs/7.16.0_@babel+core@7.16.0:
-    resolution: {integrity: sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ==}
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.16.0:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.0
-      '@babel/helper-module-transforms': 7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/helper-simple-access': 7.16.0
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0:
-    resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==}
+  /@babel/preset-env/7.16.11_@babel+core@7.16.0:
+    resolution: {integrity: sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
+      '@babel/compat-data': 7.16.8
       '@babel/core': 7.16.0
-      '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0
-      '@babel/helper-plugin-utils': 7.14.5
-      '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-async-generator-functions': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-class-static-block': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-json-strings': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-logical-assignment-operators': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-private-methods': 7.16.11_@babel+core@7.16.0
+      '@babel/plugin-proposal-private-property-in-object': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.0
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.0
+      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-async-to-generator': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-computed-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-duplicate-keys': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-amd': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-commonjs': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-systemjs': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-modules-umd': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.16.8_@babel+core@7.16.0
+      '@babel/plugin-transform-new-target': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-regenerator': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-reserved-words': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-typeof-symbol': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/preset-modules': 0.1.5_@babel+core@7.16.0
+      '@babel/types': 7.16.8
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.0
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.0
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.0
+      core-js-compat: 3.21.0
+      semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/preset-modules/0.1.5_@babel+core@7.16.0:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.0
+      '@babel/types': 7.16.8
+      esutils: 2.0.3
+    dev: true
+
   /@babel/preset-typescript/7.16.0_@babel+core@7.16.0:
     resolution: {integrity: sha512-txegdrZYgO9DlPbv+9QOVpMnKbOtezsLHWsnsRF4AjbSIsVaujrq1qg8HK0mxQpWv0jnejt0yEoW1uWpvbrDTg==}
     engines: {node: '>=6.9.0'}
@@ -527,8 +1504,8 @@ packages:
       regenerator-runtime: 0.13.9
     dev: true
 
-  /@babel/runtime/7.15.4:
-    resolution: {integrity: sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==}
+  /@babel/runtime/7.16.7:
+    resolution: {integrity: sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.9
@@ -543,6 +1520,15 @@ packages:
       '@babel/types': 7.16.0
     dev: true
 
+  /@babel/template/7.16.7:
+    resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/parser': 7.16.12
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/traverse/7.16.0:
     resolution: {integrity: sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==}
     engines: {node: '>=6.9.0'}
@@ -560,6 +1546,24 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/traverse/7.16.10:
+    resolution: {integrity: sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.16.8
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.16.12
+      '@babel/types': 7.16.8
+      debug: 4.3.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/types/7.16.0:
     resolution: {integrity: sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==}
     engines: {node: '>=6.9.0'}
@@ -568,34 +1572,42 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@es-joy/jsdoccomment/0.10.8:
-    resolution: {integrity: sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /@babel/types/7.16.8:
+    resolution: {integrity: sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@es-joy/jsdoccomment/0.18.0:
+    resolution: {integrity: sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     dependencies:
-      comment-parser: 1.2.4
+      comment-parser: 1.3.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.1.1
+      jsdoc-type-pratt-parser: 2.2.2
     dev: true
 
-  /@eslint/eslintrc/0.4.3:
-    resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@eslint/eslintrc/1.0.5:
+    resolution: {integrity: sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.2
-      espree: 7.3.1
+      espree: 9.3.0
       globals: 13.11.0
       ignore: 4.0.6
       import-fresh: 3.3.0
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       minimatch: 3.0.4
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.5.0:
-    resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==}
+  /@humanwhocodes/config-array/0.9.3:
+    resolution: {integrity: sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -715,8 +1727,30 @@ packages:
     resolution: {integrity: sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ==}
     dev: true
 
-  /@types/parse-json/4.0.0:
-    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
+  /@types/parse-json/4.0.0:
+    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
+    dev: true
+
+  /@types/prop-types/15.7.4:
+    resolution: {integrity: sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==}
+    dev: true
+
+  /@types/react-dom/17.0.11:
+    resolution: {integrity: sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==}
+    dependencies:
+      '@types/react': 17.0.38
+    dev: true
+
+  /@types/react/17.0.38:
+    resolution: {integrity: sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==}
+    dependencies:
+      '@types/prop-types': 15.7.4
+      '@types/scheduler': 0.16.2
+      csstype: 3.0.10
+    dev: true
+
+  /@types/scheduler/0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
     dev: true
 
   /@types/stack-utils/2.0.1:
@@ -741,24 +1775,25 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/4.32.0_c0c51a98346cfcd308734c3d67c99cd7:
-    resolution: {integrity: sha512-+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/eslint-plugin/5.10.2_0d682450f1ef58680b7f0316f2e82e26:
+    resolution: {integrity: sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^4.0.0
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.32.0_eslint@7.32.0
-      '@typescript-eslint/parser': 4.32.0_eslint@7.32.0
-      '@typescript-eslint/scope-manager': 4.32.0
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/type-utils': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
       debug: 4.3.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       functional-red-black-tree: 1.0.1
-      ignore: 5.1.8
+      ignore: 5.2.0
       regexpp: 3.2.0
       semver: 7.3.5
       tsutils: 3.21.0
@@ -766,67 +1801,80 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/4.32.0_eslint@7.32.0:
-    resolution: {integrity: sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/experimental-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-stRnIlxDduzxtaVLtEohESoXI1k7J6jvJHGyIkOT2pvXbg5whPM6f9tzJ51bJJxaJTdmvwgVFDNCopFRb2F5Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 4.32.0
-      '@typescript-eslint/types': 4.32.0
-      '@typescript-eslint/typescript-estree': 4.32.0
-      eslint: 7.32.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@7.32.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/parser/4.32.0_eslint@7.32.0:
-    resolution: {integrity: sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/parser/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.32.0
-      '@typescript-eslint/types': 4.32.0
-      '@typescript-eslint/typescript-estree': 4.32.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
       debug: 4.3.2
-      eslint: 7.32.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/4.32.0:
-    resolution: {integrity: sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/scope-manager/5.10.2:
+    resolution: {integrity: sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
+    dev: true
+
+  /@typescript-eslint/type-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      '@typescript-eslint/types': 4.32.0
-      '@typescript-eslint/visitor-keys': 4.32.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      debug: 4.3.2
+      eslint: 8.8.0
+      tsutils: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@typescript-eslint/types/4.32.0:
-    resolution: {integrity: sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/types/5.10.2:
+    resolution: {integrity: sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/4.32.0:
-    resolution: {integrity: sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/typescript-estree/5.10.2:
+    resolution: {integrity: sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.32.0
-      '@typescript-eslint/visitor-keys': 4.32.0
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
       debug: 4.3.2
       globby: 11.0.4
       is-glob: 4.0.3
@@ -836,43 +1884,117 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/visitor-keys/4.32.0:
-    resolution: {integrity: sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@typescript-eslint/types': 4.32.0
-      eslint-visitor-keys: 2.1.0
+      '@types/json-schema': 7.0.9
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      eslint: 8.8.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.8.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.10.2:
+    resolution: {integrity: sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      eslint-visitor-keys: 3.2.0
+    dev: true
+
+  /@wordpress/babel-plugin-import-jsx-pragma/3.1.0_@babel+core@7.16.0:
+    resolution: {integrity: sha512-518mL3goaSeXtJCQcPK9OYHUUiA0sjXuoGWHBwRalkyTIQZZy5ZZzlwrlSc9ESZcOw9BZ+Uo8CJRjV2OWnx+Zw==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@babel/core': ^7.12.9
+    dependencies:
+      '@babel/core': 7.16.0
+    dev: true
+
+  /@wordpress/babel-preset-default/6.5.0:
+    resolution: {integrity: sha512-F2bv78gNz8FsSP88tEabNffiynvwgepcfustDCbhXXWZoMQoTmyu+jj1h7sjriH+9lIUmfcJifKy+QstCR1Y4w==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.0
+      '@babel/plugin-transform-runtime': 7.16.10_@babel+core@7.16.0
+      '@babel/preset-env': 7.16.11_@babel+core@7.16.0
+      '@babel/preset-typescript': 7.16.0_@babel+core@7.16.0
+      '@babel/runtime': 7.16.7
+      '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.0
+      '@wordpress/browserslist-config': 4.1.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/warning': 2.3.0
+      browserslist: 4.17.6
+      core-js: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@wordpress/browserslist-config/4.1.0:
+    resolution: {integrity: sha512-RSJhgY2xmz6yAdDNhz/NvAO6JS+91vv9cVL7VDG2CftbyjTXBef05vWt3FzZhfeF0xUrYdpZL1PVpxmJiKvbEg==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /@wordpress/element/4.1.0:
+    resolution: {integrity: sha512-Q63OGOExHthL1TGJOaQKYXr2vEvkIk3jBlcMuPuY/6JhKx3h0G6GDE3J0mc9HQyydkv6XWDyATWjfP5naMjM/Q==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/runtime': 7.16.7
+      '@types/react': 17.0.38
+      '@types/react-dom': 17.0.11
+      '@wordpress/escape-html': 2.3.0
+      lodash: 4.17.21
+      react: 17.0.2
+      react-dom: 17.0.2_react@17.0.2
+    dev: true
+
+  /@wordpress/escape-html/2.3.0:
+    resolution: {integrity: sha512-QD5uid5Le3sZkKGKiXcudQKILxrSEeGltYVyQoNwbeBIhUE19DW7J0S1zqKkaaHks0jEERPIfzNThiyUh1IrVg==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/runtime': 7.16.7
     dev: true
 
-  /@wordpress/eslint-plugin/9.3.0_eslint@7.32.0:
-    resolution: {integrity: sha512-9F7B60gHAjiTIi9vBw5ZoH0MZW3UnmbuKols4kWpJVdgsvG4X1Wj6XXTLmQKrzh/Em7mD1CCIbCSyWknEzIOLw==}
+  /@wordpress/eslint-plugin/10.0.0_eslint@8.8.0:
+    resolution: {integrity: sha512-OMPyXLwjvnDio/f1l2+FkwwtNO2hpHkTdJe8D1ie5QpUFQgVz7n59w9USMxdJ/XR2eDDLjVv1alwXEow1go+mg==}
     engines: {node: '>=12', npm: '>=6.9'}
     peerDependencies:
-      eslint: ^6 || ^7
-      typescript: ^4
+      '@babel/core': '>=7'
+      eslint: '>=8'
+      typescript: '>=4'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@babel/eslint-parser': 7.16.5_eslint@7.32.0
-      '@typescript-eslint/eslint-plugin': 4.32.0_c0c51a98346cfcd308734c3d67c99cd7
-      '@typescript-eslint/parser': 4.32.0_eslint@7.32.0
+      '@babel/eslint-parser': 7.16.5_eslint@8.8.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@wordpress/babel-preset-default': 6.5.0
       '@wordpress/prettier-config': 1.1.1
       cosmiconfig: 7.0.1
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
-      eslint-plugin-import: 2.25.3_eslint@7.32.0
-      eslint-plugin-jest: 24.5.2_37930615a55c95ca66af58dc02d0e2ef
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-jsx-a11y: 6.4.1_eslint@7.32.0
-      eslint-plugin-prettier: 3.4.1_34b707f3a53b0942f3919c1ff656ce36
-      eslint-plugin-react: 7.26.1_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.2.0_eslint@7.32.0
-      globals: 12.4.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
+      eslint-plugin-import: 2.25.3_eslint@8.8.0
+      eslint-plugin-jest: 25.7.0_2710175b8e1738b8f39f06cfa9aa7159
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.8.0
+      eslint-plugin-prettier: 3.4.1_5208900944bd53d50aafd0e7d193e6c3
+      eslint-plugin-react: 7.28.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      globals: 13.12.0
       prettier: /wp-prettier/2.2.1-beta-1
       requireindex: 1.2.0
     transitivePeerDependencies:
-      - '@babel/core'
+      - jest
       - supports-color
     dev: true
 
@@ -881,16 +2003,21 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@7.4.1:
+  /@wordpress/warning/2.3.0:
+    resolution: {integrity: sha512-Is6uEp2wvUPTK1+RtQQdzTdb93BDMAJEYE5UCHvoSFCWpxvEhBP6SY+Nzv/MkFKHZwY66QxEAduThxfINma87Q==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 7.4.1
+      acorn: 8.7.0
     dev: true
 
-  /acorn/7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+  /acorn/8.7.0:
+    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -913,15 +2040,6 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ajv/8.8.2:
-    resolution: {integrity: sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-    dev: true
-
   /allure-js-commons/2.0.0-beta.14:
     resolution: {integrity: sha512-5OlMp8kdc5FuxkquOV1ZXxJCAmFUwHnI5OqL2IlhJ65NKBeABpMwro6BbhlJqcV8iPQmh1w9bErTICSeB+Hj2A==}
     dependencies:
@@ -936,11 +2054,6 @@ packages:
       allure-js-commons: 2.0.0-beta.14
     dev: true
 
-  /ansi-colors/4.1.1:
-    resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /ansi-regex/5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -965,17 +2078,15 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /argparse/1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
-    dependencies:
-      sprintf-js: 1.0.3
+  /argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
   /aria-query/4.2.2:
     resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
     engines: {node: '>=6.0'}
     dependencies:
-      '@babel/runtime': 7.15.4
+      '@babel/runtime': 7.16.7
       '@babel/runtime-corejs3': 7.15.4
     dev: true
 
@@ -1017,13 +2128,8 @@ packages:
     resolution: {integrity: sha1-9wtzXGvKGlycItmCw+Oef+ujva0=}
     dev: true
 
-  /astral-regex/2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /axe-core/4.3.3:
-    resolution: {integrity: sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==}
+  /axe-core/4.4.0:
+    resolution: {integrity: sha512-btWy2rze3NnxSSxb7LtNhPYYFrRoFBfjiGzmSc/5Hu47wApO2KNXjP/w7Nv2Uz/Fyr/pfEiwOkcXhDxu0jz5FA==}
     engines: {node: '>=4'}
     dev: true
 
@@ -1037,6 +2143,42 @@ packages:
       object.assign: 4.1.2
     dev: true
 
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.0
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-corejs3/0.5.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+      core-js-compat: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.16.0:
+    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.0
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -1067,6 +2209,18 @@ packages:
       picocolors: 1.0.0
     dev: true
 
+  /browserslist/4.19.1:
+    resolution: {integrity: sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+    dependencies:
+      caniuse-lite: 1.0.30001304
+      electron-to-chromium: 1.4.59
+      escalade: 3.1.1
+      node-releases: 2.0.1
+      picocolors: 1.0.0
+    dev: true
+
   /buffer-crc32/0.2.13:
     resolution: {integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=}
     dev: true
@@ -1087,6 +2241,10 @@ packages:
     resolution: {integrity: sha512-psUNoaG1ilknZPxi8HuhQWobuhLqtYSRUxplfVkEJdgZNB9TETVYGSBtv4YyfAdGvE6gn2eb0ztiXqHoWJcGnw==}
     dev: true
 
+  /caniuse-lite/1.0.30001304:
+    resolution: {integrity: sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==}
+    dev: true
+
   /chalk/2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -1135,8 +2293,8 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /comment-parser/1.2.4:
-    resolution: {integrity: sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==}
+  /comment-parser/1.3.0:
+    resolution: {integrity: sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==}
     engines: {node: '>= 12.0.0'}
     dev: true
 
@@ -1157,11 +2315,23 @@ packages:
       safe-buffer: 5.1.2
     dev: true
 
+  /core-js-compat/3.21.0:
+    resolution: {integrity: sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==}
+    dependencies:
+      browserslist: 4.19.1
+      semver: 7.0.0
+    dev: true
+
   /core-js-pure/3.18.1:
     resolution: {integrity: sha512-kmW/k8MaSuqpvA1xm2l3TVlBuvW+XBkcaOroFUpO3D4lsTGQWBTb/tBDCf/PNkkPLrwgrkQRIYNPB0CeqGJWGQ==}
     requiresBuild: true
     dev: true
 
+  /core-js/3.21.0:
+    resolution: {integrity: sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==}
+    requiresBuild: true
+    dev: true
+
   /cosmiconfig/7.0.1:
     resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
     engines: {node: '>=10'}
@@ -1182,6 +2352,10 @@ packages:
       which: 2.0.2
     dev: true
 
+  /csstype/3.0.10:
+    resolution: {integrity: sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==}
+    dev: true
+
   /damerau-levenshtein/1.0.7:
     resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
     dev: true
@@ -1210,6 +2384,18 @@ packages:
       ms: 2.1.2
     dev: true
 
+  /debug/4.3.3:
+    resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+    dev: true
+
   /deep-is/0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
@@ -1256,8 +2442,8 @@ packages:
     resolution: {integrity: sha512-5iD1zgyPpFER4kJ716VsA4MxQ6x405dxdFNCEK2mITL075VHO5ResjY0xzQUZguCww/KlBxCA6JmBA9sDt1PRw==}
     dev: true
 
-  /emoji-regex/8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+  /electron-to-chromium/1.4.59:
+    resolution: {integrity: sha512-AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg==}
     dev: true
 
   /emoji-regex/9.2.2:
@@ -1270,13 +2456,6 @@ packages:
       once: 1.4.0
     dev: true
 
-  /enquirer/2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
-    engines: {node: '>=8.6'}
-    dependencies:
-      ansi-colors: 4.1.1
-    dev: true
-
   /error-ex/1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -1338,13 +2517,13 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-config-prettier/7.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==}
+  /eslint-config-prettier/8.3.0_eslint@8.8.0:
+    resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
   /eslint-import-resolver-node/0.3.6:
@@ -1363,7 +2542,7 @@ packages:
       pkg-dir: 2.0.0
     dev: true
 
-  /eslint-plugin-import/2.25.3_eslint@7.32.0:
+  /eslint-plugin-import/2.25.3_eslint@8.8.0:
     resolution: {integrity: sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -1373,7 +2552,7 @@ packages:
       array.prototype.flat: 1.2.5
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.1
       has: 1.0.3
@@ -1385,37 +2564,39 @@ packages:
       tsconfig-paths: 3.11.0
     dev: true
 
-  /eslint-plugin-jest/24.5.2_37930615a55c95ca66af58dc02d0e2ef:
-    resolution: {integrity: sha512-lrI3sGAyZi513RRmP08sIW241Ti/zMnn/6wbE4ZBhb3M2pJ9ztaZMnSKSKKBUfotVdwqU8W1KtD8ao2/FR8DIg==}
-    engines: {node: '>=10'}
+  /eslint-plugin-jest/25.7.0_2710175b8e1738b8f39f06cfa9aa7159:
+    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 4'
-      eslint: '>=5'
+      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
+      jest:
+        optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 4.32.0_c0c51a98346cfcd308734c3d67c99cd7
-      '@typescript-eslint/experimental-utils': 4.32.0_eslint@7.32.0
-      eslint: 7.32.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/experimental-utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jsdoc/36.1.1_eslint@7.32.0:
-    resolution: {integrity: sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /eslint-plugin-jsdoc/37.7.0_eslint@8.8.0:
+    resolution: {integrity: sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@es-joy/jsdoccomment': 0.10.8
-      comment-parser: 1.2.4
-      debug: 4.3.2
-      eslint: 7.32.0
+      '@es-joy/jsdoccomment': 0.18.0
+      comment-parser: 1.3.0
+      debug: 4.3.3
+      escape-string-regexp: 4.0.0
+      eslint: 8.8.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.2.0
-      lodash: 4.17.21
       regextras: 0.8.0
       semver: 7.3.5
       spdx-expression-parse: 3.0.1
@@ -1423,28 +2604,29 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.4.1_eslint@7.32.0:
-    resolution: {integrity: sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==}
+  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.8.0:
+    resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      '@babel/runtime': 7.15.4
+      '@babel/runtime': 7.16.7
       aria-query: 4.2.2
       array-includes: 3.1.4
       ast-types-flow: 0.0.7
-      axe-core: 4.3.3
+      axe-core: 4.4.0
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.7
       emoji-regex: 9.2.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       has: 1.0.3
       jsx-ast-utils: 3.2.1
       language-tags: 1.0.5
+      minimatch: 3.0.4
     dev: true
 
-  /eslint-plugin-playwright/0.6.0_eslint@7.32.0:
-    resolution: {integrity: sha512-hccbDZcGcRAkfVa2omeTd/PCPjhjo8roZWVANYB8qBv2EGGjFNIGKkN3jzHjYQytgp5K4FKyBn/dgujPpFynjA==}
+  /eslint-plugin-playwright/0.8.0_eslint@8.8.0:
+    resolution: {integrity: sha512-9uJH25m6H3jwU5O7bHD5M8cLx46L72EnIUe3dZqTox6M+WzOFzeUWaDJHHCdLGXZ8XlAU4mbCZnP7uhjKepfRA==}
     peerDependencies:
       eslint: '>=7'
       eslint-plugin-jest: '>=24'
@@ -1452,10 +2634,10 @@ packages:
       eslint-plugin-jest:
         optional: true
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-prettier/3.4.1_34b707f3a53b0942f3919c1ff656ce36:
+  /eslint-plugin-prettier/3.4.1_5208900944bd53d50aafd0e7d193e6c3:
     resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -1466,32 +2648,32 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
       prettier: /wp-prettier/2.2.1-beta-1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==}
+  /eslint-plugin-react-hooks/4.3.0_eslint@8.8.0:
+    resolution: {integrity: sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==}
     engines: {node: '>=10'}
     peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-react/7.26.1_eslint@7.32.0:
-    resolution: {integrity: sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ==}
+  /eslint-plugin-react/7.28.0_eslint@8.8.0:
+    resolution: {integrity: sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==}
     engines: {node: '>=4'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
       array-includes: 3.1.4
       array.prototype.flatmap: 1.2.5
       doctrine: 2.1.0
-      eslint: 7.32.0
-      estraverse: 5.2.0
+      eslint: 8.8.0
+      estraverse: 5.3.0
       jsx-ast-utils: 3.2.1
       minimatch: 3.0.4
       object.entries: 1.1.5
@@ -1501,7 +2683,7 @@ packages:
       prop-types: 15.7.2
       resolve: 2.0.0-next.3
       semver: 6.3.0
-      string.prototype.matchall: 4.0.5
+      string.prototype.matchall: 4.0.6
     dev: true
 
   /eslint-scope/5.1.1:
@@ -1512,95 +2694,85 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-utils/2.1.0:
-    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
-    engines: {node: '>=6'}
+  /eslint-scope/7.1.0:
+    resolution: {integrity: sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      eslint-visitor-keys: 1.3.0
+      esrecurse: 4.3.0
+      estraverse: 5.2.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@7.32.0:
+  /eslint-utils/3.0.0_eslint@8.8.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/1.3.0:
-    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /eslint-visitor-keys/2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint/7.32.0:
-    resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /eslint-visitor-keys/3.2.0:
+    resolution: {integrity: sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint/8.8.0:
+    resolution: {integrity: sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@babel/code-frame': 7.12.11
-      '@eslint/eslintrc': 0.4.3
-      '@humanwhocodes/config-array': 0.5.0
+      '@eslint/eslintrc': 1.0.5
+      '@humanwhocodes/config-array': 0.9.3
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
       debug: 4.3.2
       doctrine: 3.0.0
-      enquirer: 2.3.6
       escape-string-regexp: 4.0.0
-      eslint-scope: 5.1.1
-      eslint-utils: 2.1.0
-      eslint-visitor-keys: 2.1.0
-      espree: 7.3.1
+      eslint-scope: 7.1.0
+      eslint-utils: 3.0.0_eslint@8.8.0
+      eslint-visitor-keys: 3.2.0
+      espree: 9.3.0
       esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       functional-red-black-tree: 1.0.1
-      glob-parent: 5.1.2
+      glob-parent: 6.0.2
       globals: 13.11.0
-      ignore: 4.0.6
+      ignore: 5.2.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.0.4
       natural-compare: 1.4.0
       optionator: 0.9.1
-      progress: 2.0.3
       regexpp: 3.2.0
-      semver: 7.3.5
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
-      table: 6.7.5
       text-table: 0.2.0
       v8-compile-cache: 2.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /espree/7.3.1:
-    resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /espree/9.3.0:
+    resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 7.4.1
-      acorn-jsx: 5.3.2_acorn@7.4.1
-      eslint-visitor-keys: 1.3.0
-    dev: true
-
-  /esprima/4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
+      acorn: 8.7.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
+      eslint-visitor-keys: 3.2.0
     dev: true
 
   /esquery/1.4.0:
@@ -1627,6 +2799,11 @@ packages:
     engines: {node: '>=4.0'}
     dev: true
 
+  /estraverse/5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+    dev: true
+
   /esutils/2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -1777,6 +2954,13 @@ packages:
       is-glob: 4.0.3
     dev: true
 
+  /glob-parent/6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: 4.0.3
+    dev: true
+
   /glob/7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
     dependencies:
@@ -1793,15 +2977,15 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /globals/12.4.0:
-    resolution: {integrity: sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==}
+  /globals/13.11.0:
+    resolution: {integrity: sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==}
     engines: {node: '>=8'}
     dependencies:
-      type-fest: 0.8.1
+      type-fest: 0.20.2
     dev: true
 
-  /globals/13.11.0:
-    resolution: {integrity: sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==}
+  /globals/13.12.0:
+    resolution: {integrity: sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -1814,7 +2998,7 @@ packages:
       array-union: 2.1.0
       dir-glob: 3.0.1
       fast-glob: 3.2.7
-      ignore: 5.1.8
+      ignore: 5.2.0
       merge2: 1.4.1
       slash: 3.0.0
     dev: true
@@ -1871,8 +3055,8 @@ packages:
     engines: {node: '>= 4'}
     dev: true
 
-  /ignore/5.1.8:
-    resolution: {integrity: sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==}
+  /ignore/5.2.0:
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
     dev: true
 
@@ -1960,11 +3144,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-fullwidth-code-point/3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-    dev: true
-
   /is-glob/4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -2095,22 +3274,21 @@ packages:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-yaml/3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  /js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
+      argparse: 2.0.1
     dev: true
 
-  /jsdoc-type-pratt-parser/1.1.1:
-    resolution: {integrity: sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==}
+  /jsdoc-type-pratt-parser/2.2.2:
+    resolution: {integrity: sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==}
     engines: {node: '>=12.0.0'}
     dev: true
 
-  /jsdoc-type-pratt-parser/1.2.0:
-    resolution: {integrity: sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==}
-    engines: {node: '>=12.0.0'}
+  /jsesc/0.5.0:
+    resolution: {integrity: sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=}
+    hasBin: true
     dev: true
 
   /jsesc/2.5.2:
@@ -2127,10 +3305,6 @@ packages:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-schema-traverse/1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
-
   /json-stable-stringify-without-jsonify/1.0.1:
     resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
     dev: true
@@ -2188,12 +3362,12 @@ packages:
       path-exists: 3.0.0
     dev: true
 
-  /lodash.merge/4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha1-gteb/zCmfEAF/9XiUVMArZyk168=}
     dev: true
 
-  /lodash.truncate/4.4.2:
-    resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=}
+  /lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
   /lodash/4.17.21:
@@ -2558,6 +3732,17 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
+  /react-dom/17.0.2_react@17.0.2:
+    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
+    peerDependencies:
+      react: 17.0.2
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react: 17.0.2
+      scheduler: 0.20.2
+    dev: true
+
   /react-is/16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
     dev: true
@@ -2566,10 +3751,35 @@ packages:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
 
+  /react/17.0.2:
+    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
+  /regenerate-unicode-properties/9.0.0:
+    resolution: {integrity: sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+    dev: true
+
+  /regenerate/1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+    dev: true
+
   /regenerator-runtime/0.13.9:
     resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
     dev: true
 
+  /regenerator-transform/0.14.5:
+    resolution: {integrity: sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==}
+    dependencies:
+      '@babel/runtime': 7.16.7
+    dev: true
+
   /regexp.prototype.flags/1.3.1:
     resolution: {integrity: sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==}
     engines: {node: '>= 0.4'}
@@ -2583,14 +3793,32 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /regexpu-core/4.8.0:
+    resolution: {integrity: sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 9.0.0
+      regjsgen: 0.5.2
+      regjsparser: 0.7.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.0.0
+    dev: true
+
   /regextras/0.8.0:
     resolution: {integrity: sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==}
     engines: {node: '>=0.1.14'}
     dev: true
 
-  /require-from-string/2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
+  /regjsgen/0.5.2:
+    resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==}
+    dev: true
+
+  /regjsparser/0.7.0:
+    resolution: {integrity: sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
     dev: true
 
   /requireindex/1.2.0:
@@ -2644,11 +3872,23 @@ packages:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: true
 
+  /scheduler/0.20.2:
+    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
   /semver/6.3.0:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
     dev: true
 
+  /semver/7.0.0:
+    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
+    hasBin: true
+    dev: true
+
   /semver/7.3.5:
     resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==}
     engines: {node: '>=10'}
@@ -2686,15 +3926,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /slice-ansi/4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
   /smart-buffer/4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -2745,10 +3976,6 @@ packages:
     resolution: {integrity: sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==}
     dev: true
 
-  /sprintf-js/1.0.3:
-    resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=}
-    dev: true
-
   /stack-utils/2.0.5:
     resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
     engines: {node: '>=10'}
@@ -2756,17 +3983,8 @@ packages:
       escape-string-regexp: 2.0.0
     dev: true
 
-  /string-width/4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-    dev: true
-
-  /string.prototype.matchall/4.0.5:
-    resolution: {integrity: sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==}
+  /string.prototype.matchall/4.0.6:
+    resolution: {integrity: sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.3
@@ -2823,17 +4041,6 @@ packages:
       has-flag: 4.0.0
     dev: true
 
-  /table/6.7.5:
-    resolution: {integrity: sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==}
-    engines: {node: '>=10.0.0'}
-    dependencies:
-      ajv: 8.8.2
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /text-table/0.2.0:
     resolution: {integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=}
     dev: true
@@ -2884,11 +4091,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /unbox-primitive/1.0.1:
     resolution: {integrity: sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==}
     dependencies:
@@ -2898,6 +4100,29 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
+  /unicode-canonical-property-names-ecmascript/2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-match-property-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.0.0
+    dev: true
+
+  /unicode-match-property-value-ecmascript/2.0.0:
+    resolution: {integrity: sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-property-aliases-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==}
+    engines: {node: '>=4'}
+    dev: true
+
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
diff --git a/projects/plugins/jetpack/tests/php/bootstrap.php b/projects/plugins/jetpack/tests/php/bootstrap.php
index 8b88b7b7fa6f4..9f9340ff8d507 100644
--- a/projects/plugins/jetpack/tests/php/bootstrap.php
+++ b/projects/plugins/jetpack/tests/php/bootstrap.php
@@ -42,10 +42,12 @@
 	if ( ! class_exists( PHPUnit\Framework\MockObject\InvocationMocker::class, false ) &&
 		file_exists( "$test_root/includes/phpunit7/MockObject/InvocationMocker.php" )
 	) {
+		// phpcs:disable WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 		require "$test_root/includes/phpunit7/MockObject/Builder/NamespaceMatch.php";
 		require "$test_root/includes/phpunit7/MockObject/Builder/ParametersMatch.php";
 		require "$test_root/includes/phpunit7/MockObject/InvocationMocker.php";
 		require "$test_root/includes/phpunit7/MockObject/MockMethod.php";
+		// phpcs:enable
 	} else {
 		fprintf(
 			STDOUT,
diff --git a/projects/plugins/jetpack/tests/php/sync/class-test-jetpack-sync-search.php b/projects/plugins/jetpack/tests/php/sync/class-test-jetpack-sync-search.php
index af1290b09f9dc..d9ca9e30255d3 100644
--- a/projects/plugins/jetpack/tests/php/sync/class-test-jetpack-sync-search.php
+++ b/projects/plugins/jetpack/tests/php/sync/class-test-jetpack-sync-search.php
@@ -70,11 +70,11 @@ public function set_up() {
 	 *
 	 * @return string[][]
 	 */
-	public function get_allowed_postmeta_keys() {
+	public function get_random_allowed_postmeta_keys() {
 		$params = array();
 		$keys   = Modules\Search::get_all_postmeta_keys();
-		foreach ( $keys as $k ) {
-			$params[] = array( $k );
+		foreach ( array_rand( $keys, 10 ) as $k ) {
+			$params[] = array( $keys[ $k ] );
 		}
 
 		return $params;
@@ -85,11 +85,11 @@ public function get_allowed_postmeta_keys() {
 	 *
 	 * @return string[][]
 	 */
-	public function get_allowed_taxonomies() {
+	public function get_random_allowed_taxonomies() {
 		$params = array();
 		$keys   = Modules\Search::get_all_taxonomies();
-		foreach ( $keys as $k ) {
-			$params[] = array( $k );
+		foreach ( array_rand( $keys, 10 ) as $k ) {
+			$params[] = array( $keys[ $k ] );
 		}
 
 		return $params;
@@ -167,7 +167,7 @@ public function test_meta_no_overlap() {
 	 * Important that we double check the specification format since
 	 * this will often get added to.
 	 *
-	 * @dataProvider get_allowed_postmeta_keys
+	 * @dataProvider get_random_allowed_postmeta_keys
 	 * @param string $key Meta Key.
 	 */
 	public function test_check_postmeta_spec( $key ) {
@@ -201,7 +201,7 @@ public function test_check_postmeta_spec( $key ) {
 	/**
 	 * Verify that allowed taxonomies are synced.
 	 *
-	 * @dataProvider get_allowed_taxonomies
+	 * @dataProvider get_random_allowed_taxonomies
 	 * @param string $taxonomy Taxonomy Name.
 	 */
 	public function test_add_taxonomy( $taxonomy ) {
diff --git a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-callables.php b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-callables.php
index ee79bfdbf4b2b..034c867a9eb6e 100644
--- a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-callables.php
+++ b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-callables.php
@@ -13,7 +13,7 @@
 use Automattic\Jetpack\Sync\Settings;
 
 
-require_once 'test_class.jetpack-sync-base.php';
+require_once __DIR__ . '/test_class.jetpack-sync-base.php';
 
 function jetpack_foo_is_callable() {
 	return 'bar';
diff --git a/projects/plugins/jetpack/to-test.md b/projects/plugins/jetpack/to-test.md
index 2c49501130d39..ae2046649fdd7 100644
--- a/projects/plugins/jetpack/to-test.md
+++ b/projects/plugins/jetpack/to-test.md
@@ -1,30 +1,61 @@
-## 10.5
+## 10.6
 
 ### Before you start
 
 - **At any point during your testing, remember to [check your browser's JavaScript console](https://codex.wordpress.org/Using_Your_Browser_to_Diagnose_JavaScript_Errors#Step_3:_Diagnosis) and see if there are any errors reported by Jetpack there.**
 - Use "Debug Bar" or "Query Monitor" to help make PHP notices and warnings more noticeable and report anything you see.
 
-### Updated Print Media Styles
+### Instant Search
 
-When printing posts, additional interactive elements not meant for print have been hidden. To test:
+In this release, we've continued to make progress towards a Jetpack Search plugin. This involved making changes to the Search feature as it is packaged in the Jetpack plugin, so it's worth testing it still works as advertized. Try the following:
 
-- In `Jetpack > Settings > Traffic` enable the Related Posts feature, and in `Jetpack > Settings > Sharing` enable and configure sharing buttons. Also enable Likes for a particular post to test with.
-- When printing your test post, you should not see the Like button, "Share this" section, or the list of Related Posts.
+1. Purchase a Search plan.
+2. Go to Jetpack > Settings > Performance and toggle the feature on and off.
+3. Go to Jetpack > Search and toggle the feature on and off.
+4. Click the link there to go and customize the search page.
+5. Check that your changes still look good on the site's frontend.
+6. In Appearance > Widgets, add widgets to the Jetpack Search Sidebar area, and ensure those widgets appear when you view the Search results on your site's frontend.
 
-### Subscription Form Block Custom Success Message
+### Pay with PayPal Block
 
-The success message for the Subscription Form block can now be customized from the editor's block settings:
+In this release we've fixed some bugs with this block. It's a good opportunity to test it again. You'll need to purchase a paid bundle first, such as the Complete plan. Then, head to Posts > Add New and try adding a Pay with PayPal block. Let us know if you run into any issues with the layout in the editor, currencies, or layout on the site's frontend.
 
-- Make sure subscriptions are enabled in `Jetpack > Settings > Discussion`.
-- In a new test post, add a Subscription Form block and customize the "Success Message Text" from the block settings panel.
-- Save your post and test you are able to see the customized success message displayed on the frontend after submitting the form.
+### Tiled Gallery Block
 
-### Single Sign On Error Filters
+We've made changes to the Tiled Gallery block to ensure it can be used from the mobile apps as well. You'll want to make sure it can still be used from the block editor on the web (no need to test on mobile for this release specifically):
 
-Added filters for customizing error text when a local user cannot be found for a given WordPress.com account, and for when Single Sign On (SSO) is disallowed on a staging site:
+1. Look for posts that were published in the past and that included tiled galleries; edit those posts, and ensure you can edit the galleries without any errors.
+2. Try publishing new posts with one or more tiled galleries.
 
-- Example: add `add_filter( 'jetpack_sso_unknown_user_notice', function() { return 'Customer error text: we do not know you.'; } );` to a site with SSO enabled. Then try signing into that site with a WordPress.com account not associated with the site - you should be able to see the custom error text.
-- The other filter added is `jetpack_sso_disallowed_staging_notice` which can similarly be used to customize error text for staging sites that use SSO. Constant `define( JETPACK_STAGING_MODE, true );` can be used to test staging mode.
+### Widget Visibility
+
+We've fixed some issues with the Widget Visibility feature. Could you try the following?
+
+- Install the Classic Widgets plugin, then head to Appearance > Widgets and try using the Widget Visibility button appearing below each widget.
+- Head to Appearance > Customize > Widgets and do the same thing.
+- Deactivate the Classic Widgets plugin, then head to Appearance > Widgets; you should see the Visibility button for legacy widgets, and the Visibility rules in the "Advanced" panel for each block.
+
+### At-a-glance Partner Coupon Redemption
+
+We've introduced a new callout to redeem a coupon that may have been provided by a partner.
+
+- Make sure Jetpack is activated and connected, has Jetpack Free as its plan, and has no other products.
+- Visit `/wp-admin/admin.php?page=jetpack#/dashboard` and confirm the Backup feature section shows what is visible in screenshot 1 below.
+- Visit `/wp-admin/?jetpack-partner-coupon=PARTNER_COUPON_CODE` to store a partner coupon code. Please reach out to team Avalon to get a coupon code.
+- Visit `/wp-admin/admin.php?page=jetpack#/dashboard` and confirm the Backup feature section shows what is visible in screenshot 2 below. Clicking on the Redeem button should redirect you to checkout with your partner coupon applied.
+- Purchase a product to your test site that provides backups.
+- Visit `/wp-admin/admin.php?page=jetpack#/dashboard` and confirm the Backup feature section shows what is visible in screenshot 3 below.
+
+Screenshot 1) No backup product, no partner coupon:
+
+![Screen Shot 2022-02-01 at 19 08 35](https://user-images.githubusercontent.com/22746396/152016113-1da5365c-3f54-40c9-b079-47e97767bd40.png)
+
+Screenshot 2) No backup product, partner coupon available:
+
+![Screen Shot 2022-02-01 at 19 03 52](https://user-images.githubusercontent.com/22746396/152016107-bf474b8b-2970-44f5-b11a-b5f997bb613c.png)
+
+Screenshot 3) Backup product active, partner coupon status is irrelevant:
+
+![Screen Shot 2022-02-01 at 18 57 18](https://user-images.githubusercontent.com/22746396/152016100-6fe4a8f5-4ac4-482e-9501-8ed7f216f592.png)
 
 **Thank you for all your help!**
diff --git a/projects/plugins/jetpack/tools/builder/frontend-css.js b/projects/plugins/jetpack/tools/builder/frontend-css.js
index 70dd55ccf3769..58f4e0917d970 100644
--- a/projects/plugins/jetpack/tools/builder/frontend-css.js
+++ b/projects/plugins/jetpack/tools/builder/frontend-css.js
@@ -49,7 +49,7 @@ export const frontendCSSSeparateFilesList = [
 	'modules/widgets/eu-cookie-law/style.css',
 	'modules/widgets/flickr/style.css',
 	'modules/widgets/instagram/instagram.css',
-	'modules/widgets/search/css/search-widget-frontend.css',
+	'jetpack_vendor/automattic/jetpack-search/src/widgets/css/search-widget-frontend.css',
 	'modules/widgets/simple-payments/style.css',
 	'modules/widgets/social-icons/social-icons.css',
 	'modules/widgets/milestone/milestone-widget.css',
diff --git a/projects/plugins/vaultpress/.gitattributes b/projects/plugins/vaultpress/.gitattributes
index 03715c3b7f440..d36a74be03462 100644
--- a/projects/plugins/vaultpress/.gitattributes
+++ b/projects/plugins/vaultpress/.gitattributes
@@ -18,6 +18,7 @@ changelog/**                                production-exclude
 composer.lock                               production-exclude
 package.json                                production-exclude
 phpunit.xml.dist                            production-exclude
+.phpcs.dir.xml                              production-exclude
 tests/**                                    production-exclude
 /vendor/automattic/jetpack-autoloader/**    production-exclude
 /vendor/automattic/jetpack-changelogger/**  production-exclude
diff --git a/projects/plugins/vaultpress/CHANGELOG.md b/projects/plugins/vaultpress/CHANGELOG.md
index 34d8bb6c6a9d3..f53b263240a3a 100644
--- a/projects/plugins/vaultpress/CHANGELOG.md
+++ b/projects/plugins/vaultpress/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.2.1 - 2022-02-01
+### Changed
+- Colors: update colors to match the latest iterations of our brand.
+- General: update WordPress tested up to version, since the plugin works with WordPress 5.9.
+- Set `convertDeprecationsToExceptions` true in PHPUnit config.
+- Switch to pcov for code coverage.
+- Updated package dependencies.
+
+
 ## 2.2.0 - 2021-10-11
 ### Changed
 - Tests: update PHPUnit polyfills dependency (yoast/phpunit-polyfills).
diff --git a/projects/plugins/vaultpress/changelog/add-custom-composer-installer b/projects/plugins/vaultpress/changelog/add-custom-composer-installer
deleted file mode 100644
index 4dccb667a87ac..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-custom-composer-installer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: added
-Comment: Added support for the jetpack_vendor directory
-
-
diff --git a/projects/plugins/vaultpress/changelog/add-phpcs-sniff-for-assets-register_script-textdomain b/projects/plugins/vaultpress/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
deleted file mode 100644
index a9a10b1f78b52..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-phpcs-sniff-for-assets-register_script-textdomain
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Configure Jetpack.Functions.I18n
-
-
diff --git a/projects/plugins/vaultpress/changelog/add-test-with-php-8.1 b/projects/plugins/vaultpress/changelog/add-test-with-php-8.1
deleted file mode 100644
index b250022fc78be..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-test-with-php-8.1
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Set `convertDeprecationsToExceptions` true in PHPUnit config.
diff --git a/projects/plugins/vaultpress/changelog/add-user-license-activate-notice-2 b/projects/plugins/vaultpress/changelog/add-user-license-activate-notice-2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-user-license-activate-notice-2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/fix-changelogger-prerelease-version-next b/projects/plugins/vaultpress/changelog/fix-changelogger-prerelease-version-next
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/fix-changelogger-prerelease-version-next
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/fix-phpcs-textdomain-config b/projects/plugins/vaultpress/changelog/fix-phpcs-textdomain-config
deleted file mode 100644
index ad7750c4a9eaa..0000000000000
--- a/projects/plugins/vaultpress/changelog/fix-phpcs-textdomain-config
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Configure textdomain for WordPress.WP.I18n.
-
-
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index 302aa8cf46b5c..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies
diff --git a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x#2 b/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/js-packages/storybook/changelog/fix-plain-permalinks-authorization-url b/projects/plugins/vaultpress/changelog/start-vaultpress-222-cycle
similarity index 53%
rename from projects/js-packages/storybook/changelog/fix-plain-permalinks-authorization-url
rename to projects/plugins/vaultpress/changelog/start-vaultpress-222-cycle
index c47cb18e82997..1494f1aac9129 100644
--- a/projects/js-packages/storybook/changelog/fix-plain-permalinks-authorization-url
+++ b/projects/plugins/vaultpress/changelog/start-vaultpress-222-cycle
@@ -1,4 +1,4 @@
 Significance: patch
 Type: changed
 
-Updated package dependencies.
+Core: start new release cycle.
diff --git a/projects/plugins/vaultpress/changelog/try-pcov b/projects/plugins/vaultpress/changelog/try-pcov
deleted file mode 100644
index bbcd26b6ce57e..0000000000000
--- a/projects/plugins/vaultpress/changelog/try-pcov
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Switch to pcov for code coverage.
diff --git a/projects/plugins/vaultpress/changelog/update-composer b/projects/plugins/vaultpress/changelog/update-composer
deleted file mode 100644
index 9d476b2308bac..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Tooling update: Use composer 2.2.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-composer_package_types b/projects/plugins/vaultpress/changelog/update-composer_package_types
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-composer_package_types
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-contributor-lists b/projects/plugins/vaultpress/changelog/update-contributor-lists
deleted file mode 100644
index d4ffd0063896f..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-contributor-lists
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Readme: update contributor list.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-jetpack-color-primary b/projects/plugins/vaultpress/changelog/update-jetpack-color-primary
deleted file mode 100644
index e6b76448863af..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-jetpack-color-primary
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Colors: update Jetpack Primary color to match latest brand book.
diff --git a/projects/plugins/vaultpress/changelog/update-project-scripts-no-install b/projects/plugins/vaultpress/changelog/update-project-scripts-no-install
deleted file mode 100644
index f45fac5ea79e2..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-project-scripts-no-install
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Tooling only: Build and test scripts no longer call `composer install` or `pnpm install`.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-vaultpress-excluded-file b/projects/plugins/vaultpress/changelog/update-vaultpress-excluded-file
new file mode 100644
index 0000000000000..8bbd2e3a65f85
--- /dev/null
+++ b/projects/plugins/vaultpress/changelog/update-vaultpress-excluded-file
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Build: do not ship PHPCS configuration file
diff --git a/projects/plugins/vaultpress/changelog/update-vaultpress-tested-version b/projects/plugins/vaultpress/changelog/update-vaultpress-tested-version
deleted file mode 100644
index 4ffb073853194..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-vaultpress-tested-version
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Tested against WordPress 5.8
diff --git a/projects/plugins/vaultpress/changelog/vaultpress-update-changelog-2.2.0 b/projects/plugins/vaultpress/changelog/vaultpress-update-changelog-2.2.0
deleted file mode 100644
index 8abc76b865a2d..0000000000000
--- a/projects/plugins/vaultpress/changelog/vaultpress-update-changelog-2.2.0
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Backporting the changelog changes from the feature branch into master
-
-
diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json
index 2684948589ee1..8426f4d390d6b 100644
--- a/projects/plugins/vaultpress/composer.json
+++ b/projects/plugins/vaultpress/composer.json
@@ -38,7 +38,7 @@
 	"minimum-stability": "dev",
 	"prefer-stable": true,
 	"config": {
-		"autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_2_1_alpha",
+		"autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ2_2_2_alpha",
 		"allow-plugins": {
 			"automattic/jetpack-autoloader": true
 		}
diff --git a/projects/plugins/vaultpress/readme.txt b/projects/plugins/vaultpress/readme.txt
index ceacd63817026..de5a41944156c 100644
--- a/projects/plugins/vaultpress/readme.txt
+++ b/projects/plugins/vaultpress/readme.txt
@@ -2,7 +2,7 @@
 Contributors: automattic, annezazu, apokalyptik, bjorsch, briancolinger, dsmart, georgestephanis, jeherve, josephscott, miguelxavierpenha, rachelsquirrel, rdcoll, sdixon194, shaunandrews, thingalon, viper007bond, williamvianas, xknown
 Tags: security, malware, virus, archive, back up, back ups, backup, backups, scanning, restore, wordpress backup, site backup, website backup
 Requires at least: 5.2
-Tested up to: 5.8
+Tested up to: 5.9
 Stable tag: 2.2.0
 Requires PHP: 5.6
 License: GPLv2
@@ -48,16 +48,11 @@ A VaultPress subscription is for a single WordPress site. You can purchase addit
 Yes, VaultPress supports Multisite installs. Each site will require its own subscription.
 
 == Changelog ==
-### 2.2.0 - 2021-10-11
+### 2.2.1 - 2022-02-01
 #### Changed
-- Tests: update PHPUnit polyfills dependency (yoast/phpunit-polyfills).
-- Updated package dependencies.
+- Colors: update colors to match the latest iterations of our brand.
+- General: update WordPress tested up to version, since the plugin works with WordPress 5.9.
 
-#### Security
-- VaultPress: Remove obsolete hotfixes
-
-#### Fixed
-- General: avoid PHP notices when using recent versions of PHP.
 
 --------
 
diff --git a/projects/plugins/vaultpress/vaultpress.php b/projects/plugins/vaultpress/vaultpress.php
index 9675ed71b193a..dcc459c496f98 100644
--- a/projects/plugins/vaultpress/vaultpress.php
+++ b/projects/plugins/vaultpress/vaultpress.php
@@ -3,7 +3,7 @@
  * Plugin Name: VaultPress
  * Plugin URI: http://vaultpress.com/?utm_source=plugin-uri&amp;utm_medium=plugin-description&amp;utm_campaign=1.0
  * Description: Protect your content, themes, plugins, and settings with <strong>realtime backup</strong> and <strong>automated security scanning</strong> from <a href="http://vaultpress.com/?utm_source=wp-admin&amp;utm_medium=plugin-description&amp;utm_campaign=1.0" rel="nofollow">VaultPress</a>. Activate, enter your registration key, and never worry again. <a href="http://vaultpress.com/help/?utm_source=wp-admin&amp;utm_medium=plugin-description&amp;utm_campaign=1.0" rel="nofollow">Need some help?</a>
- * Version: 2.2.1-alpha
+ * Version: 2.2.2-alpha
  * Author: Automattic
  * Author URI: http://vaultpress.com/?utm_source=author-uri&amp;utm_medium=plugin-description&amp;utm_campaign=1.0
  * License: GPL2+
@@ -17,7 +17,7 @@
 defined( 'ABSPATH' ) || die();
 
 define( 'VAULTPRESS__MINIMUM_PHP_VERSION', '5.6' );
-define( 'VAULTPRESS__VERSION', '2.2.1-alpha' );
+define( 'VAULTPRESS__VERSION', '2.2.2-alpha' );
 define( 'VAULTPRESS__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 
 /**
@@ -1287,9 +1287,32 @@ function woocommerce_tax_rate_handler( $id ) {
 		$this->block_change_handler( 'woocommerce_tax_rate_locations', array( 'tax_rate_id' => $id ) );
 	}
 
-	function woocommerce_order_item_handler( $id )      { $this->generic_change_handler( 'woocommerce_order_items',          array( 'order_item_id' => $id ) ); }
-	function woocommerce_order_item_meta_handler( $id ) { $this->generic_change_handler( 'woocommerce_order_itemmeta',       array( 'meta_id' => $id ) ); }
-	function woocommerce_attribute_handler( $id )       { $this->generic_change_handler( 'woocommerce_attribute_taxonomies', array( 'attribute_id' => $id ) ); }
+	/**
+	 * Monitor for changes to a Woo order (creation, update, or deletion).
+	 *
+	 * @param int $id Item ID.
+	 */
+	public function woocommerce_order_item_handler( $id ) {
+		$this->generic_change_handler( 'woocommerce_order_items', array( 'order_item_id' => $id ) );
+	}
+
+	/**
+	 * Monitor for changes to a Woo order meta (creation, update, or deletion).
+	 *
+	 * @param int $id Item ID.
+	 */
+	public function woocommerce_order_item_meta_handler( $id ) {
+		$this->generic_change_handler( 'woocommerce_order_itemmeta', array( 'meta_id' => $id ) );
+	}
+
+	/**
+	 * Monitor for changes to a Woo attribute (creation, update, or deletion).
+	 *
+	 * @param int $id Item ID.
+	 */
+	public function woocommerce_attribute_handler( $id ) {
+		$this->generic_change_handler( 'woocommerce_attribute_taxonomies', array( 'attribute_id' => $id ) );
+	}
 
 	function generic_change_handler( $table, $key ) {
 		$this->add_ping( 'db', array( $table => $key ) );
diff --git a/tools/changelogger-release.sh b/tools/changelogger-release.sh
index 5ed73adaeee61..99099a8d43a8e 100755
--- a/tools/changelogger-release.sh
+++ b/tools/changelogger-release.sh
@@ -77,7 +77,7 @@ fi
 cd "$BASE"
 pnpx jetpack install --all
 
-DEPS="$(tools/find-project-deps.php)"
+DEPS="$(pnpx jetpack dependencies json)"
 declare -A RELEASED
 
 # Release a project
@@ -161,8 +161,7 @@ cd "$BASE"
 info "Updating dependencies..."
 SLUGS=()
 # Use a temp variable so pipefail works
-TMP="$(tools/get-build-order.php 2>/dev/null)"
-TMP=monorepo$'\n'"$TMP"
+TMP="$(pnpx jetpack dependencies build-order --pretty)"
 mapfile -t SLUGS <<<"$TMP"
 for SLUG in "${SLUGS[@]}"; do
 	if [[ -n "${RELEASED[$SLUG]}" ]]; then
diff --git a/tools/check-intra-monorepo-deps.sh b/tools/check-intra-monorepo-deps.sh
index 654f859a46747..ae8c4de534a5c 100755
--- a/tools/check-intra-monorepo-deps.sh
+++ b/tools/check-intra-monorepo-deps.sh
@@ -93,9 +93,8 @@ DO_PNPM_LOCK=true
 SLUGS=()
 if [[ $# -le 0 ]]; then
 	# Use a temp variable so pipefail works
-	TMP="$(tools/get-build-order.php 2>/dev/null)"
+	TMP="$(pnpx jetpack dependencies build-order --pretty)"
 	mapfile -t SLUGS <<<"$TMP"
-	SLUGS+=( 'monorepo' )
 	TMP="$(git ls-files '**/composer.json' '**/package.json' | sed -E -n -e '\!^projects/[^/]*/[^/]*/(composer|package)\.json$! d' -e 's!/(composer|package)\.json$!!' -e 's/^/nonproject:/p' | sort -u)"
 	mapfile -t -O ${#SLUGS[@]} SLUGS <<<"$TMP"
 else
diff --git a/tools/cli/bin/jetpack.js b/tools/cli/bin/jetpack.js
index dcad3ec425a4b..8a17b88a8fd26 100755
--- a/tools/cli/bin/jetpack.js
+++ b/tools/cli/bin/jetpack.js
@@ -6,11 +6,6 @@
 import process from 'process';
 import { fileURLToPath } from 'url';
 
-/**
- * Internal dependencies
- */
-import * as cliRouter from '../cliRouter.js';
-
 /**
  * Standardizes the cwd for the process. Allows `jetpack` cli to run correctly from any location in the repo.
  */
@@ -18,16 +13,30 @@ import * as cliRouter from '../cliRouter.js';
 process.chdir( fileURLToPath( new URL( '../../..', import.meta.url ) ) );
 
 try {
+	const cliRouter = await import( '../cliRouter.js' );
 	cliRouter.cli();
 } catch ( error ) {
-	if ( error.code === 'MODULE_NOT_FOUND' ) {
-		// if pnpm install hasn't been run, esm require will fail here.
+	const identity = v => v;
+	const chalk = await import( 'chalk' ).then(
+		m => m.default,
+		() => ( {} )
+	);
+
+	if ( error.code === 'ERR_MODULE_NOT_FOUND' ) {
+		// if pnpm install hasn't been run, the import() will fail here.
 		console.error(
 			'Something is missing from your install. Please run `pnpm install` and try again.'
 		);
+
+		// Print the original error's message too, as sometimes the error isn't fixed by `pnpm install`.
+		console.error(
+			( chalk.grey || identity )( `The original error message was ${ error.message }` )
+		);
 	} else {
 		console.error( error );
-		console.error( 'Something unexpected happened. See error above.' );
+		console.error(
+			( chalk.bold || identity )( 'Something unexpected happened. See error above.' )
+		);
 	}
 	process.exit( 1 );
 }
diff --git a/tools/cli/cliRouter.js b/tools/cli/cliRouter.js
index c1ba38629413d..371438b556114 100644
--- a/tools/cli/cliRouter.js
+++ b/tools/cli/cliRouter.js
@@ -7,9 +7,9 @@ import { hideBin } from 'yargs/helpers';
 /**
  * Internal dependencies
  */
-import { buildDefine } from './commands/build.js';
+import * as buildCommand from './commands/build.js';
 import { watchDefine } from './commands/watch.js';
-import { installDefine } from './commands/install.js';
+import * as installCommand from './commands/install.js';
 import { cleanDefine } from './commands/clean.js';
 import { cliDefine } from './commands/cli.js';
 import { generateDefine } from './commands/generate.js';
@@ -18,6 +18,7 @@ import { changelogDefine } from './commands/changelog.js';
 import { dockerDefine } from './commands/docker.js';
 import { testDefine } from './commands/test.js';
 import { releaseDefine } from './commands/release.js';
+import * as dependenciesCommand from './commands/dependencies.js';
 
 /**
  * The main CLI router function.
@@ -35,15 +36,16 @@ export async function cli() {
 	 * Adds the commands to the yargs instance. Help text will list commands in the order they are included here.
 	 * Let's keep it alphabetical.
 	 */
-	argv = buildDefine( argv );
+	argv.command( buildCommand );
 	argv = changelogDefine( argv );
 	argv = cleanDefine( argv );
 	argv = cliDefine( argv );
 	argv.completion( 'completion', 'Generate bash/zsh completions' ); // Placed here to keep things alphabetical.
+	argv.command( dependenciesCommand );
 	argv = dockerDefine( argv );
 	argv = draftDefine( argv );
 	argv = generateDefine( argv );
-	argv = installDefine( argv );
+	argv.command( installCommand );
 	argv = releaseDefine( argv );
 	argv = testDefine( argv );
 	argv = watchDefine( argv );
diff --git a/tools/cli/commands/build.js b/tools/cli/commands/build.js
index 8fc79b0907b47..b479352366a27 100644
--- a/tools/cli/commands/build.js
+++ b/tools/cli/commands/build.js
@@ -2,168 +2,372 @@
  * External dependencies
  */
 import chalk from 'chalk';
+import execa from 'execa';
+import inquirer from 'inquirer';
 import Listr from 'listr';
-import VerboseRenderer from 'listr-verbose-renderer';
+import ListrState from 'listr/lib/state.js';
+import SilentRenderer from 'listr-silent-renderer';
 import UpdateRenderer from 'listr-update-renderer';
+import pLimit from 'p-limit';
 
 /**
  * Internal dependencies
  */
 import { chalkJetpackGreen } from '../helpers/styling.js';
+import { coerceConcurrency } from '../helpers/normalizeArgv.js';
+import formatDuration from '../helpers/format-duration.js';
+import { getDependencies, filterDeps, getBuildOrder } from '../helpers/dependencyAnalysis.js';
 import promptForProject from '../helpers/promptForProject.js';
 import { readComposerJson } from '../helpers/json.js';
-import installProjectTask from '../helpers/tasks/installProjectTask.js';
-import { allProjectsByType } from '../helpers/projectHelpers.js';
-import { normalizeBuildArgv, normalizeProject } from '../helpers/normalizeArgv.js';
-import buildProjectTask from '../helpers/tasks/buildProjectTask.js';
-import projectBuildCommand from '../helpers/projectBuildCommand.js';
-import listrOpts from '../helpers/tasks/listrOpts.js';
+import { getInstallArgs, projectDir } from '../helpers/install.js';
+import { allProjects, allProjectsByType } from '../helpers/projectHelpers.js';
+import PrefixTransformStream from '../helpers/prefix-stream.js';
+
+export const command = 'build [project...]';
+export const describe = 'Builds one or more monorepo projects';
 
 /**
- * Relays build commands to a particular project.
+ * Options definition for the build subcommand.
  *
- * @param {object} options - The argv options.
+ * @param {object} yargs - The Yargs dependency.
+ * @returns {object} Yargs with the build commands defined.
  */
-async function buildRouter( options ) {
-	if ( options.project ) {
-		const data = readComposerJson( options.project );
-		data !== false ? await build( options.project, options.production, data, options.v ) : false;
-	} else {
-		console.error( chalk.red( 'You did not choose a valid project!' ) );
-	}
+export function builder( yargs ) {
+	return yargs
+		.positional( 'project', {
+			describe: 'Project in the form of type/name, e.g. plugins/jetpack',
+			type: 'string',
+		} )
+		.option( 'all', {
+			type: 'boolean',
+			description: 'Build all projects.',
+		} )
+		.option( 'concurrency', {
+			type: 'number',
+			description: 'Maximum number of build tasks to run at once.',
+			default: Infinity,
+			coerce: coerceConcurrency,
+		} )
+		.option( 'deps', {
+			type: 'boolean',
+			description: 'Build dependencies of the specified projects too.',
+		} )
+		.option( 'production', {
+			alias: 'p',
+			type: 'boolean',
+			description: 'Build for production.',
+		} )
+		.option( 'no-pnpm-install', {
+			type: 'boolean',
+			description: 'Skip execution of `pnpm install` before the build.',
+		} )
+		.option( 'timing', {
+			type: 'boolean',
+			description: 'Output timing information.',
+		} );
 }
 
 /**
- * Builds a project.
+ * Handles the build command.
  *
- * @param {string} project - The project.
- * @param {boolean} production - If a production build should be made.
- * @param {object} composerJson - The project's composer.json file, parsed.
- * @param {boolean} verbose - If verbose output is desired.
+ * @param {object} argv - the arguments passed.
  */
-export async function build( project, production, composerJson, verbose ) {
+export async function handler( argv ) {
+	let dependencies = await getDependencies( process.cwd(), 'build' );
+	const listr = new Listr( [], {
+		renderer: argv.v ? SilentRenderer : UpdateRenderer,
+		concurrent: argv.concurrency > 1,
+		exitOnError: argv.concurrency === 1,
+	} );
+
+	if ( argv.project.length === 1 ) {
+		if ( argv.project[ 0 ] === 'packages' ) {
+			argv.project = allProjectsByType( 'packages' );
+		} else if ( argv.project[ 0 ].indexOf( '/' ) < 0 ) {
+			argv.type = argv.project[ 0 ];
+			argv.project = [];
+		}
+	}
+
+	if ( argv.all ) {
+		argv.project = allProjects();
+	}
+
+	if ( argv.project.length === 0 ) {
+		argv.project = '';
+		argv = await promptForProject( argv );
+		argv = await promptForDeps( argv );
+		argv.project = [ argv.project ];
+	}
+
+	// Check for unknown projects.
+	argv.project = [ ...new Set( argv.project ) ];
+	const missing = new Set( argv.project.filter( p => ! dependencies.has( p ) ) );
+	if ( missing.size ) {
+		for ( const project of missing ) {
+			console.error( chalk.red( `Project ${ project } does not exist!` ) );
+		}
+		argv.project = argv.project.filter( p => dependencies.has( p ) );
+	}
+
+	// Filter to just what we want to build.
+	dependencies = filterDeps( dependencies, argv.project, { dependencies: argv.deps } );
+
+	// Calculate build order, with a cloned map so as to keep the original map for later.
+	const bodeps = new Map();
+	for ( const [ k, v ] of dependencies ) {
+		bodeps.set( k, new Set( v ) );
+	}
+	const buildOrder = getBuildOrder( bodeps ).flat();
+
+	// Avoid a node warning about too many event listeners.
+	if ( argv.v ) {
+		process.stdout.setMaxListeners( buildOrder.length + 10 );
+		process.stderr.setMaxListeners( buildOrder.length + 10 );
+	}
+
+	// Add `pnpm install` task, if one is necessary.
+	if ( argv.pnpmInstall !== false ) {
+		for ( const v of dependencies.values() ) {
+			v.add( 'pnpm install' );
+		}
+		dependencies.set( 'pnpm install', new Set() );
+		listr.add(
+			createBuildTask( 'pnpm install', argv, `Install pnpm dependencies`, async t => {
+				await t.setStatus( 'installing' );
+				await t.execa( 'pnpm', await getInstallArgs( 'monorepo', 'pnpm', argv ), {
+					cwd: process.cwd(),
+				} );
+			} )
+		);
+	}
+
+	// Add build tasks.
+	for ( const project of buildOrder ) {
+		const cwd = projectDir( project );
+		listr.add(
+			createBuildTask( project, argv, `Build ${ project }`, async t => {
+				await t.setStatus( 'installing' );
+				await t.execa( 'composer', await getInstallArgs( project, 'composer', argv ), { cwd } );
+
+				await t.setStatus( 'building' );
+				// Determine the composer script to run.
+				const composerJson = readComposerJson( project, false );
+				const scripts = argv.production
+					? [ 'build-production', 'build-development' ]
+					: [ 'build-development', 'build-production' ];
+				let script = null;
+				for ( const s of scripts ) {
+					if ( composerJson.scripts?.[ s ] ) {
+						script = s;
+						break;
+					}
+				}
+
+				if ( script === null ) {
+					await t.output( `No build scripts are defined for ${ project }\n` );
+				} else {
+					await t.execa( 'composer', [ 'run', '--timeout=0', script ], { cwd } );
+				}
+			} )
+		);
+	}
+
+	// Run it!
 	console.log(
 		chalkJetpackGreen(
-			`Hell yeah! It is time to build ${ project }!\n` +
+			`Hell yeah! It is time to build!\n` +
 				'Go ahead and sit back. Relax. This will take a few minutes.'
 		)
 	);
-
-	const opts = {
-		renderer: verbose ? VerboseRenderer : UpdateRenderer,
+	const ctx = {
+		concurrent: argv.concurrency > 1,
+		limit: pLimit( argv.concurrency ),
+		dependencies,
+		promises: {},
 	};
-
-	const builder = new Listr(
-		[
-			{
-				title: `Building ${ project }`,
-				task: () => {
-					return new Listr(
-						[
-							installProjectTask( { project: project, v: verbose, production: production } ),
-							buildProjectTask( { project: project, v: verbose, production: production } ),
-						],
-						opts
-					);
-				},
-			},
-		],
-		opts
-	);
-
-	builder.run().catch( err => {
-		console.error( err );
+	await listr.run( ctx ).catch( err => {
 		process.exit( err.exitCode || 1 );
 	} );
 }
 
 /**
- * Builds all packages.
+ * Create a build task.
  *
- * @param {object} options - The options passed from the command line.
+ * @param {string} project - Project slug.
+ * @param {object} argv - Command line arguments.
+ * @param {string} title - Task title.
+ * @param {Function} build - Build function.
+ * @returns {object} Listr task.
  */
-function buildAllPackages( options ) {
-	const tasks = [];
-	const opts = listrOpts( options );
-
-	allProjectsByType( 'packages' ).forEach( project => {
-		if ( projectBuildCommand( project, options.production ) ) {
-			tasks.push( {
-				title: `Building ${ project }`,
-				task: () => {
-					return new Listr(
-						[
-							installProjectTask( {
-								project: project,
-								v: options.v,
-								production: options.production,
-							} ),
-							buildProjectTask( {
-								project: project,
-								v: options.v,
-								production: options.production,
-							} ),
-						],
-						opts
-					);
-				},
-			} );
-		}
-	} );
+function createBuildTask( project, argv, title, build ) {
+	return {
+		title: title,
+		task: async ( ctx, task ) => {
+			const setStatus = s => {
+				task.title = title + chalk.grey( ` [${ s }]` );
+			};
 
-	const builds = new Listr( tasks, opts );
+			// Hack listr's wrapper to expose the state.
+			if (
+				task._task &&
+				typeof task._task.state !== 'undefined' &&
+				typeof task.state === 'undefined'
+			) {
+				Object.defineProperty( task, 'state', {
+					get: () => task._task.state,
+					set: v => {
+						task._task.state = v;
+					},
+				} );
+			}
 
-	builds.run().catch( err => {
-		console.error( err );
-	} );
-}
+			// Create a promise (by executing an async function), add a "status" property, store it in `ctx.promises`, and return it.
+			let status = 'pending';
+			let buildStarted = false;
+			const promise = ( async () => {
+				task.state = undefined;
 
-/**
- * Entry point for the CLI.
- *
- * @param {object} argv - The argv for the command line.
- */
-export async function buildCli( argv ) {
-	argv = normalizeBuildArgv( argv );
+				// First, wait for dependencies.
+				// If any dependency failed, reject.
+				// If any are pending, wait.
+				const deps = ctx.dependencies.get( project );
+				while ( ctx.concurrent ) {
+					const mydeps = [];
+					for ( const dep of deps ) {
+						const dp = ctx.promises[ dep ];
+						if ( ! dp ) {
+							// Task hasn't started yet. This will make Promise.race return next tick to re-loop.
+							mydeps.push( dep );
+						} else if ( dp.status === 'rejected' ) {
+							// Something failed, so throw.
+							setStatus( 'dependencies failed' );
+							throw new Error( `Dependency ${ dep } failed` );
+						} else if ( dp.status === 'pending' ) {
+							mydeps.push( dp );
+						}
+					}
 
-	if ( argv.project === 'packages' ) {
-		buildAllPackages( argv );
-		return;
-	}
-	argv = normalizeProject( argv );
-	argv = await promptForProject( argv );
-	await buildRouter( argv );
+					// Nothing pending, so break the loop.
+					if ( mydeps.length === 0 ) {
+						break;
+					}
+
+					// At least one task is pending, so wait for it. Catch any errors here,
+					// we'll handle them on the next time around the loop.
+					setStatus( 'waiting on dependencies' );
+					await Promise.race( mydeps ).catch( () => {} );
+				}
+
+				// Wait for a concurrency slot.
+				setStatus( 'pending' );
+				await ctx.limit( async () => {
+					task.state = ListrState.PENDING;
+
+					// Create the task-functions object to pass to the builder.
+					const t = {};
+					if ( argv.v ) {
+						const streamArgs = { prefix: ctx.concurrent ? project : null, time: !! argv.timing };
+						const stdout = new PrefixTransformStream( streamArgs );
+						const stderr = new PrefixTransformStream( streamArgs );
+						stdout.pipe( process.stdout, { end: false } );
+						stderr.pipe( process.stderr, { end: false } );
+
+						t.execa = ( file, args, options ) => {
+							const stdio = options.stdio || [];
+							stdio[ 0 ] ||= 'ignore';
+							const p = execa( file, args, {
+								...options,
+								stdio,
+							} );
+							if ( ! stdio[ 1 ] ) {
+								p.stdout.pipe( stdout, { end: false } );
+							}
+							if ( ! stdio[ 2 ] ) {
+								p.stderr.pipe( stderr, { end: false } );
+							}
+							return p;
+						};
+						t.output = m =>
+							new Promise( resolve => {
+								stdout.write( m, 'utf8', resolve );
+							} );
+						t.setStatus = s =>
+							t.output( '\n' + chalk.bold( `== ${ title } [${ s }] ==` ) + '\n\n' );
+					} else {
+						t.execa = ( file, args, options ) => {
+							const stdio = options.stdio || [];
+							stdio[ 0 ] ||= 'ignore';
+							stdio[ 1 ] ||= 'ignore';
+							stdio[ 2 ] ||= 'ignore';
+							const p = execa( file, args, {
+								...options,
+								stdio,
+							} );
+							return p;
+						};
+						t.output = () => Promise.resolve();
+						t.setStatus = setStatus;
+					}
+
+					// Build!
+					const t0 = Date.now();
+					buildStarted = true;
+					try {
+						await build( t );
+					} finally {
+						await t.setStatus( argv.timing ? formatDuration( Date.now() - t0 ) + 's' : 'complete' );
+					}
+				} );
+			} )().then(
+				v => {
+					status = 'resolved';
+					return v;
+				},
+				async e => {
+					if ( argv.v && ! buildStarted ) {
+						await new Promise( resolve => {
+							const prefix = argv.timing ? `[${ project } 0.000] ` : `[${ project }] `;
+							process.stdout.write(
+								`\nBuild aborted: ${ e.message }\n`.replace( /^/gm, prefix ) + '\n',
+								'utf8',
+								resolve
+							);
+						} );
+					}
+					status = 'rejected';
+					throw e;
+				}
+			);
+			Object.defineProperty( promise, 'status', {
+				get: () => status,
+			} );
+			ctx.promises[ project ] = promise;
+			return promise;
+		},
+	};
 }
 
 /**
- * Command definition for the build subcommand.
+ * Prompt for whether dependencies should be built too.
  *
- * @param {object} yargs - The Yargs dependency.
- * @returns {object} Yargs with the build commands defined.
+ * @param {object} options - Passthrough of the argv object.
+ * @returns {object} argv object with the project property.
  */
-export function buildDefine( yargs ) {
-	yargs.command(
-		'build [project]',
-		'Builds a monorepo project',
-		yarg => {
-			yarg
-				.positional( 'project', {
-					describe: 'Project in the form of type/name, e.g. plugins/jetpack',
-					type: 'string',
-				} )
-				.option( 'production', {
-					alias: 'p',
-					type: 'boolean',
-					description: 'Build for production.',
-				} );
-		},
-		async argv => {
-			await buildCli( argv );
-			if ( argv.v ) {
-				console.log( argv );
-			}
-		}
-	);
+async function promptForDeps( options ) {
+	if ( typeof options.deps !== 'undefined' ) {
+		return options;
+	}
 
-	return yargs;
+	const answers = await inquirer.prompt( [
+		{
+			type: 'confirm',
+			name: 'deps',
+			message: `Build dependencies of ${ options.project } too?`,
+		},
+	] );
+	return {
+		...options,
+		deps: answers.deps,
+	};
 }
diff --git a/tools/cli/commands/dependencies.js b/tools/cli/commands/dependencies.js
new file mode 100644
index 0000000000000..835435156ea84
--- /dev/null
+++ b/tools/cli/commands/dependencies.js
@@ -0,0 +1,185 @@
+/**
+ * External dependencies
+ */
+import chalk from 'chalk';
+import { spawn } from 'child_process';
+import ignore from 'ignore';
+
+/**
+ * Internal dependencies
+ */
+import { getDependencies, filterDeps, getBuildOrder } from '../helpers/dependencyAnalysis.js';
+
+// Files that mean --git-changed should report all projects as changed.
+const infrastructureFiles = new Set( [
+	'tools/cli/commands/dependencies.js',
+	'tools/cli/helpers/dependencyAnalysis.js',
+	'.github/actions/tool-setup/action.yml',
+	'.github/files/list-changed-projects.sh',
+	'.github/files/generate-ci-matrix.php',
+	'.github/files/process-coverage.sh',
+	'.github/files/setup-wordpress-env.sh',
+	'.github/versions.sh',
+	'.github/workflows/tests.yml',
+] );
+
+// Files to ignore for --git-changed.
+const ignoreFiles = [ '**/*.md', '**/*.txt' ];
+
+export const command = 'dependencies <subcommand> [projects...]';
+export const describe = 'Report monorepo project dependencies';
+
+/**
+ * Options definition for the dependencies subcommand.
+ *
+ * @param {object} yargs - The Yargs dependency.
+ * @returns {object} Yargs with the build commands defined.
+ */
+export function builder( yargs ) {
+	return yargs
+		.positional( 'subcommand', {
+			describe:
+				'Whether to print `json` dependency data, a `list` of projects, or print a `build-order`.',
+			type: 'string',
+			choices: [ 'json', 'list', 'build-order' ],
+		} )
+		.positional( 'projects', {
+			describe: 'Only include dependencies relevant to these projects.',
+			type: 'string',
+		} )
+		.option( 'git-changed', {
+			describe: 'Include projects changed in git. Value is as appropriate for `git diff`.',
+			type: 'string',
+		} )
+		.option( 'add-dependencies', {
+			describe: 'Include the dependencies of the named projects.',
+			type: 'boolean',
+		} )
+		.option( 'add-dependents', {
+			describe: 'Include the dependents of the named projects.',
+			type: 'boolean',
+		} )
+		.option( 'extra', {
+			describe: 'Extra dependencies to consider.',
+			type: 'string',
+			choices: [ 'build', 'test' ],
+		} )
+		.option( 'ignore-root', {
+			describe: 'Ignore the monorepo root.',
+			type: 'boolean',
+		} )
+		.option( 'pretty', {
+			describe: 'Pretty-print JSON or build-order output.',
+			type: 'boolean',
+		} );
+}
+
+/**
+ * Handles the dependencies command.
+ *
+ * @param {object} argv - the arguments passed.
+ */
+export async function handler( argv ) {
+	let deps = await getDependencies( process.cwd(), argv.extra );
+
+	if ( argv.ignoreRoot ) {
+		deps.delete( 'monorepo' );
+	}
+
+	if ( argv.gitChanged ) {
+		const stdout = await new Promise( ( resolve, reject ) => {
+			// eslint-disable-next-line no-shadow
+			let stdout = '';
+			const p = spawn(
+				'git',
+				[
+					'-c',
+					'core.quotepath=off',
+					'diff',
+					'--no-renames',
+					'--name-only',
+					argv.gitChanged,
+					'--',
+				],
+				{
+					cwd: process.cwd(),
+					stdio: [ 'ignore', 'pipe', 'inherit' ],
+				}
+			);
+			p.stdout.on( 'data', data => {
+				stdout += data;
+			} );
+			p.on( 'error', reject );
+			p.on( 'close', code =>
+				code === 0 ? resolve( stdout ) : reject( new Error( `Git exited with code ${ code }` ) )
+			);
+		} );
+
+		const projset = new Set( argv.projects );
+		const ig = ignore().add( ignoreFiles );
+		const debug = argv.v ? m => console.error( chalk.stderr.blue( m ) ) : () => {};
+		for ( const file of stdout.split( '\n' ).filter( v => v.length ) ) {
+			if ( infrastructureFiles.has( file ) ) {
+				debug( `Diff touches infrastructure file ${ file }, considering all projects as changed.` );
+				Array.from( deps.keys() ).forEach( k => projset.add( k ) );
+				break;
+			}
+			const slug = file.match( /^projects\/([^/]+\/[^/]+)\// )?.[ 1 ] || 'monorepo';
+			if ( ! projset.has( slug ) ) {
+				if ( ig.ignores( file ) ) {
+					debug( `Diff touches ${ file }, which is on the ignore list.` );
+				} else {
+					debug( `Diff touches ${ file }, marking ${ slug } as changed.` );
+					projset.add( slug );
+				}
+			}
+		}
+		argv.projects = [ ...projset ];
+
+		// If the diff touched nothing, we output nothing.
+		if ( projset.size === 0 ) {
+			deps.clear();
+		}
+	}
+
+	if ( argv.projects.length ) {
+		deps = filterDeps( deps, argv.projects, {
+			dependencies: argv.addDependencies,
+			dependents: argv.addDependents,
+		} );
+	}
+
+	if ( argv.subcommand === 'json' ) {
+		console.log(
+			JSON.stringify(
+				deps,
+				( k, v ) => {
+					if ( v instanceof Map ) {
+						return Object.fromEntries( v.entries() );
+					}
+					if ( v instanceof Set ) {
+						return [ ...v ];
+					}
+					return v;
+				},
+				argv.pretty ? '\t' : null
+			)
+		);
+		return;
+	}
+
+	if ( argv.subcommand === 'list' ) {
+		if ( deps.size ) {
+			console.log( Array.from( deps.keys() ).join( '\n' ) );
+		}
+		return;
+	}
+
+	if ( argv.subcommand === 'build-order' ) {
+		const order = getBuildOrder( deps );
+		for ( const group of order ) {
+			console.log( Array.from( group ).join( argv.pretty ? '\n' : ' ' ) );
+		}
+		return;
+	}
+}
diff --git a/tools/cli/commands/docker.js b/tools/cli/commands/docker.js
index 7f4f324eed7bd..63ed53e229940 100644
--- a/tools/cli/commands/docker.js
+++ b/tools/cli/commands/docker.js
@@ -430,10 +430,20 @@ const execJtCmdHandler = argv => {
 		opts.push( 'break' );
 	} else if ( arg === 'jt-up' ) {
 		cmd = jtTunnelFile;
+		console.warn(
+			chalk.yellow(
+				'Remember! This is creating a tunnel to your local machine. Please use jetpack docker jt-down as soon as you are done with your testing.'
+			)
+		);
 	}
 
 	const jtResult = executor( argv, () => shellExecutor( argv, cmd, opts.concat( jtOpts ) ) );
 	checkProcessResult( jtResult );
+	console.warn(
+		chalk.yellow(
+			'Remember! This is creating a tunnel to your local machine. Please use jetpack docker jt-down as soon as you are done with your testing.'
+		)
+	);
 };
 
 /**
diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js
index 307387b2e12f0..c1979e518fa7a 100644
--- a/tools/cli/commands/generate.js
+++ b/tools/cli/commands/generate.js
@@ -7,6 +7,7 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
+import semver from 'semver';
 import yaml from 'js-yaml';
 
 /**
@@ -329,6 +330,17 @@ function createPackageJson( packageJson, answers ) {
 				"NODE_ENV=test NODE_PATH=tests:. js-test-runner --jsdom --initfile=test-main.jsx 'glob:./!(node_modules)/**/test/*.@(jsx|js)'",
 		};
 		packageJson.devDependencies = { 'jetpack-js-test-runner': 'workspace:*' };
+
+		// Since `createComposerJson()` adds a use of `nyc`, we need to depend on it here too.
+		// Look for which version is currently in use.
+		const yamlFile = yaml.load(
+			fs.readFileSync( new URL( '../../../pnpm-lock.yaml', import.meta.url ), 'utf8' )
+		);
+		const nycVersion = Object.keys( yamlFile.packages ).reduce( ( value, cur ) => {
+			const ver = cur.match( /^\/nyc\/([^_]+)/ )?.[ 1 ];
+			return ! value || ( ver && semver.gt( ver, value ) ) ? ver : value;
+		}, null );
+		packageJson.devDependencies.nyc = nycVersion || '*';
 	}
 }
 
diff --git a/tools/cli/commands/install.js b/tools/cli/commands/install.js
index 4da1d6129b1a8..b09111cf3d984 100644
--- a/tools/cli/commands/install.js
+++ b/tools/cli/commands/install.js
@@ -2,48 +2,55 @@
  * External dependencies
  */
 import chalk from 'chalk';
+import execa from 'execa';
+import fs from 'fs/promises';
 import Listr from 'listr';
+import VerboseRenderer from 'listr-verbose-renderer';
+import UpdateRenderer from 'listr-update-renderer';
 
 /**
  * Internal dependencies
  */
 import promptForProject from '../helpers/promptForProject.js';
-import installProjectTask from '../helpers/tasks/installProjectTask.js';
+import { coerceConcurrency } from '../helpers/normalizeArgv.js';
+import { needsPnpmInstall, getInstallArgs, projectDir } from '../helpers/install.js';
 import { allProjects } from '../helpers/projectHelpers.js';
-import { normalizeInstallArgv, normalizeProject } from '../helpers/normalizeArgv.js';
-import listrOpts from '../helpers/tasks/listrOpts.js';
+
+export const command = 'install [project...]';
+export const describe = 'Installs a monorepo project';
 
 /**
- * Installs a project.
+ * Options definition for the install subcommand.
  *
- * @param {object} argv - Passthrough of the argv to include project, root, etc options.
+ * @param {object} yargs - The Yargs dependency.
+ * @returns {object} Yargs with the install commands defined.
  */
-export async function install( argv ) {
-	argv = normalizeInstallArgv( argv );
-
-	let tasks = [];
-	if ( argv.all ) {
-		allProjects().forEach( item => {
-			argv.project = item;
-			tasks.push( installProjectTask( argv ) );
+export function builder( yargs ) {
+	return yargs
+		.positional( 'project', {
+			describe: 'Project in the form of type/name, e.g. plugins/jetpack',
+			type: 'string',
+		} )
+		.option( 'root', {
+			alias: 'r',
+			type: 'boolean',
+			description: 'Install the monorepo dependencies',
+		} )
+		.option( 'all', {
+			alias: 'a',
+			type: 'boolean',
+			description: 'Installs everything',
+		} )
+		.option( 'no-pnpm-install', {
+			type: 'boolean',
+			description: 'Skip execution of `pnpm install`.',
+		} )
+		.option( 'concurrency', {
+			type: 'number',
+			description: 'Maximum number of install tasks to run at once. Ignored with `--verbose`.',
+			default: Infinity,
+			coerce: coerceConcurrency,
 		} );
-		// Reset.
-		argv.root = true;
-		argv.project = '';
-	}
-
-	tasks = addRootInstallTask( argv, tasks );
-
-	argv.project ? tasks.push( installProjectTask( argv ) ) : null;
-
-	const opts = listrOpts( argv );
-
-	const installs = new Listr( tasks, opts );
-
-	installs.run().catch( err => {
-		console.error( err );
-		process.exit( err.exitCode || 1 );
-	} );
 }
 
 /**
@@ -51,68 +58,70 @@ export async function install( argv ) {
  *
  * @param {object} argv - The argv for the command line.
  */
-export async function installCli( argv ) {
-	argv = normalizeInstallArgv( argv );
-	argv = normalizeProject( argv );
+export async function handler( argv ) {
+	if ( argv.project.length === 1 ) {
+		if ( argv.project[ 0 ].indexOf( '/' ) < 0 ) {
+			argv.type = argv.project[ 0 ];
+			argv.project = [];
+		}
+	}
 
-	if ( ! argv.root && ! argv.all ) {
-		argv = await promptForProject( argv );
+	if ( argv.all ) {
+		argv.project = allProjects();
+	}
+	if ( argv.all || argv.root ) {
+		argv.project.unshift( 'monorepo' );
 	}
 
-	if ( argv.project || argv.root || argv.all ) {
-		await install( argv );
-	} else {
-		console.error( chalk.red( 'You did not choose a valid project!' ) );
+	if ( argv.project.length === 0 ) {
+		argv.project = '';
+		argv = await promptForProject( argv );
+		argv.project = [ argv.project ];
 	}
-}
 
-/**
- * Command definition for the install subcommand.
- *
- * @param {object} yargs - The Yargs dependency.
- * @returns {object} Yargs with the install commands defined.
- */
-export function installDefine( yargs ) {
-	yargs.command(
-		'install [project]',
-		'Installs a monorepo project',
-		yarg => {
-			yarg
-				.positional( 'project', {
-					describe: 'Project in the form of type/name, e.g. plugins/jetpack',
-					type: 'string',
-				} )
-				.option( 'root', {
-					alias: 'r',
-					type: 'boolean',
-					description: 'Install the monorepo dependencies',
-				} )
-				.option( 'all', {
-					alias: 'a',
-					type: 'boolean',
-					description: 'Installs everything',
-				} );
-		},
-		async argv => {
-			await installCli( argv );
-			if ( argv.v ) {
-				console.log( argv );
-			}
+	const stdio = argv.v ? [ 'ignore', 'inherit', 'inherit' ] : [ 'ignore', 'ignore', 'ignore' ];
+	const tasks = [];
+	let didPnpm = false;
+
+	for ( const project of new Set( argv.project ) ) {
+		// Does the project even exist?
+		if (
+			( await fs.access( projectDir( project, 'composer.json' ) ).catch( () => false ) ) === false
+		) {
+			console.error( chalk.red( `Project ${ project } does not exist!` ) );
+			continue;
 		}
-	);
 
-	return yargs;
-}
+		// Do we need pnpm for this project?
+		if ( argv.pnpmInstall !== false && ! didPnpm && ( await needsPnpmInstall( project ) ) ) {
+			didPnpm = true;
+			tasks.unshift( {
+				title: `Installing pnpm dependencies`,
+				task: async () =>
+					execa( 'pnpm', await getInstallArgs( 'monorepo', 'pnpm', argv ), {
+						cwd: process.cwd(),
+						stdio,
+					} ),
+			} );
+		}
 
-/**
- * Conditionally add the root install task
- *
- * @param {object} argv - The argv object
- * @param {Array} tasks - The tasks array
- * @returns {Array} The tasks array
- */
-function addRootInstallTask( argv, tasks ) {
-	normalizeInstallArgv( argv );
-	argv.root ? tasks.push( installProjectTask( argv ) ) : null;
-	return tasks;
+		// Composer install.
+		tasks.push( {
+			title: `Installing composer dependencies for ${ project }`,
+			task: async () =>
+				execa( 'composer', await getInstallArgs( project, 'composer', argv ), {
+					cwd: projectDir( project ),
+					stdio,
+				} ),
+		} );
+	}
+
+	const listr = new Listr( tasks, {
+		concurrent: argv.v ? false : argv.concurrency,
+		renderer: argv.v ? VerboseRenderer : UpdateRenderer,
+	} );
+	await listr.run().catch( err => {
+		console.error( err );
+		process.exit( err.exitCode || 1 );
+	} );
 }
diff --git a/tools/cli/commands/test.js b/tools/cli/commands/test.js
index 0e0117762545c..117c6d069b3af 100644
--- a/tools/cli/commands/test.js
+++ b/tools/cli/commands/test.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import chalk from 'chalk';
+import execa from 'execa';
 import inquirer from 'inquirer';
 import child_process from 'child_process';
 import path from 'path';
@@ -12,7 +13,7 @@ import UpdateRenderer from 'listr-update-renderer';
 /**
  * Internal dependencies
  */
-import installProjectTask from '../helpers/tasks/installProjectTask.js';
+import { getInstallArgs, projectDir } from '../helpers/install.js';
 import promptForProject from '../helpers/promptForProject.js';
 import { readComposerJson } from '../helpers/json.js';
 import { allProjects } from '../helpers/projectHelpers.js';
@@ -137,9 +138,27 @@ async function getTestInstructions( argv ) {
  */
 async function runTest( argv ) {
 	const installer = new Listr(
-		[ installProjectTask( { project: argv.project, v: argv.verbose } ) ],
+		[
+			{
+				title: `Installing pnpm dependencies`,
+				task: async () =>
+					execa( 'pnpm', await getInstallArgs( 'monorepo', 'pnpm', argv ), {
+						cwd: process.cwd(),
+						stdio: argv.v ? 'inherit' : 'ignore',
+					} ),
+			},
+			{
+				title: `Installing composer dependencies`,
+				task: async () =>
+					execa( 'composer', await getInstallArgs( argv.project, 'composer', argv ), {
+						cwd: projectDir( argv.project ),
+						stdio: argv.v ? 'inherit' : 'ignore',
+					} ),
+			},
+		],
 		{
-			renderer: argv.verbose ? VerboseRenderer : UpdateRenderer,
+			concurrent: ! argv.v,
+			renderer: argv.v ? VerboseRenderer : UpdateRenderer,
 		}
 	);
 	await installer.run();
diff --git a/tools/cli/helpers/dependencyAnalysis.js b/tools/cli/helpers/dependencyAnalysis.js
new file mode 100644
index 0000000000000..3b48d674abea4
--- /dev/null
+++ b/tools/cli/helpers/dependencyAnalysis.js
@@ -0,0 +1,175 @@
+/**
+ * External dependencies
+ */
+import fs from 'fs/promises';
+import glob from 'glob';
+import { promisify } from 'util';
+
+/**
+ * Collect project dependencies.
+ *
+ * @param {string} root - Monorepo root directory.
+ * @param {string|null} extra - Extra deps to include, "build" or "test".
+ * @returns {Map} Key is the project slug, value is a Set of slugs depended on.
+ */
+export async function getDependencies( root, extra = null ) {
+	const ret = new Map();
+
+	// Collect all project slugs.
+	ret.set( 'monorepo', new Set() );
+	for ( const file of await promisify( glob )( 'projects/*/*/composer.json', { cwd: root } ) ) {
+		ret.set( file.substring( 9, file.length - 14 ), new Set() );
+	}
+
+	// Collect package name→slug mappings.
+	const packageMap = new Map();
+	for ( const file of await promisify( glob )( 'projects/packages/*/composer.json', {
+		cwd: root,
+	} ) ) {
+		const slug = file.substring( 9, file.length - 14 );
+		if ( ! ret.has( slug ) ) {
+			// Not an actual project (should never happen here, but...).
+			continue;
+		}
+
+		const json = JSON.parse( await fs.readFile( `${ root }/${ file }`, { encoding: 'utf8' } ) );
+		if ( json.name ) {
+			packageMap.set( json.name, slug );
+		}
+	}
+
+	// Collect js-package name→slug mappings.
+	const jsPackageMap = new Map();
+	for ( const file of await promisify( glob )( 'projects/js-packages/*/package.json', {
+		cwd: root,
+	} ) ) {
+		const slug = file.substring( 9, file.length - 13 );
+		if ( ! ret.has( slug ) ) {
+			// Not an actual project.
+			continue;
+		}
+
+		const json = JSON.parse( await fs.readFile( `${ root }/${ file }`, { encoding: 'utf8' } ) );
+		if ( json.name ) {
+			jsPackageMap.set( json.name, slug );
+		}
+	}
+
+	// Collect dependencies.
+	for ( const [ slug, depset ] of ret.entries() ) {
+		const path = slug === 'monorepo' ? root : `${ root }/projects/${ slug }`;
+		const deps = [];
+
+		// Collect composer require, require-dev, and .extra.dependencies.
+		let json = JSON.parse( await fs.readFile( path + '/composer.json', { encoding: 'utf8' } ) );
+		for ( const [ pkg, pkgslug ] of packageMap.entries() ) {
+			if ( json.require?.[ pkg ] || json[ 'require-dev' ]?.[ pkg ] ) {
+				deps.push( pkgslug );
+			}
+		}
+		if ( extra && json.extra?.dependencies?.[ extra ] ) {
+			deps.push( ...json.extra.dependencies[ extra ] );
+		}
+
+		// Collect JS dependencies and devDependencies.
+		if ( ( await fs.access( path + '/package.json' ).catch( () => false ) ) !== false ) {
+			json = JSON.parse( await fs.readFile( path + '/package.json', { encoding: 'utf8' } ) );
+			for ( const [ pkg, pkgslug ] of jsPackageMap.entries() ) {
+				if ( json.dependencies?.[ pkg ] || json.devDependencies?.[ pkg ] ) {
+					deps.push( pkgslug );
+				}
+			}
+		}
+
+		// Sort the dependencies and put them in the set.
+		deps.sort().forEach( d => depset.add( d ) );
+	}
+
+	return ret;
+}
+
+/**
+ * Filter dependencies to a set of projects.
+ *
+ * @param {Map} deps - Dependencies.
+ * @param {string[]} projects - Projects to include.
+ * @param {object} options - Options.
+ * @param {boolean} options.dependencies - Keep the dependencies of the specified projects too.
+ * @param {boolean} options.dependents - Keep the dependents of the specified projects too.
+ * @returns {Map} Filtered dependencies.
+ */
+export function filterDeps( deps, projects, options = {} ) {
+	const keep = new Set( projects );
+
+	// Apply options.dependencies and options.dependents until there is no further change.
+	let l = 0;
+	while ( l !== keep.size ) {
+		l = keep.size;
+
+		if ( options.dependencies ) {
+			// Keep dependencies: For everything in keep, add its dependencies.
+			for ( const p of keep.values() ) {
+				for ( const d of deps.get( p ).values() ) {
+					keep.add( d );
+				}
+			}
+		}
+
+		if ( options.dependents ) {
+			// Keep dependents: For everything in deps (and not already kept), add it if any of its dependencies are in keep.
+			for ( const [ p, pd ] of deps.entries() ) {
+				if ( ! keep.has( p ) ) {
+					for ( const d of pd ) {
+						if ( keep.has( d ) ) {
+							keep.add( p );
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	const ret = new Map();
+	for ( const [ p, pd ] of deps.entries() ) {
+		if ( keep.has( p ) ) {
+			ret.set( p, new Set( [ ...pd ].filter( d => keep.has( d ) ) ) );
+		}
+	}
+
+	return ret;
+}
+
+/**
+ * List projects in build order.
+ *
+ * @param {Map} deps - Dependencies.
+ * @returns {string[][]} Groups of project slugs. Projects in each group only depend on earlier groups.
+ * @throws {Error} If the dependencies contain a cycle. The error object has a `deps` property with the residual dependencies.
+ */
+export function getBuildOrder( deps ) {
+	// We look for packages that have no outgoing dependencies, collect then and remove them from the dependency graph, then repeat.
+	// This is basically Kahn's algorithm with some steps interleaved.
+
+	const ret = [];
+	while ( deps.size > 0 ) {
+		const ok = Array.from( deps.keys() )
+			.filter( d => deps.get( d ).size === 0 )
+			.sort();
+		if ( ok.length === 0 ) {
+			const e = new Error( 'The dependency graph contains a cycle!' );
+			e.deps = deps;
+			throw e;
+		}
+		ret.push( ok );
+
+		for ( const slug of ok ) {
+			deps.delete( slug );
+		}
+		for ( const v of deps.values() ) {
+			ok.forEach( d => v.delete( d ) );
+		}
+	}
+
+	return ret;
+}
diff --git a/tools/cli/helpers/format-duration.js b/tools/cli/helpers/format-duration.js
new file mode 100644
index 0000000000000..1b70894f33414
--- /dev/null
+++ b/tools/cli/helpers/format-duration.js
@@ -0,0 +1,31 @@
+/**
+ * External dependencies
+ */
+import { sprintf } from 'sprintf-js';
+
+/**
+ * A function to format a duration as h:m:s.
+ *
+ * @param {number} duration - Duration in milliseconds.
+ * @returns {string} Formatted duration.
+ */
+export default function formatDuration( duration ) {
+	let n = '';
+	if ( duration < 0 ) {
+		n = '-';
+		duration = -duration;
+	}
+	duration = Math.floor( duration );
+
+	return (
+		n +
+		// eslint-disable-next-line @wordpress/valid-sprintf -- This isn't WordPress's i18n sprintf.
+		sprintf(
+			'%d:%02d:%02d.%03d',
+			Math.floor( duration / 3600000 ), // https://github.com/alexei/sprintf.js/issues/103
+			Math.floor( duration / 60000 ) % 60,
+			Math.floor( duration / 1000 ) % 60,
+			duration % 1000
+		).replace( /^[0:]+(?!\.)/, '' )
+	);
+}
diff --git a/tools/cli/helpers/install.js b/tools/cli/helpers/install.js
new file mode 100644
index 0000000000000..d31bee9647ff3
--- /dev/null
+++ b/tools/cli/helpers/install.js
@@ -0,0 +1,75 @@
+/**
+ * External dependencies
+ */
+import fs from 'fs/promises';
+import path from 'path';
+import execa from 'execa';
+
+/**
+ * Test if a lockfile is checked in.
+ *
+ * @param {string} project - Project slug.
+ * @param {string} lockFile - Lock file name.
+ * @returns {boolean} - Whether the lock file exists and is checked in.
+ */
+async function hasLockFile( project, lockFile ) {
+	const cwd = projectDir( project );
+	if ( ( await fs.access( cwd + '/' + lockFile ).catch( () => false ) ) === false ) {
+		return false;
+	}
+	const { stdout } = await execa( 'git', [ 'ls-files', lockFile ], { cwd: cwd } );
+	return !! stdout;
+}
+
+/**
+ * Get the directory for a slug.
+ *
+ * @param {string} project - Project slug.
+ * @param {string} file - File within the project to find.
+ * @returns {string} Path.
+ */
+export function projectDir( project, file = '.' ) {
+	return path.resolve( project === 'monorepo' ? '.' : `projects/${ project }`, file );
+}
+
+/**
+ * Test if `pnpm install` is needed for a project.
+ *
+ * @param {string} project - Project slug.
+ * @returns {boolean} Whether `pnpm install` is needed.
+ */
+export async function needsPnpmInstall( project ) {
+	if ( project === 'monorepo' ) {
+		return true;
+	}
+	return (
+		( await fs.access( projectDir( project, 'package.json' ) ).catch( () => false ) ) !== false
+	);
+}
+
+/**
+ * Determine install command arguments.
+ *
+ * @param {string} project - Project slug.
+ * @param {string} pkgMgr - Package manager.
+ * @param {object} argv - Argv object.
+ * @param {boolean} argv.production - Whether this is a production install.
+ * @returns {string[]} Args to pass to the package manager.
+ */
+export async function getInstallArgs( project, pkgMgr, argv ) {
+	const args = [];
+
+	// For composer, choose 'install' or 'update' depending on whether the lockfile is checked in.
+	// For pnpm, the lockfile is always checked in thanks to the workspace thing.
+	if ( pkgMgr === 'composer' ) {
+		args.push( ( await hasLockFile( project, 'composer.lock' ) ) ? 'install' : 'update' );
+		if ( project.startsWith( 'plugins/' ) && argv.production ) {
+			args.push( '-o', '--no-dev', '--classmap-authoritative', '--prefer-dist' );
+		}
+	} else if ( pkgMgr === 'pnpm' ) {
+		args.push( 'install' );
+	} else {
+		throw new Error( `Unknown package manager ${ pkgMgr }` );
+	}
+	return args;
+}
diff --git a/tools/cli/helpers/normalizeArgv.js b/tools/cli/helpers/normalizeArgv.js
index 9ec1c545d9284..6524d91f52810 100644
--- a/tools/cli/helpers/normalizeArgv.js
+++ b/tools/cli/helpers/normalizeArgv.js
@@ -3,40 +3,6 @@
  */
 import pluralize from 'pluralize';
 
-/**
- * Normalize the argv used for the install command.
- *
- * @param {object} argv - The argvs for the install command.
- * @returns {object} argv object with standard elements needed for the installer.
- */
-export function normalizeInstallArgv( argv ) {
-	return {
-		// Defaults.
-		project: '',
-		include: '',
-		root: false,
-		all: false,
-		dist: false,
-		v: false,
-		// Override from `argv`.
-		...argv,
-	};
-}
-
-/**
- * Normalize the argv used for the build command.
- *
- * @param {object} argv - The argvs for the install command.
- * @returns {object} argv object with standard elements needed for the installer.
- */
-export function normalizeBuildArgv( argv ) {
-	return {
-		project: '',
-		production: false,
-		...argv,
-	};
-}
-
 /**
  * Normalize the argv used for the generate command.
  *
@@ -83,3 +49,19 @@ export function normalizeCleanArgv( argv ) {
 		...argv,
 	};
 }
+
+/**
+ * Check a concurrency value.
+ *
+ * Intended for use as a `coerce` in a yargs option definition.
+ *
+ * @param {number} v - Value to check.
+ * @returns {number} Number.
+ * @throws {Error} If the value is invalid.
+ */
+export function coerceConcurrency( v ) {
+	if ( v === Infinity || ( Number.isSafeInteger( v ) && v > 0 ) ) {
+		return v;
+	}
+	throw new Error( 'Concurrency value must be an integer greater than 0, or Infinity.' );
+}
diff --git a/tools/cli/helpers/prefix-stream.js b/tools/cli/helpers/prefix-stream.js
new file mode 100644
index 0000000000000..049435d3dc729
--- /dev/null
+++ b/tools/cli/helpers/prefix-stream.js
@@ -0,0 +1,111 @@
+/**
+ * External dependencies
+ */
+import { Buffer } from 'buffer';
+import * as stream from 'stream';
+
+/**
+ * Internal dependencies
+ */
+import formatDuration from './format-duration.js';
+
+/**
+ * A Transform stream to prefix each line with a string.
+ *
+ * The data is line buffered to try to avoid interleaved output.
+ */
+export default class PrefixTransformStream extends stream.Transform {
+	static #openBracket = Buffer.from( '[' );
+	static #sep = Buffer.from( ' ' );
+	static #closeBracket = Buffer.from( '] ' );
+
+	#prefix;
+	#startTime;
+	#rest;
+	#onDrain;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param {object} options - Options for stream constructors. In addition, the following options are recognized.
+	 * @param {string|Buffer|number[]|ArrayBuffer|Uint8Array|object} options.prefix - Prefix. Anything accepted by `Buffer.from()` is ok.
+	 * @param {boolean|number} options.time - Include time-since-start on each line. Value is the start timestamp (e.g. `Date.now()`), or boolean true to use `Date.now()`.
+	 */
+	constructor( options = {} ) {
+		const opts = { ...options };
+		delete opts.prefix, opts.time;
+		super( opts );
+
+		this.#prefix = Buffer.from( options.prefix || '' );
+		this.#rest = Buffer.alloc( 0 );
+		if ( options.time === true ) {
+			this.#startTime = Date.now();
+		} else if ( options.time ) {
+			this.#startTime = options.time;
+		}
+	}
+
+	/**
+	 * Push a line to the stream.
+	 *
+	 * @param {Buffer} line - Line to push.
+	 * @returns {boolean} Whether the push succeeded.
+	 */
+	#doPush( line ) {
+		if ( ! this.#prefix.length && ! this.#startTime ) {
+			return this.push( line );
+		}
+
+		// Push to the stream as a single buffer to try to avoid split writes.
+		const bufs = [ PrefixTransformStream.#openBracket ];
+		if ( this.#prefix.length > 0 ) {
+			bufs.push( this.#prefix );
+		}
+		if ( this.#startTime ) {
+			if ( bufs.length > 1 ) {
+				bufs.push( PrefixTransformStream.#sep );
+			}
+			bufs.push( Buffer.from( formatDuration( Date.now() - this.#startTime ) ) );
+		}
+		bufs.push( PrefixTransformStream.#closeBracket, line );
+
+		return this.push( Buffer.concat( bufs ) );
+	}
+
+	_transform( chunk, encoding, callback ) {
+		this.#rest = Buffer.concat( [ this.#rest, chunk ] );
+		const func = () => {
+			let i;
+			while ( ( i = this.#rest.indexOf( '\n' ) ) >= 0 ) {
+				const line = this.#rest.slice( 0, ++i );
+				this.#rest = this.#rest.slice( i );
+				if ( ! this.#doPush( line ) ) {
+					this.#onDrain = func;
+					return false;
+				}
+			}
+			callback();
+			return true;
+		};
+		func();
+	}
+
+	_flush( callback ) {
+		if ( this.#rest.length ) {
+			this.#doPush( this.#rest );
+		}
+		callback();
+	}
+
+	_read( size ) {
+		if ( this.#onDrain ) {
+			const onDrain = this.#onDrain;
+			this.#onDrain = null;
+			if ( onDrain() ) {
+				super._read( size );
+			}
+		} else {
+			super._read( size );
+		}
+	}
+}
diff --git a/tools/cli/helpers/projectBuildCommand.js b/tools/cli/helpers/projectBuildCommand.js
deleted file mode 100644
index b8a093ab396fa..0000000000000
--- a/tools/cli/helpers/projectBuildCommand.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Internal dependencies
- */
-import { readComposerJson } from './json.js';
-
-/**
- * Returns the project build command.
- *
- * @param {string} project - Project slug.
- * @param {boolean} production - If a production build is requested.
- * @returns {string} Build command, empty if none.
- */
-export default function projectBuildCommand( project, production ) {
-	const composerJson = readComposerJson( project, false );
-	let command = '';
-	if ( composerJson.scripts ) {
-		const buildDev = composerJson.scripts[ 'build-development' ]
-			? 'composer run --timeout=0 build-development'
-			: null;
-		const buildProd = composerJson.scripts[ 'build-production' ]
-			? 'composer run --timeout=0 build-production'
-			: null;
-		// If production, prefer production script. If dev, prefer dev. Either case, fall back to the other if exists.
-		command = production ? buildProd || buildDev : buildDev || buildProd;
-	}
-
-	return command;
-}
diff --git a/tools/cli/helpers/tasks/buildProjectTask.js b/tools/cli/helpers/tasks/buildProjectTask.js
deleted file mode 100644
index baa2559ae6c71..0000000000000
--- a/tools/cli/helpers/tasks/buildProjectTask.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * External dependencies
- */
-import process from 'process';
-import path from 'path';
-import execa from 'execa';
-
-/**
- * Internal dependencies
- */
-import { chalkJetpackGreen } from '../styling.js';
-import { normalizeBuildArgv } from '../normalizeArgv.js';
-import projectBuildCommand from '../projectBuildCommand.js';
-
-/**
- * Preps the task for an individual project.
- *
- * @param {object} argv - Argv object for an build command.
- * @returns {object} - The project install task per Listr format.
- */
-export default function buildProjectTask( argv ) {
-	argv = normalizeBuildArgv( argv );
-
-	// This should never happen. Hard exit to avoid errors in consuming code.
-	if ( ! argv.project ) {
-		console.error( 'You cannot create a build task for nothing.' );
-		process.exit( 1 );
-	}
-
-	const cwd = path.resolve( `projects/${ argv.project }` );
-	const command = projectBuildCommand( argv.project, argv.production );
-	let enabled = true;
-
-	if ( ! command ) {
-		// If neither build step is defined, abort.
-		enabled = false;
-	}
-
-	return {
-		title: chalkJetpackGreen( `Building ${ argv.project }` ),
-		enabled: () => {
-			return enabled;
-		},
-		task: () =>
-			argv.v
-				? execa.commandSync( command, { cwd: cwd, stdio: 'inherit' } )
-				: execa.command( command, { cwd: cwd } ),
-	};
-}
diff --git a/tools/cli/helpers/tasks/installProjectTask.js b/tools/cli/helpers/tasks/installProjectTask.js
deleted file mode 100644
index 1531680e8e7cd..0000000000000
--- a/tools/cli/helpers/tasks/installProjectTask.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * External dependencies
- */
-import process from 'process';
-import fs from 'fs';
-import path from 'path';
-import Listr from 'listr';
-import execa from 'execa';
-import chalk from 'chalk';
-import VerboseRenderer from 'listr-verbose-renderer';
-import UpdateRenderer from 'listr-update-renderer';
-
-/**
- * Internal dependencies
- */
-import { readComposerJson, readPackageJson } from '../json.js';
-import { chalkJetpackGreen } from '../styling.js';
-import { normalizeInstallArgv } from '../normalizeArgv.js';
-
-/**
- * The `pnpm install` command promise for this run.
- */
-let pnpmInstallPromise = null;
-
-/**
- * Test if a lockfile is checked in.
- *
- * @param {string} cwd - Path being processed.
- * @param {string} lockFile - Lock file name.
- * @returns {boolean} - Whether the lock file exists and is checked in.
- */
-async function hasLockFile( cwd, lockFile ) {
-	if ( ! fs.existsSync( path.resolve( cwd, lockFile ) ) ) {
-		return false;
-	}
-	const { stdout } = await execa.command( `git ls-files ${ lockFile }`, { cwd: cwd } );
-	return !! stdout;
-}
-
-/**
- * Preps the task for an individual project.
- *
- * @param {object} argv - Argv object for an install command. Must contain project and root at least.
- * @returns {object} - The project install task per Listr format.
- */
-export default function installProjectTask( argv ) {
-	argv = normalizeInstallArgv( argv );
-
-	// This should never happen. Hard exit to avoid errors in consuming code.
-	if ( ! argv.project && ! argv.root ) {
-		console.error( 'You cannot create an install task for nothing.' );
-		process.exit( 1 );
-	}
-	const cwd = argv.root ? process.cwd() : path.resolve( `projects/${ argv.project }` );
-	const composerEnabled = argv.root ? true : Boolean( readComposerJson( argv.project, false ) );
-	const pnpmEnabled = argv.root ? true : Boolean( readPackageJson( argv.project, false ) );
-	argv.project = argv.root ? 'Monorepo' : argv.project;
-
-	const command = async ( pkgMgr, verbose ) => {
-		// For composer, choose 'install' or 'update' depending on whether the lockfile is checked in.
-		// For pnpm, the lockfile is always checked in thanks to the workspace thing.
-		let subcommand;
-		let args = '';
-		if ( pkgMgr === 'composer' ) {
-			subcommand = ( await hasLockFile( cwd, 'composer.lock' ) ) ? 'install' : 'update';
-			if ( argv.project.startsWith( 'plugins/' ) && argv.production ) {
-				args += ' -o --no-dev --classmap-authoritative --prefer-dist';
-			}
-		} else if ( pkgMgr === 'pnpm' ) {
-			if ( pnpmInstallPromise ) {
-				return pnpmInstallPromise;
-			}
-			subcommand = 'install';
-		} else {
-			throw new Error( `Unknown package manager ${ pkgMgr }` );
-		}
-		const ret = verbose
-			? execa.commandSync( `${ pkgMgr } ${ subcommand } ${ args }`, { cwd: cwd, stdio: 'inherit' } )
-			: execa.command( `${ pkgMgr } ${ subcommand } ${ args }`, { cwd: cwd } );
-		if ( pkgMgr === 'pnpm' ) {
-			pnpmInstallPromise = ret;
-		}
-		return ret;
-	};
-
-	const task = ( pkgMgr, enabled ) => {
-		return {
-			title: chalkJetpackGreen( `Installing ${ pkgMgr } Dependencies` ),
-			enabled: () => {
-				return enabled;
-			},
-			task: () => command( pkgMgr.toLowerCase(), argv.v ),
-		};
-	};
-	const opts = {
-		concurrent: ! argv.v,
-		renderer: argv.v ? VerboseRenderer : UpdateRenderer,
-	};
-
-	return {
-		title: chalk.yellow( `Installing ${ argv.project }` ),
-		task: () => {
-			return new Listr(
-				[ task( 'Composer', composerEnabled ), task( 'Pnpm', pnpmEnabled ) ],
-				opts
-			);
-		},
-	};
-}
diff --git a/tools/cli/helpers/tasks/listrOpts.js b/tools/cli/helpers/tasks/listrOpts.js
deleted file mode 100644
index 643d14bb502d4..0000000000000
--- a/tools/cli/helpers/tasks/listrOpts.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * External dependencies
- */
-import VerboseRenderer from 'listr-verbose-renderer';
-import UpdateRenderer from 'listr-update-renderer';
-
-/**
- * Returns standard options for verbose renderers.
- *
- * @param {object} options - Argv from command line.
- * @returns {object} - Options object for Listr.
- */
-export default function listrOpts( options ) {
-	options = {
-		v: options.v || false,
-		...options,
-	};
-
-	return {
-		concurrent: ! options.v,
-		renderer: options.v ? VerboseRenderer : UpdateRenderer,
-	};
-}
diff --git a/tools/cli/package.json b/tools/cli/package.json
index 5dc434319d75d..09719cc97509a 100644
--- a/tools/cli/package.json
+++ b/tools/cli/package.json
@@ -28,15 +28,20 @@
 		"envfile": "6.17.0",
 		"execa": "5.0.0",
 		"glob": "7.1.6",
+		"ignore": "5.1.8",
 		"inquirer": "7.3.3",
 		"js-yaml": "4.1.0",
 		"listr": "0.14.3",
+		"listr-silent-renderer": "1.1.1",
 		"listr-update-renderer": "0.5.0",
 		"listr-verbose-renderer": "0.6.0",
+		"p-limit": "4.0.0",
 		"path-name": "1.0.0",
 		"pluralize": "8.0.0",
 		"process": "0.11.10",
+		"semver": "7.3.5",
 		"simple-git": "2.37.0",
+		"sprintf-js": "1.1.2",
 		"yargs": "16.2.0"
 	},
 	"devDependencies": {
diff --git a/tools/cli/tests/data/monorepo-cycle/composer.json b/tools/cli/tests/data/monorepo-cycle/composer.json
new file mode 100644
index 0000000000000..8af116201b35f
--- /dev/null
+++ b/tools/cli/tests/data/monorepo-cycle/composer.json
@@ -0,0 +1,6 @@
+{
+	"name": "automattic/jp-monorepo",
+	"require": {
+		"automattic/jp-a": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo-cycle/projects/packages/a/composer.json b/tools/cli/tests/data/monorepo-cycle/projects/packages/a/composer.json
new file mode 100644
index 0000000000000..8dd67a500ab06
--- /dev/null
+++ b/tools/cli/tests/data/monorepo-cycle/projects/packages/a/composer.json
@@ -0,0 +1,3 @@
+{
+	"name": "automattic/jp-a"
+}
diff --git a/tools/cli/tests/data/monorepo-cycle/projects/packages/b/composer.json b/tools/cli/tests/data/monorepo-cycle/projects/packages/b/composer.json
new file mode 100644
index 0000000000000..b811dee737833
--- /dev/null
+++ b/tools/cli/tests/data/monorepo-cycle/projects/packages/b/composer.json
@@ -0,0 +1,7 @@
+{
+	"name": "automattic/jp-b",
+	"require": {
+		"automattic/jp-a": "*",
+		"automattic/jp-c": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo-cycle/projects/packages/c/composer.json b/tools/cli/tests/data/monorepo-cycle/projects/packages/c/composer.json
new file mode 100644
index 0000000000000..486062acfa2c2
--- /dev/null
+++ b/tools/cli/tests/data/monorepo-cycle/projects/packages/c/composer.json
@@ -0,0 +1,9 @@
+{
+	"name": "automattic/jp-c",
+	"require": {
+		"automattic/jp-a": "*"
+	},
+	"require-dev": {
+		"automattic/jp-b": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo/composer.json b/tools/cli/tests/data/monorepo/composer.json
new file mode 100644
index 0000000000000..8af116201b35f
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/composer.json
@@ -0,0 +1,6 @@
+{
+	"name": "automattic/jp-monorepo",
+	"require": {
+		"automattic/jp-a": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/d/composer.json b/tools/cli/tests/data/monorepo/projects/js-packages/d/composer.json
new file mode 100644
index 0000000000000..a9bbcf4425d46
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/d/composer.json
@@ -0,0 +1,3 @@
+{
+	"name": "automattic/jp-d"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/d/package.json b/tools/cli/tests/data/monorepo/projects/js-packages/d/package.json
new file mode 100644
index 0000000000000..3edb4d632f45d
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/d/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "@automattic/jp-d"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/dummy/package.json b/tools/cli/tests/data/monorepo/projects/js-packages/dummy/package.json
new file mode 100644
index 0000000000000..e52759c4ddd24
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/dummy/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "@automattic/jp-dummy"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/e/composer.json b/tools/cli/tests/data/monorepo/projects/js-packages/e/composer.json
new file mode 100644
index 0000000000000..434355fb63305
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/e/composer.json
@@ -0,0 +1,3 @@
+{
+	"name": "automattic/jp-e"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/e/package.json b/tools/cli/tests/data/monorepo/projects/js-packages/e/package.json
new file mode 100644
index 0000000000000..399575f05b1b8
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/e/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "@automattic/jp-e"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/f/composer.json b/tools/cli/tests/data/monorepo/projects/js-packages/f/composer.json
new file mode 100644
index 0000000000000..3518d1da552d1
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/f/composer.json
@@ -0,0 +1,14 @@
+{
+	"name": "automattic/jp-f",
+	"extra": {
+		"dependencies": {
+			"build": [
+				"packages/b"
+			],
+			"test": [
+				"js-packages/d",
+				"js-packages/e"
+			]
+		}
+	}
+}
diff --git a/tools/cli/tests/data/monorepo/projects/js-packages/f/package.json b/tools/cli/tests/data/monorepo/projects/js-packages/f/package.json
new file mode 100644
index 0000000000000..6ea169b2e1d9a
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/js-packages/f/package.json
@@ -0,0 +1,3 @@
+{
+	"name": "@automattic/jp-f"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/packages/a/composer.json b/tools/cli/tests/data/monorepo/projects/packages/a/composer.json
new file mode 100644
index 0000000000000..8dd67a500ab06
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/packages/a/composer.json
@@ -0,0 +1,3 @@
+{
+	"name": "automattic/jp-a"
+}
diff --git a/tools/cli/tests/data/monorepo/projects/packages/b/composer.json b/tools/cli/tests/data/monorepo/projects/packages/b/composer.json
new file mode 100644
index 0000000000000..70bb1b92f3f74
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/packages/b/composer.json
@@ -0,0 +1,6 @@
+{
+	"name": "automattic/jp-b",
+	"require": {
+		"automattic/jp-a": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo/projects/packages/c/composer.json b/tools/cli/tests/data/monorepo/projects/packages/c/composer.json
new file mode 100644
index 0000000000000..486062acfa2c2
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/packages/c/composer.json
@@ -0,0 +1,9 @@
+{
+	"name": "automattic/jp-c",
+	"require": {
+		"automattic/jp-a": "*"
+	},
+	"require-dev": {
+		"automattic/jp-b": "*"
+	}
+}
diff --git a/tools/cli/tests/data/monorepo/projects/packages/c/package.json b/tools/cli/tests/data/monorepo/projects/packages/c/package.json
new file mode 100644
index 0000000000000..ec0bf3d82bcef
--- /dev/null
+++ b/tools/cli/tests/data/monorepo/projects/packages/c/package.json
@@ -0,0 +1,8 @@
+{
+	"dependencies": {
+		"@automattic/jp-d": "*"
+	},
+	"devDependencies": {
+		"@automattic/jp-e": "*"
+	}
+}
diff --git a/tools/cli/tests/integration/commands/commands.test.js b/tools/cli/tests/integration/commands/commands.test.js
index 7b68056a3aeda..a52afd45e98a4 100644
--- a/tools/cli/tests/integration/commands/commands.test.js
+++ b/tools/cli/tests/integration/commands/commands.test.js
@@ -10,7 +10,7 @@ const test = child_process.execFileSync( 'node', [ './tools/cli/bin/jetpack', '-
 
 describe( 'verify commands are available', function () {
 	it( 'build command exists', () => {
-		chai.expect( test ).to.contain( 'jetpack build [project]' );
+		chai.expect( test ).to.contain( 'jetpack build [project...]' );
 	} );
 	it( 'changelog command exists', () => {
 		chai.expect( test ).to.contain( 'jetpack changelog [cmd]' );
@@ -25,7 +25,7 @@ describe( 'verify commands are available', function () {
 		chai.expect( test ).to.contain( 'jetpack generate [type]' );
 	} );
 	it( 'install command exists', () => {
-		chai.expect( test ).to.contain( 'jetpack install [project]' );
+		chai.expect( test ).to.contain( 'jetpack install [project...]' );
 	} );
 	it( 'watch command exists', () => {
 		chai.expect( test ).to.contain( 'jetpack watch [project]' );
diff --git a/tools/cli/tests/unit/helpers/dependencyAnalysis.test.js b/tools/cli/tests/unit/helpers/dependencyAnalysis.test.js
new file mode 100644
index 0000000000000..4682a5191e09b
--- /dev/null
+++ b/tools/cli/tests/unit/helpers/dependencyAnalysis.test.js
@@ -0,0 +1,154 @@
+/**
+ * External dependencies
+ */
+import chai from 'chai';
+import { fileURLToPath } from 'url';
+
+/**
+ * Internal dependencies
+ */
+import { getDependencies, filterDeps, getBuildOrder } from '../../../helpers/dependencyAnalysis.js';
+
+const dataDir = fileURLToPath( new URL( '../../data', import.meta.url ) );
+
+const compareDeps = ( actual, expect ) => {
+	chai.expect( actual ).to.be.a( 'Map' );
+	const map = {};
+	for ( const [ k, v ] of actual ) {
+		chai.expect( v ).to.be.a( 'Set', k );
+		map[ k ] = [ ...v ];
+	}
+	chai.expect( map ).to.deep.equal( expect );
+};
+
+describe( 'dependencyAnalysis', () => {
+	describe( 'getDependencies', () => {
+		it( 'monorepo', async () => {
+			const ret = await getDependencies( dataDir + '/monorepo' );
+			compareDeps( ret, {
+				monorepo: [ 'packages/a' ],
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'packages/c': [ 'js-packages/d', 'js-packages/e', 'packages/a', 'packages/b' ],
+				'js-packages/d': [],
+				'js-packages/e': [],
+				'js-packages/f': [],
+			} );
+		} );
+
+		it( 'monorepo, build deps', async () => {
+			const ret = await getDependencies( dataDir + '/monorepo', 'build' );
+			compareDeps( ret, {
+				monorepo: [ 'packages/a' ],
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'packages/c': [ 'js-packages/d', 'js-packages/e', 'packages/a', 'packages/b' ],
+				'js-packages/d': [],
+				'js-packages/e': [],
+				'js-packages/f': [ 'packages/b' ],
+			} );
+		} );
+
+		it( 'monorepo, test deps', async () => {
+			const ret = await getDependencies( dataDir + '/monorepo', 'test' );
+			compareDeps( ret, {
+				monorepo: [ 'packages/a' ],
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'packages/c': [ 'js-packages/d', 'js-packages/e', 'packages/a', 'packages/b' ],
+				'js-packages/d': [],
+				'js-packages/e': [],
+				'js-packages/f': [ 'js-packages/d', 'js-packages/e' ],
+			} );
+		} );
+
+		it( 'monorepo-cycle', async () => {
+			const ret = await getDependencies( dataDir + '/monorepo-cycle' );
+			compareDeps( ret, {
+				monorepo: [ 'packages/a' ],
+				'packages/a': [],
+				'packages/b': [ 'packages/a', 'packages/c' ],
+				'packages/c': [ 'packages/a', 'packages/b' ],
+			} );
+		} );
+	} );
+
+	describe( 'filterDeps', () => {
+		it( 'listed packages', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo', 'build' );
+			deps.delete( 'monorepo' );
+			const filteredDeps = filterDeps( deps, [ 'packages/a', 'packages/b', 'packages/c' ] );
+			compareDeps( filteredDeps, {
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'packages/c': [ 'packages/a', 'packages/b' ],
+			} );
+		} );
+
+		it( 'dependencies', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo', 'build' );
+			const filteredDeps = filterDeps( deps, [ 'js-packages/f' ], { dependencies: true } );
+			compareDeps( filteredDeps, {
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'js-packages/f': [ 'packages/b' ],
+			} );
+		} );
+
+		it( 'dependents', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo', 'build' );
+			const filteredDeps = filterDeps( deps, [ 'packages/b' ], { dependents: true } );
+			compareDeps( filteredDeps, {
+				'packages/b': [],
+				'packages/c': [ 'packages/b' ],
+				'js-packages/f': [ 'packages/b' ],
+			} );
+		} );
+
+		it( 'dependencies and dependents', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo' );
+			const filteredDeps = filterDeps( deps, [ 'packages/b' ], {
+				dependencies: true,
+				dependents: true,
+			} );
+			compareDeps( filteredDeps, {
+				monorepo: [ 'packages/a' ],
+				'packages/a': [],
+				'packages/b': [ 'packages/a' ],
+				'packages/c': [ 'js-packages/d', 'js-packages/e', 'packages/a', 'packages/b' ],
+				'js-packages/d': [],
+				'js-packages/e': [],
+			} );
+		} );
+	} );
+
+	describe( 'getBuildOrder', () => {
+		it( 'monorepo', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo', 'build' );
+			deps.delete( 'monorepo' );
+			chai
+				.expect( getBuildOrder( deps ) )
+				.to.deep.equal( [
+					[ 'js-packages/d', 'js-packages/e', 'packages/a' ],
+					[ 'packages/b' ],
+					[ 'js-packages/f', 'packages/c' ],
+				] );
+		} );
+
+		it( 'monorepo-cycle', async () => {
+			const deps = await getDependencies( dataDir + '/monorepo-cycle', 'build' );
+			deps.delete( 'monorepo' );
+			try {
+				getBuildOrder( deps );
+				chai.assert.fail( 'Call was supposed to fail' );
+			} catch ( e ) {
+				chai.expect( e ).to.be.an( 'Error' );
+				chai.expect( e.message ).to.equal( 'The dependency graph contains a cycle!' );
+				compareDeps( e.deps, {
+					'packages/b': [ 'packages/c' ],
+					'packages/c': [ 'packages/b' ],
+				} );
+			}
+		} );
+	} );
+} );
diff --git a/tools/cli/tests/unit/helpers/format-duration.test.js b/tools/cli/tests/unit/helpers/format-duration.test.js
new file mode 100644
index 0000000000000..1d8e8a1e16fbd
--- /dev/null
+++ b/tools/cli/tests/unit/helpers/format-duration.test.js
@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import chai from 'chai';
+
+/**
+ * Internal dependencies
+ */
+import formatDuration from '../../../helpers/format-duration.js';
+
+const tests = {
+	0: '0.000',
+	1: '0.001',
+	999: '0.999',
+	1000: '1.000',
+	59999: '59.999',
+	60000: '1:00.000',
+	3599999: '59:59.999',
+	3600000: '1:00:00.000',
+	86399999: '23:59:59.999',
+	86400000: '24:00:00.000',
+	'-1': '-0.001',
+	'-1000': '-1.000',
+	'-60000': '-1:00.000',
+	'0.0000000005': '0.000',
+};
+
+for ( const [ k, v ] of Object.entries( tests ) ) {
+	it( `formats ${ k }`, () => {
+		chai.expect( formatDuration( Number( k ) ) ).to.equal( v );
+	} );
+}
diff --git a/tools/cli/tests/unit/helpers/prefix-stream.test.js b/tools/cli/tests/unit/helpers/prefix-stream.test.js
new file mode 100644
index 0000000000000..9c094688c6e93
--- /dev/null
+++ b/tools/cli/tests/unit/helpers/prefix-stream.test.js
@@ -0,0 +1,115 @@
+/**
+ * External dependencies
+ */
+import chai from 'chai';
+
+/**
+ * Internal dependencies
+ */
+import PrefixTransformStream from '../../../helpers/prefix-stream.js';
+
+it( 'prefixes', async () => {
+	const ts = new PrefixTransformStream( { prefix: 'foobar', encoding: 'utf8' } );
+
+	ts.write( 'line 1\n' );
+	chai.expect( ts.read() ).to.equal( '[foobar] line 1\n' );
+	ts.write( 'line 2...' );
+	chai.expect( ts.read() ).to.equal( null );
+	ts.write( ' ... done\n' );
+	chai.expect( ts.read() ).to.equal( '[foobar] line 2... ... done\n' );
+	ts.write( 'line 3\nline 4\nline 5\n' );
+	chai.expect( ts.read() ).to.equal( '[foobar] line 3\n[foobar] line 4\n[foobar] line 5\n' );
+	ts.write( 'line 6\nline 7' );
+	chai.expect( ts.read() ).to.equal( '[foobar] line 6\n' );
+	ts.write( '...\nline 8' );
+	chai.expect( ts.read() ).to.equal( '[foobar] line 7...\n' );
+	ts.end();
+	chai.expect( ts.read() ).to.equal( '[foobar] line 8' );
+} );
+
+it( "doesn't produce a stray prefix if EOF is a newline", async () => {
+	const ts = new PrefixTransformStream( { prefix: 'foobar', encoding: 'utf8' } );
+
+	ts.write( 'line 1\n' );
+	ts.end();
+	chai.expect( ts.read() ).to.equal( '[foobar] line 1\n' );
+} );
+
+it( "doesn't produce a stray prefix if nothing was written", async () => {
+	const ts = new PrefixTransformStream( { prefix: 'foobar', encoding: 'utf8' } );
+
+	ts.end();
+	chai.expect( ts.read() ).to.equal( null );
+} );
+
+it( 'prefixes with timing info', async () => {
+	const ts = new PrefixTransformStream( { prefix: 'foobar', encoding: 'utf8', time: true } );
+
+	ts.write( 'line 1\nline 2' );
+	chai.expect( ts.read() ).to.match( /^\[foobar 0\.0\d\d\] line 1\n$/ );
+	await new Promise( r => {
+		setTimeout( r, 100 );
+	} );
+	ts.end();
+	chai.expect( ts.read() ).to.match( /^\[foobar 0\.1\d\d\] line 2$/ );
+} );
+
+it( 'prefixes with timing info but no prefix', async () => {
+	const ts = new PrefixTransformStream( { encoding: 'utf8', time: Date.now() - 3723000 } );
+
+	ts.write( 'line 1\n' );
+	chai.expect( ts.read() ).to.match( /^\[1:02:03\.0\d\d\] line 1\n$/ );
+} );
+
+it( "doesn't prefix with no timing info and no prefix", async () => {
+	const ts = new PrefixTransformStream( { encoding: 'utf8' } );
+
+	ts.write( 'line 1\n' );
+	chai.expect( ts.read() ).to.equal( 'line 1\n' );
+} );
+
+it( "doesn't die from backpressure", async () => {
+	const ts = new PrefixTransformStream( {
+		prefix: 'foobar',
+		encoding: 'utf8',
+		highWaterMark: 100,
+	} );
+
+	let drains = 0;
+	let n = 0;
+	let expect = '';
+	let actual = '';
+	while ( drains < 2 ) {
+		expect += `[foobar] line ${ ++n }...\n`;
+		if ( ts.write( `line ${ n }...\n` ) === false ) {
+			drains++;
+			actual += ts.read();
+		}
+	}
+	ts.end();
+	actual += ts.read();
+	chai.expect( actual ).to.equal( expect );
+} );
+
+it( "doesn't die from backpressure (2)", async () => {
+	const ts = new PrefixTransformStream( {
+		prefix: 'foobar',
+		encoding: 'utf8',
+		highWaterMark: 100,
+	} );
+
+	let n = 0;
+	let expect = '';
+	do {
+		expect += `[foobar] line ${ ++n }...\n`;
+	} while ( ts.write( `line ${ n }...\n` ) !== false );
+	ts.end( 'end' );
+	expect += `[foobar] end`;
+
+	let actual = '';
+	let chunk;
+	while ( ( chunk = ts.read() ) !== null ) {
+		actual += chunk;
+	}
+	chai.expect( actual ).to.equal( expect );
+} );
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index cf53e35614f7f..4e73d72ec9a93 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:21.10
 
 VOLUME ["/var/www/html"]
 
diff --git a/tools/docker/README.md b/tools/docker/README.md
index 1581f1dfe9f65..6a80d1b47e57c 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -43,9 +43,11 @@ Non-installed WordPress is running at [http://localhost](http://localhost) now.
 jetpack docker install
 ```
 
-At this point, we encourage you to set up a service that can create local HTTP tunnels, such as [the Jurassic Tube Tunneling Service](#jurassic-tube-tunneling-service) if you are an Automattician, [ngrok](#using-ngrok-with-jetpack), or [another similar service](https://alternativeto.net/software/ngrok/).
+At this point, to connect Jetpack, you'd need to set up a service that can create local HTTP tunnels, such as [the Jurassic Tube Tunneling Service](#jurassic-tube-tunneling-service) (available to Automatticians only), [ngrok](#using-ngrok-with-jetpack), or [another similar service](https://alternativeto.net/software/ngrok/).
 With such a service, your site will be publicly accessible and you will be able to connect Jetpack to WordPress.com.
 
+**Warning: These solutions create a public tunnel to your system. You should only activate the tunnel while actively needing it and deactivate when you are finished.**
+
 _You are now ready to login to your new WordPress install and connect Jetpack, congratulations!_
 
 You should follow [Jetpack’s development documentation](../../docs/development-environment.md#development-workflow) for installing Jetpack’s dependencies and building files. Docker setup does not build these for you.
@@ -281,7 +283,7 @@ jetpack docker jt-up
 
 ## Using Ngrok with Jetpack
 
-Note: While Ngrok is technically supported for everyone, Jurassic Tube should be considered as preferred tunneling solution for Automatticians.
+Note: While Ngrok is technically supported for everyone, Jurassic Tube is used by the Jetpack team and is available to all Automatticians.
 
 To be able to connect Jetpack you will need a domain - you can use [Ngrok.com](https://ngrok.com/) to assign one.
 
diff --git a/tools/docker/bin/run.sh b/tools/docker/bin/run.sh
index fdcc28bc6d7d9..ad2ae6aa7106e 100755
--- a/tools/docker/bin/run.sh
+++ b/tools/docker/bin/run.sh
@@ -39,6 +39,7 @@ if [ ! -f /var/www/html/wp-config.php ]; then
 	wp --allow-root config set WP_DEBUG true --raw --type=constant
 	wp --allow-root config set WP_DEBUG_LOG true --raw --type=constant
 	wp --allow-root config set WP_DEBUG_DISPLAY false --raw --type=constant
+	wp --allow-root config set SCRIPT_DEBUG true --raw --type=constant
 
 	# Respecting Dockerfile-forwarded environment variables
 	# Allow to be reverse-proxied from https
diff --git a/tools/docker/jetpack-docker-config-default.yml b/tools/docker/jetpack-docker-config-default.yml
index dc5259889e62c..7bd18d37021e2 100644
--- a/tools/docker/jetpack-docker-config-default.yml
+++ b/tools/docker/jetpack-docker-config-default.yml
@@ -56,3 +56,4 @@ e2e:
   volumeMappings:
     tools/e2e-commons/plugins/e2e-plugin-updater.php: /var/www/html/wp-content/plugins/e2e-plugin-updater.php
     tools/e2e-commons/plugins/e2e-plan-data-interceptor.php: /var/www/html/wp-content/plugins/e2e-plan-data-interceptor.php
+    projects/plugins/boost/tests/e2e/plugins/e2e-mock-speed-score-api.php: /var/www/html/wp-content/plugins/e2e-mock-speed-score-api.php
diff --git a/tools/e2e-commons/bin/e2e-env.sh b/tools/e2e-commons/bin/e2e-env.sh
index 56dfebb4f9ba7..ecb5c7edf1375 100755
--- a/tools/e2e-commons/bin/e2e-env.sh
+++ b/tools/e2e-commons/bin/e2e-env.sh
@@ -53,6 +53,7 @@ configure_wp_env() {
 	fi
 	$BASE_CMD wp option set permalink_structure ""
 	$BASE_CMD wp jetpack module deactivate sso
+	$BASE_CMD wp theme activate twentytwentyone
 
 	echo
 	echo "WordPress is ready!"
diff --git a/tools/e2e-commons/bin/slack.cjs b/tools/e2e-commons/bin/slack.cjs
index acb4d473ce3b8..649ce91ac8aa8 100755
--- a/tools/e2e-commons/bin/slack.cjs
+++ b/tools/e2e-commons/bin/slack.cjs
@@ -57,7 +57,7 @@ yargs
  * @param {string} suite test suite name
  * @return {Promise<void>}
  */
-async function reportTestRunResults( suite = 'Jetpack e2e tests' ) {
+async function reportTestRunResults( suite = 'e2e' ) {
 	let result;
 
 	// If results summary file is not found send failure notification and exit
@@ -78,12 +78,14 @@ async function reportTestRunResults( suite = 'Jetpack e2e tests' ) {
 
 	const detailLines = [];
 	const failureDetails = [];
+	let isSuccess = true;
 
-	// Go through each specs, check tests and results and extract failure details
+	// Go through each spec, check tests and results and extract failure details
 	// Expected structure spec: {tests: [{results: [{}]}]}
 	specs.forEach( spec => {
 		if ( ! spec.ok ) {
 			console.log( `${ spec.title } failed` );
+			isSuccess = false;
 			detailLines.push( `- ${ spec.title }` );
 
 			// Go through each test of the spec
@@ -109,7 +111,7 @@ async function reportTestRunResults( suite = 'Jetpack e2e tests' ) {
 	} );
 
 	// build the notification blocks
-	const mainMsgBlocks = await buildDefaultMessage( result.success );
+	const mainMsgBlocks = await buildDefaultMessage( isSuccess );
 
 	// Add a header line
 	let testListHeader = `*${ specs.length } ${ suite }* tests ran successfully`;
diff --git a/tools/e2e-commons/helpers/plan-helper.js b/tools/e2e-commons/helpers/plan-helper.js
index 89dc84b690f24..941538b25c1ba 100644
--- a/tools/e2e-commons/helpers/plan-helper.js
+++ b/tools/e2e-commons/helpers/plan-helper.js
@@ -532,9 +532,8 @@ export async function syncPlanData( page ) {
 	do {
 		await page.reload( { waitFor: 'domcontentloaded' } );
 
-		/* eslint-disable no-undef */
+		// eslint-disable-next-line no-undef, camelcase
 		frPlan = await page.evaluate( () => Initial_State.siteData.plan.product_slug );
-		/* eslint-enable no-undef */
 		const planJson = await execWpCommand( 'option get jetpack_active_plan --format=json' );
 		bkPlan = JSON.parse( planJson );
 
diff --git a/tools/e2e-commons/package.json b/tools/e2e-commons/package.json
index fc8c81c3c1639..aa94abe4264c0 100644
--- a/tools/e2e-commons/package.json
+++ b/tools/e2e-commons/package.json
@@ -23,13 +23,13 @@
 	"devDependencies": {
 		"@playwright/test": "1.17.2",
 		"@slack/web-api": "6.5.1",
-		"@wordpress/eslint-plugin": "9.3.0",
+		"@wordpress/eslint-plugin": "10.0.0",
 		"allure-playwright": "2.0.0-beta.14",
 		"axios": "0.24.0",
 		"chalk": "4.1.2",
 		"config": "3.3.6",
-		"eslint": "7.32.0",
-		"eslint-plugin-playwright": "0.7.1",
+		"eslint": "8.8.0",
+		"eslint-plugin-playwright": "0.8.0",
 		"jetpack-cli": "link:../cli",
 		"localtunnel": "2.0.2",
 		"lodash": "4.17.21",
diff --git a/tools/e2e-commons/pnpm-lock.yaml b/tools/e2e-commons/pnpm-lock.yaml
index b0ff613eaf645..c259a4975f75c 100644
--- a/tools/e2e-commons/pnpm-lock.yaml
+++ b/tools/e2e-commons/pnpm-lock.yaml
@@ -6,13 +6,13 @@ importers:
     specifiers:
       '@playwright/test': 1.17.2
       '@slack/web-api': 6.5.1
-      '@wordpress/eslint-plugin': 9.3.0
+      '@wordpress/eslint-plugin': 10.0.0
       allure-playwright: 2.0.0-beta.14
       axios: 0.24.0
       chalk: 4.1.2
       config: 3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.7.1
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0
       jetpack-cli: link:../cli
       localtunnel: 2.0.2
       lodash: 4.17.21
@@ -24,13 +24,13 @@ importers:
     devDependencies:
       '@playwright/test': 1.17.2
       '@slack/web-api': 6.5.1
-      '@wordpress/eslint-plugin': 9.3.0_eslint@7.32.0
+      '@wordpress/eslint-plugin': 10.0.0_eslint@8.8.0
       allure-playwright: 2.0.0-beta.14
       axios: 0.24.0
       chalk: 4.1.2
       config: 3.3.6
-      eslint: 7.32.0
-      eslint-plugin-playwright: 0.7.1_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-plugin-playwright: 0.8.0_eslint@8.8.0
       jetpack-cli: link:../cli
       localtunnel: 2.0.2
       lodash: 4.17.21
@@ -42,12 +42,6 @@ importers:
 
 packages:
 
-  /@babel/code-frame/7.12.11:
-    resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==}
-    dependencies:
-      '@babel/highlight': 7.16.7
-    dev: true
-
   /@babel/code-frame/7.16.7:
     resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
@@ -60,6 +54,11 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/compat-data/7.16.8:
+    resolution: {integrity: sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/core/7.16.7:
     resolution: {integrity: sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==}
     engines: {node: '>=6.9.0'}
@@ -83,14 +82,14 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/eslint-parser/7.16.5_eslint@7.32.0:
+  /@babel/eslint-parser/7.16.5_eslint@8.8.0:
     resolution: {integrity: sha512-mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
       '@babel/core': '>=7.11.0'
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-scope: 5.1.1
       eslint-visitor-keys: 2.1.0
       semver: 6.3.0
@@ -105,6 +104,15 @@ packages:
       source-map: 0.5.7
     dev: true
 
+  /@babel/generator/7.16.8:
+    resolution: {integrity: sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+      jsesc: 2.5.2
+      source-map: 0.5.7
+    dev: true
+
   /@babel/helper-annotate-as-pure/7.16.7:
     resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
     engines: {node: '>=6.9.0'}
@@ -112,6 +120,14 @@ packages:
       '@babel/types': 7.16.7
     dev: true
 
+  /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
+    resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-explode-assignable-expression': 7.16.7
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-compilation-targets/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==}
     engines: {node: '>=6.9.0'}
@@ -125,6 +141,24 @@ packages:
       semver: 6.3.0
     dev: true
 
+  /@babel/helper-create-class-features-plugin/7.16.10_@babel+core@7.16.7:
+    resolution: {integrity: sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-member-expression-to-functions': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-create-class-features-plugin/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==}
     engines: {node: '>=6.9.0'}
@@ -143,6 +177,35 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/helper-create-regexp-features-plugin/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      regexpu-core: 4.8.0
+    dev: true
+
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.16.7:
+    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/traverse': 7.16.7
+      debug: 4.3.3
+      lodash.debounce: 4.0.8
+      resolve: 1.21.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-environment-visitor/7.16.7:
     resolution: {integrity: sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==}
     engines: {node: '>=6.9.0'}
@@ -150,6 +213,13 @@ packages:
       '@babel/types': 7.16.7
     dev: true
 
+  /@babel/helper-explode-assignable-expression/7.16.7:
+    resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.16.8
+    dev: true
+
   /@babel/helper-function-name/7.16.7:
     resolution: {integrity: sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==}
     engines: {node: '>=6.9.0'}
@@ -215,6 +285,17 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/helper-remap-async-to-generator/7.16.8:
+    resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-wrap-function': 7.16.8
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helper-replace-supers/7.16.7:
     resolution: {integrity: sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==}
     engines: {node: '>=6.9.0'}
@@ -259,6 +340,18 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
+  /@babel/helper-wrap-function/7.16.8:
+    resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-function-name': 7.16.7
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.16.10
+      '@babel/types': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/helpers/7.16.7:
     resolution: {integrity: sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==}
     engines: {node: '>=6.9.0'}
@@ -279,12 +372,54 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
+  /@babel/parser/7.16.12:
+    resolution: {integrity: sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dev: true
+
   /@babel/parser/7.16.7:
     resolution: {integrity: sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dev: true
 
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.7
+    dev: true
+
+  /@babel/plugin-proposal-async-generator-functions/7.16.8_@babel+core@7.16.7:
+    resolution: {integrity: sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-class-properties/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==}
     engines: {node: '>=6.9.0'}
@@ -298,6 +433,20 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/plugin-proposal-class-static-block/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
     engines: {node: '>=6.9.0'}
@@ -320,6 +469,17 @@ packages:
       '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.7
     dev: true
 
+  /@babel/plugin-proposal-json-strings/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-logical-assignment-operators/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==}
     engines: {node: '>=6.9.0'}
@@ -353,6 +513,31 @@ packages:
       '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.7
     dev: true
 
+  /@babel/plugin-proposal-object-rest-spread/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.7
+    dev: true
+
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.7
+    dev: true
+
   /@babel/plugin-proposal-optional-chaining/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==}
     engines: {node: '>=6.9.0'}
@@ -365,6 +550,19 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.7
     dev: true
 
+  /@babel/plugin-proposal-private-methods/7.16.11_@babel+core@7.16.7:
+    resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.10_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-private-methods/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==}
     engines: {node: '>=6.9.0'}
@@ -393,6 +591,17 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/plugin-proposal-unicode-property-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.7:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -402,6 +611,25 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.16.7:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.16.7:
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
@@ -429,6 +657,16 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
+  /@babel/plugin-syntax-jsx/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.7:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
@@ -493,6 +731,16 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
   /@babel/plugin-syntax-typescript/7.16.7_@babel+core@7.16.7:
     resolution: {integrity: sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==}
     engines: {node: '>=6.9.0'}
@@ -503,33 +751,522 @@ packages:
       '@babel/helper-plugin-utils': 7.16.7
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs/7.16.7_@babel+core@7.16.7:
-    resolution: {integrity: sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==}
+  /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.7
-      '@babel/helper-module-transforms': 7.16.7
       '@babel/helper-plugin-utils': 7.16.7
-      '@babel/helper-simple-access': 7.16.7
-      babel-plugin-dynamic-import-node: 2.3.3
+    dev: true
+
+  /@babel/plugin-transform-async-to-generator/7.16.8_@babel+core@7.16.7:
+    resolution: {integrity: sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-remap-async-to-generator': 7.16.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-typescript/7.16.7_@babel+core@7.16.7:
-    resolution: {integrity: sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA==}
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.16.7
-      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
       '@babel/helper-plugin-utils': 7.16.7
-      '@babel/plugin-syntax-typescript': 7.16.7_@babel+core@7.16.7
-    transitivePeerDependencies:
-      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-block-scoping/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-classes/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-computed-properties/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-destructuring/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-duplicate-keys/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-for-of/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-modules-amd/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-commonjs/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-commonjs/7.16.8_@babel+core@7.16.7:
+    resolution: {integrity: sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-simple-access': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-systemjs/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-identifier': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-umd/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-transforms': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-named-capturing-groups-regex/7.16.8_@babel+core@7.16.7:
+    resolution: {integrity: sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+    dev: true
+
+  /@babel/plugin-transform-new-target/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-replace-supers': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-parameters/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-react-jsx/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/types': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-regenerator/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      regenerator-transform: 0.14.5
+    dev: true
+
+  /@babel/plugin-transform-reserved-words/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-runtime/7.16.10_@babel+core@7.16.7:
+    resolution: {integrity: sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.7
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.7
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.7
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-spread/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+    dev: true
+
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-template-literals/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-typeof-symbol/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-typescript/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-syntax-typescript': 7.16.7_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.16.7:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-create-regexp-features-plugin': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+    dev: true
+
+  /@babel/preset-env/7.16.11_@babel+core@7.16.7:
+    resolution: {integrity: sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.8
+      '@babel/core': 7.16.7
+      '@babel/helper-compilation-targets': 7.16.7_@babel+core@7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-async-generator-functions': 7.16.8_@babel+core@7.16.7
+      '@babel/plugin-proposal-class-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-class-static-block': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-export-namespace-from': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-json-strings': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-logical-assignment-operators': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-object-rest-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-optional-chaining': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-private-methods': 7.16.11_@babel+core@7.16.7
+      '@babel/plugin-proposal-private-property-in-object': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.7
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.7
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.7
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.7
+      '@babel/plugin-transform-arrow-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-async-to-generator': 7.16.8_@babel+core@7.16.7
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-block-scoping': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-classes': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-computed-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-destructuring': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-duplicate-keys': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-for-of': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-amd': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-commonjs': 7.16.8_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-systemjs': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-modules-umd': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.16.8_@babel+core@7.16.7
+      '@babel/plugin-transform-new-target': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-parameters': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-regenerator': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-reserved-words': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-spread': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-typeof-symbol': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/preset-modules': 0.1.5_@babel+core@7.16.7
+      '@babel/types': 7.16.8
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.16.7
+      babel-plugin-polyfill-corejs3: 0.5.1_@babel+core@7.16.7
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.16.7
+      core-js-compat: 3.21.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/preset-modules/0.1.5_@babel+core@7.16.7:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-plugin-utils': 7.16.7
+      '@babel/plugin-proposal-unicode-property-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.16.7
+      '@babel/types': 7.16.8
+      esutils: 2.0.3
     dev: true
 
   /@babel/preset-typescript/7.16.7_@babel+core@7.16.7:
@@ -570,6 +1307,24 @@ packages:
       '@babel/types': 7.16.7
     dev: true
 
+  /@babel/traverse/7.16.10:
+    resolution: {integrity: sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.16.8
+      '@babel/helper-environment-visitor': 7.16.7
+      '@babel/helper-function-name': 7.16.7
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.16.12
+      '@babel/types': 7.16.8
+      debug: 4.3.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/traverse/7.16.7:
     resolution: {integrity: sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==}
     engines: {node: '>=6.9.0'}
@@ -596,6 +1351,14 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
+  /@babel/types/7.16.8:
+    resolution: {integrity: sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      to-fast-properties: 2.0.0
+    dev: true
+
   /@dabh/diagnostics/2.0.2:
     resolution: {integrity: sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==}
     dependencies:
@@ -604,34 +1367,34 @@ packages:
       kuler: 2.0.0
     dev: true
 
-  /@es-joy/jsdoccomment/0.10.8:
-    resolution: {integrity: sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /@es-joy/jsdoccomment/0.18.0:
+    resolution: {integrity: sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     dependencies:
-      comment-parser: 1.2.4
+      comment-parser: 1.3.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.1.1
+      jsdoc-type-pratt-parser: 2.2.2
     dev: true
 
-  /@eslint/eslintrc/0.4.3:
-    resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@eslint/eslintrc/1.0.5:
+    resolution: {integrity: sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.3
-      espree: 7.3.1
+      espree: 9.3.0
       globals: 13.12.0
       ignore: 4.0.6
       import-fresh: 3.3.0
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       minimatch: 3.0.4
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.5.0:
-    resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==}
+  /@humanwhocodes/config-array/0.9.3:
+    resolution: {integrity: sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -890,10 +1653,32 @@ packages:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
+  /@types/prop-types/15.7.4:
+    resolution: {integrity: sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==}
+    dev: true
+
+  /@types/react-dom/17.0.11:
+    resolution: {integrity: sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==}
+    dependencies:
+      '@types/react': 17.0.38
+    dev: true
+
+  /@types/react/17.0.38:
+    resolution: {integrity: sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==}
+    dependencies:
+      '@types/prop-types': 15.7.4
+      '@types/scheduler': 0.16.2
+      csstype: 3.0.10
+    dev: true
+
   /@types/retry/0.12.1:
     resolution: {integrity: sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==}
     dev: true
 
+  /@types/scheduler/0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+    dev: true
+
   /@types/stack-utils/2.0.1:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
     dev: true
@@ -916,22 +1701,23 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e:
-    resolution: {integrity: sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/eslint-plugin/5.10.2_0d682450f1ef58680b7f0316f2e82e26:
+    resolution: {integrity: sha512-4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^4.0.0
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
-      '@typescript-eslint/scope-manager': 4.33.0
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/type-utils': 5.10.2_eslint@8.8.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
       debug: 4.3.3
-      eslint: 7.32.0
+      eslint: 8.8.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
@@ -941,67 +1727,80 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/experimental-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-stRnIlxDduzxtaVLtEohESoXI1k7J6jvJHGyIkOT2pvXbg5whPM6f9tzJ51bJJxaJTdmvwgVFDNCopFRb2F5Gw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@types/json-schema': 7.0.9
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
-      eslint: 7.32.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@7.32.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/parser/4.33.0_eslint@7.32.0:
-    resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/parser/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 4.33.0
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/typescript-estree': 4.33.0
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
       debug: 4.3.3
-      eslint: 7.32.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/4.33.0:
-    resolution: {integrity: sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/scope-manager/5.10.2:
+    resolution: {integrity: sha512-39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
+    dev: true
+
+  /@typescript-eslint/type-utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@typescript-eslint/utils': 5.10.2_eslint@8.8.0
+      debug: 4.3.3
+      eslint: 8.8.0
+      tsutils: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@typescript-eslint/types/4.33.0:
-    resolution: {integrity: sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/types/5.10.2:
+    resolution: {integrity: sha512-Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/4.33.0:
-    resolution: {integrity: sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /@typescript-eslint/typescript-estree/5.10.2:
+    resolution: {integrity: sha512-WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      '@typescript-eslint/visitor-keys': 4.33.0
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/visitor-keys': 5.10.2
       debug: 4.3.3
       globby: 11.1.0
       is-glob: 4.0.3
@@ -1011,43 +1810,117 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/visitor-keys/4.33.0:
-    resolution: {integrity: sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==}
-    engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1}
+  /@typescript-eslint/utils/5.10.2_eslint@8.8.0:
+    resolution: {integrity: sha512-vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@typescript-eslint/types': 4.33.0
-      eslint-visitor-keys: 2.1.0
+      '@types/json-schema': 7.0.9
+      '@typescript-eslint/scope-manager': 5.10.2
+      '@typescript-eslint/types': 5.10.2
+      '@typescript-eslint/typescript-estree': 5.10.2
+      eslint: 8.8.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.8.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.10.2:
+    resolution: {integrity: sha512-zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.10.2
+      eslint-visitor-keys: 3.2.0
     dev: true
 
-  /@wordpress/eslint-plugin/9.3.0_eslint@7.32.0:
-    resolution: {integrity: sha512-9F7B60gHAjiTIi9vBw5ZoH0MZW3UnmbuKols4kWpJVdgsvG4X1Wj6XXTLmQKrzh/Em7mD1CCIbCSyWknEzIOLw==}
+  /@wordpress/babel-plugin-import-jsx-pragma/3.1.0_@babel+core@7.16.7:
+    resolution: {integrity: sha512-518mL3goaSeXtJCQcPK9OYHUUiA0sjXuoGWHBwRalkyTIQZZy5ZZzlwrlSc9ESZcOw9BZ+Uo8CJRjV2OWnx+Zw==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@babel/core': ^7.12.9
+    dependencies:
+      '@babel/core': 7.16.7
+    dev: true
+
+  /@wordpress/babel-preset-default/6.5.0:
+    resolution: {integrity: sha512-F2bv78gNz8FsSP88tEabNffiynvwgepcfustDCbhXXWZoMQoTmyu+jj1h7sjriH+9lIUmfcJifKy+QstCR1Y4w==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/plugin-transform-react-jsx': 7.16.7_@babel+core@7.16.7
+      '@babel/plugin-transform-runtime': 7.16.10_@babel+core@7.16.7
+      '@babel/preset-env': 7.16.11_@babel+core@7.16.7
+      '@babel/preset-typescript': 7.16.7_@babel+core@7.16.7
+      '@babel/runtime': 7.16.7
+      '@wordpress/babel-plugin-import-jsx-pragma': 3.1.0_@babel+core@7.16.7
+      '@wordpress/browserslist-config': 4.1.0
+      '@wordpress/element': 4.1.0
+      '@wordpress/warning': 2.3.0
+      browserslist: 4.19.1
+      core-js: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@wordpress/browserslist-config/4.1.0:
+    resolution: {integrity: sha512-RSJhgY2xmz6yAdDNhz/NvAO6JS+91vv9cVL7VDG2CftbyjTXBef05vWt3FzZhfeF0xUrYdpZL1PVpxmJiKvbEg==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /@wordpress/element/4.1.0:
+    resolution: {integrity: sha512-Q63OGOExHthL1TGJOaQKYXr2vEvkIk3jBlcMuPuY/6JhKx3h0G6GDE3J0mc9HQyydkv6XWDyATWjfP5naMjM/Q==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/runtime': 7.16.7
+      '@types/react': 17.0.38
+      '@types/react-dom': 17.0.11
+      '@wordpress/escape-html': 2.3.0
+      lodash: 4.17.21
+      react: 17.0.2
+      react-dom: 17.0.2_react@17.0.2
+    dev: true
+
+  /@wordpress/escape-html/2.3.0:
+    resolution: {integrity: sha512-QD5uid5Le3sZkKGKiXcudQKILxrSEeGltYVyQoNwbeBIhUE19DW7J0S1zqKkaaHks0jEERPIfzNThiyUh1IrVg==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/runtime': 7.16.7
+    dev: true
+
+  /@wordpress/eslint-plugin/10.0.0_eslint@8.8.0:
+    resolution: {integrity: sha512-OMPyXLwjvnDio/f1l2+FkwwtNO2hpHkTdJe8D1ie5QpUFQgVz7n59w9USMxdJ/XR2eDDLjVv1alwXEow1go+mg==}
     engines: {node: '>=12', npm: '>=6.9'}
     peerDependencies:
-      eslint: ^6 || ^7
-      typescript: ^4
+      '@babel/core': '>=7'
+      eslint: '>=8'
+      typescript: '>=4'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@babel/eslint-parser': 7.16.5_eslint@7.32.0
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/parser': 4.33.0_eslint@7.32.0
+      '@babel/eslint-parser': 7.16.5_eslint@8.8.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/parser': 5.10.2_eslint@8.8.0
+      '@wordpress/babel-preset-default': 6.5.0
       '@wordpress/prettier-config': 1.1.1
       cosmiconfig: 7.0.1
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
-      eslint-plugin-import: 2.25.4_eslint@7.32.0
-      eslint-plugin-jest: 24.7.0_d3b4c2d4ac51f4275548d5d796aee5d5
-      eslint-plugin-jsdoc: 36.1.1_eslint@7.32.0
-      eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
-      eslint-plugin-prettier: 3.4.1_34b707f3a53b0942f3919c1ff656ce36
-      eslint-plugin-react: 7.28.0_eslint@7.32.0
-      eslint-plugin-react-hooks: 4.3.0_eslint@7.32.0
-      globals: 12.4.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
+      eslint-plugin-import: 2.25.4_eslint@8.8.0
+      eslint-plugin-jest: 25.7.0_2710175b8e1738b8f39f06cfa9aa7159
+      eslint-plugin-jsdoc: 37.7.0_eslint@8.8.0
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.8.0
+      eslint-plugin-prettier: 3.4.1_5208900944bd53d50aafd0e7d193e6c3
+      eslint-plugin-react: 7.28.0_eslint@8.8.0
+      eslint-plugin-react-hooks: 4.3.0_eslint@8.8.0
+      globals: 13.12.0
       prettier: /wp-prettier/2.2.1-beta-1
       requireindex: 1.2.0
     transitivePeerDependencies:
-      - '@babel/core'
+      - jest
       - supports-color
     dev: true
 
@@ -1056,16 +1929,21 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@7.4.1:
+  /@wordpress/warning/2.3.0:
+    resolution: {integrity: sha512-Is6uEp2wvUPTK1+RtQQdzTdb93BDMAJEYE5UCHvoSFCWpxvEhBP6SY+Nzv/MkFKHZwY66QxEAduThxfINma87Q==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 7.4.1
+      acorn: 8.7.0
     dev: true
 
-  /acorn/7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+  /acorn/8.7.0:
+    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -1088,15 +1966,6 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ajv/8.8.2:
-    resolution: {integrity: sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-    dev: true
-
   /allure-js-commons/2.0.0-beta.14:
     resolution: {integrity: sha512-5OlMp8kdc5FuxkquOV1ZXxJCAmFUwHnI5OqL2IlhJ65NKBeABpMwro6BbhlJqcV8iPQmh1w9bErTICSeB+Hj2A==}
     dependencies:
@@ -1164,6 +2033,10 @@ packages:
       sprintf-js: 1.0.3
     dev: true
 
+  /argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+    dev: true
+
   /aria-query/4.2.2:
     resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
     engines: {node: '>=6.0'}
@@ -1217,11 +2090,6 @@ packages:
       tslib: 2.3.1
     dev: true
 
-  /astral-regex/2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /async-listener/0.6.10:
     resolution: {integrity: sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==}
     engines: {node: <=0.11.8 || >0.11.10}
@@ -1283,6 +2151,42 @@ packages:
       object.assign: 4.1.2
     dev: true
 
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.16.7:
+    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.16.4
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.7
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-corejs3/0.5.1_@babel+core@7.16.7:
+    resolution: {integrity: sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.7
+      core-js-compat: 3.21.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.16.7:
+    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.16.7
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -1479,8 +2383,8 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /comment-parser/1.2.4:
-    resolution: {integrity: sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==}
+  /comment-parser/1.3.0:
+    resolution: {integrity: sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==}
     engines: {node: '>= 12.0.0'}
     dev: true
 
@@ -1516,11 +2420,23 @@ packages:
     resolution: {integrity: sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==}
     dev: true
 
+  /core-js-compat/3.21.0:
+    resolution: {integrity: sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==}
+    dependencies:
+      browserslist: 4.19.1
+      semver: 7.0.0
+    dev: true
+
   /core-js-pure/3.20.2:
     resolution: {integrity: sha512-CmWHvSKn2vNL6p6StNp1EmMIfVY/pqn3JLAjfZQ8WZGPOlGoO92EkX9/Mk81i6GxvoPXjUqEQnpM3rJ5QxxIOg==}
     requiresBuild: true
     dev: true
 
+  /core-js/3.21.0:
+    resolution: {integrity: sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==}
+    requiresBuild: true
+    dev: true
+
   /core-util-is/1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
     dev: true
@@ -1551,6 +2467,10 @@ packages:
       which: 2.0.2
     dev: true
 
+  /csstype/3.0.10:
+    resolution: {integrity: sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==}
+    dev: true
+
   /culvert/0.1.2:
     resolution: {integrity: sha1-lQL18BVKLVoioCPnn3HMk2+m728=}
     dev: true
@@ -1775,13 +2695,13 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-prettier/7.2.0_eslint@7.32.0:
-    resolution: {integrity: sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==}
+  /eslint-config-prettier/8.3.0_eslint@8.8.0:
+    resolution: {integrity: sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
   /eslint-import-resolver-node/0.3.6:
@@ -1799,7 +2719,7 @@ packages:
       find-up: 2.1.0
     dev: true
 
-  /eslint-plugin-import/2.25.4_eslint@7.32.0:
+  /eslint-plugin-import/2.25.4_eslint@8.8.0:
     resolution: {integrity: sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -1809,7 +2729,7 @@ packages:
       array.prototype.flat: 1.2.5
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-import-resolver-node: 0.3.6
       eslint-module-utils: 2.7.2
       has: 1.0.3
@@ -1821,37 +2741,39 @@ packages:
       tsconfig-paths: 3.12.0
     dev: true
 
-  /eslint-plugin-jest/24.7.0_d3b4c2d4ac51f4275548d5d796aee5d5:
-    resolution: {integrity: sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==}
-    engines: {node: '>=10'}
+  /eslint-plugin-jest/25.7.0_2710175b8e1738b8f39f06cfa9aa7159:
+    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': '>= 4'
-      eslint: '>=5'
+      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
+      jest:
+        optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 4.33.0_2951ba233cd46bb4e0f2f0a3f7fe108e
-      '@typescript-eslint/experimental-utils': 4.33.0_eslint@7.32.0
-      eslint: 7.32.0
+      '@typescript-eslint/eslint-plugin': 5.10.2_0d682450f1ef58680b7f0316f2e82e26
+      '@typescript-eslint/experimental-utils': 5.10.2_eslint@8.8.0
+      eslint: 8.8.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jsdoc/36.1.1_eslint@7.32.0:
-    resolution: {integrity: sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ==}
-    engines: {node: ^12 || ^14 || ^16}
+  /eslint-plugin-jsdoc/37.7.0_eslint@8.8.0:
+    resolution: {integrity: sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA==}
+    engines: {node: ^12 || ^14 || ^16 || ^17}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0
+      eslint: ^7.0.0 || ^8.0.0
     dependencies:
-      '@es-joy/jsdoccomment': 0.10.8
-      comment-parser: 1.2.4
+      '@es-joy/jsdoccomment': 0.18.0
+      comment-parser: 1.3.0
       debug: 4.3.3
-      eslint: 7.32.0
+      escape-string-regexp: 4.0.0
+      eslint: 8.8.0
       esquery: 1.4.0
-      jsdoc-type-pratt-parser: 1.2.0
-      lodash: 4.17.21
       regextras: 0.8.0
       semver: 7.3.5
       spdx-expression-parse: 3.0.1
@@ -1859,7 +2781,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.5.1_eslint@7.32.0:
+  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.8.0:
     resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -1873,15 +2795,15 @@ packages:
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 7.32.0
+      eslint: 8.8.0
       has: 1.0.3
       jsx-ast-utils: 3.2.1
       language-tags: 1.0.5
       minimatch: 3.0.4
     dev: true
 
-  /eslint-plugin-playwright/0.7.1_eslint@7.32.0:
-    resolution: {integrity: sha512-BPwicI9ilexNiT3CgzSHZnWuxgAg59z4l7qhswqxzM+EdaDhpucM/atYcQCUbbB9lAmHVWCEdKBWZQPkplcW1w==}
+  /eslint-plugin-playwright/0.8.0_eslint@8.8.0:
+    resolution: {integrity: sha512-9uJH25m6H3jwU5O7bHD5M8cLx46L72EnIUe3dZqTox6M+WzOFzeUWaDJHHCdLGXZ8XlAU4mbCZnP7uhjKepfRA==}
     peerDependencies:
       eslint: '>=7'
       eslint-plugin-jest: '>=24'
@@ -1889,10 +2811,10 @@ packages:
       eslint-plugin-jest:
         optional: true
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-prettier/3.4.1_34b707f3a53b0942f3919c1ff656ce36:
+  /eslint-plugin-prettier/3.4.1_5208900944bd53d50aafd0e7d193e6c3:
     resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -1903,22 +2825,22 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 7.32.0
-      eslint-config-prettier: 7.2.0_eslint@7.32.0
+      eslint: 8.8.0
+      eslint-config-prettier: 8.3.0_eslint@8.8.0
       prettier: /wp-prettier/2.2.1-beta-1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.3.0_eslint@7.32.0:
+  /eslint-plugin-react-hooks/4.3.0_eslint@8.8.0:
     resolution: {integrity: sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
     dev: true
 
-  /eslint-plugin-react/7.28.0_eslint@7.32.0:
+  /eslint-plugin-react/7.28.0_eslint@8.8.0:
     resolution: {integrity: sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -1927,7 +2849,7 @@ packages:
       array-includes: 3.1.4
       array.prototype.flatmap: 1.2.5
       doctrine: 2.1.0
-      eslint: 7.32.0
+      eslint: 8.8.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.2.1
       minimatch: 3.0.4
@@ -1949,89 +2871,85 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-utils/2.1.0:
-    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
-    engines: {node: '>=6'}
+  /eslint-scope/7.1.0:
+    resolution: {integrity: sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      eslint-visitor-keys: 1.3.0
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@7.32.0:
+  /eslint-utils/3.0.0_eslint@8.8.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 7.32.0
+      eslint: 8.8.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/1.3.0:
-    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /eslint-visitor-keys/2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint/7.32.0:
-    resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /eslint-visitor-keys/3.2.0:
+    resolution: {integrity: sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint/8.8.0:
+    resolution: {integrity: sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@babel/code-frame': 7.12.11
-      '@eslint/eslintrc': 0.4.3
-      '@humanwhocodes/config-array': 0.5.0
+      '@eslint/eslintrc': 1.0.5
+      '@humanwhocodes/config-array': 0.9.3
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
       debug: 4.3.3
       doctrine: 3.0.0
-      enquirer: 2.3.6
       escape-string-regexp: 4.0.0
-      eslint-scope: 5.1.1
-      eslint-utils: 2.1.0
-      eslint-visitor-keys: 2.1.0
-      espree: 7.3.1
+      eslint-scope: 7.1.0
+      eslint-utils: 3.0.0_eslint@8.8.0
+      eslint-visitor-keys: 3.2.0
+      espree: 9.3.0
       esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       functional-red-black-tree: 1.0.1
-      glob-parent: 5.1.2
+      glob-parent: 6.0.2
       globals: 13.12.0
-      ignore: 4.0.6
+      ignore: 5.2.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
-      js-yaml: 3.14.1
+      js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.0.4
       natural-compare: 1.4.0
       optionator: 0.9.1
-      progress: 2.0.3
       regexpp: 3.2.0
-      semver: 7.3.5
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
-      table: 6.8.0
       text-table: 0.2.0
       v8-compile-cache: 2.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /espree/7.3.1:
-    resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  /espree/9.3.0:
+    resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 7.4.1
-      acorn-jsx: 5.3.2_acorn@7.4.1
-      eslint-visitor-keys: 1.3.0
+      acorn: 8.7.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
+      eslint-visitor-keys: 3.2.0
     dev: true
 
   /esprima/4.0.1:
@@ -2355,6 +3273,13 @@ packages:
       is-glob: 4.0.3
     dev: true
 
+  /glob-parent/6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: 4.0.3
+    dev: true
+
   /glob/7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
     dependencies:
@@ -2371,13 +3296,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /globals/12.4.0:
-    resolution: {integrity: sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.8.1
-    dev: true
-
   /globals/13.12.0:
     resolution: {integrity: sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==}
     engines: {node: '>=8'}
@@ -2734,22 +3652,21 @@ packages:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-yaml/3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  /js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
+      argparse: 2.0.1
     dev: true
 
-  /jsdoc-type-pratt-parser/1.1.1:
-    resolution: {integrity: sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g==}
+  /jsdoc-type-pratt-parser/2.2.2:
+    resolution: {integrity: sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==}
     engines: {node: '>=12.0.0'}
     dev: true
 
-  /jsdoc-type-pratt-parser/1.2.0:
-    resolution: {integrity: sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==}
-    engines: {node: '>=12.0.0'}
+  /jsesc/0.5.0:
+    resolution: {integrity: sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=}
+    hasBin: true
     dev: true
 
   /jsesc/2.5.2:
@@ -2766,10 +3683,6 @@ packages:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-schema-traverse/1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
-
   /json-stable-stringify-without-jsonify/1.0.1:
     resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
     dev: true
@@ -2872,12 +3785,12 @@ packages:
       path-exists: 3.0.0
     dev: true
 
-  /lodash.merge/4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha1-gteb/zCmfEAF/9XiUVMArZyk168=}
     dev: true
 
-  /lodash.truncate/4.4.2:
-    resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=}
+  /lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
   /lodash/4.17.21:
@@ -3539,6 +4452,17 @@ packages:
       unpipe: 1.0.0
     dev: true
 
+  /react-dom/17.0.2_react@17.0.2:
+    resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
+    peerDependencies:
+      react: 17.0.2
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react: 17.0.2
+      scheduler: 0.20.2
+    dev: true
+
   /react-is/16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
     dev: true
@@ -3547,6 +4471,14 @@ packages:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
     dev: true
 
+  /react/17.0.2:
+    resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
   /read/1.0.7:
     resolution: {integrity: sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=}
     engines: {node: '>=0.8'}
@@ -3579,10 +4511,27 @@ packages:
       picomatch: 2.3.1
     dev: true
 
+  /regenerate-unicode-properties/9.0.0:
+    resolution: {integrity: sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+    dev: true
+
+  /regenerate/1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+    dev: true
+
   /regenerator-runtime/0.13.9:
     resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
     dev: true
 
+  /regenerator-transform/0.14.5:
+    resolution: {integrity: sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==}
+    dependencies:
+      '@babel/runtime': 7.16.7
+    dev: true
+
   /regexp.prototype.flags/1.3.1:
     resolution: {integrity: sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==}
     engines: {node: '>= 0.4'}
@@ -3596,18 +4545,36 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /regexpu-core/4.8.0:
+    resolution: {integrity: sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 9.0.0
+      regjsgen: 0.5.2
+      regjsparser: 0.7.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.0.0
+    dev: true
+
   /regextras/0.8.0:
     resolution: {integrity: sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==}
     engines: {node: '>=0.1.14'}
     dev: true
 
-  /require-directory/2.1.1:
-    resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=}
-    engines: {node: '>=0.10.0'}
+  /regjsgen/0.5.2:
+    resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==}
+    dev: true
+
+  /regjsparser/0.7.0:
+    resolution: {integrity: sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
     dev: true
 
-  /require-from-string/2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+  /require-directory/2.1.1:
+    resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=}
     engines: {node: '>=0.10.0'}
     dev: true
 
@@ -3699,6 +4666,13 @@ packages:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
     dev: true
 
+  /scheduler/0.20.2:
+    resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+    dev: true
+
   /semver/5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
@@ -3709,6 +4683,11 @@ packages:
     hasBin: true
     dev: true
 
+  /semver/7.0.0:
+    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
+    hasBin: true
+    dev: true
+
   /semver/7.2.3:
     resolution: {integrity: sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig==}
     engines: {node: '>=10'}
@@ -3770,15 +4749,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /slice-ansi/4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
   /smart-buffer/4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -3984,17 +4954,6 @@ packages:
     dev: true
     optional: true
 
-  /table/6.8.0:
-    resolution: {integrity: sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==}
-    engines: {node: '>=10.0.0'}
-    dependencies:
-      ajv: 8.8.2
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /text-hex/1.0.0:
     resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==}
     dev: true
@@ -4085,11 +5044,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: true
-
   /unbox-primitive/1.0.1:
     resolution: {integrity: sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==}
     dependencies:
@@ -4099,6 +5053,29 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
+  /unicode-canonical-property-names-ecmascript/2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-match-property-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.0.0
+    dev: true
+
+  /unicode-match-property-value-ecmascript/2.0.0:
+    resolution: {integrity: sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-property-aliases-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==}
+    engines: {node: '>=4'}
+    dev: true
+
   /universalify/0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
diff --git a/tools/find-project-deps.php b/tools/find-project-deps.php
deleted file mode 100755
index 9f9ea83827d3b..0000000000000
--- a/tools/find-project-deps.php
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Function to collect project direct dependencies.
- *
- * @package automattic/jetpack
- */
-
-// phpcs:disable WordPress.WP.AlternativeFunctions
-
-/**
- * Collect project dependencies.
- *
- * @return string[][] Key is the project slug, value is an array of slugs depended on.
- */
-function get_dependencies() {
-	$base = dirname( __DIR__ );
-	$l    = strlen( $base );
-
-	// Collect all project slugs.
-	$output = array(
-		'monorepo' => array(),
-	);
-	foreach ( glob( "$base/projects/*/*/composer.json" ) as $file ) {
-		$output[ substr( $file, $l + 10, -14 ) ] = array();
-	}
-
-	// Collect package name→slug mappings.
-	$package_map = array();
-	foreach ( glob( "$base/projects/packages/*/composer.json" ) as $file ) {
-		$slug = substr( $file, $l + 10, -14 );
-		if ( ! isset( $output[ $slug ] ) ) {
-			// Not an actual project (should never happen here, but...).
-			continue;
-		}
-
-		$json = json_decode( file_get_contents( $file ), true );
-		if ( isset( $json['name'] ) ) {
-			$package_map[ $json['name'] ] = $slug;
-		}
-	}
-
-	// Collect js-package name→slug mappings.
-	$js_package_map = array();
-	foreach ( glob( "$base/projects/js-packages/*/package.json" ) as $file ) {
-		$slug = substr( $file, $l + 10, -13 );
-		if ( ! isset( $output[ $slug ] ) ) {
-			// Not an actual project.
-			continue;
-		}
-
-		$json = json_decode( file_get_contents( $file ), true );
-		if ( isset( $json['name'] ) ) {
-			$js_package_map[ $json['name'] ] = $slug;
-		}
-	}
-
-	// Collect dependencies.
-	foreach ( $output as $slug => &$deps ) {
-		$path = 'monorepo' === $slug ? $base : "$base/projects/$slug";
-
-		// Collect composer require, require-dev, and .extra.dependencies.
-		$json = json_decode( file_get_contents( "$path/composer.json" ), true );
-		foreach ( $package_map as $package => $pkgslug ) {
-			if ( isset( $json['require'][ $package ] ) || isset( $json['require-dev'][ $package ] ) ) {
-				$deps[] = $pkgslug;
-			}
-		}
-		if ( isset( $json['extra']['dependencies'] ) ) {
-			$deps = array_merge( $deps, $json['extra']['dependencies'] );
-		}
-
-		// Collect JS dependencies and devDependencies.
-		if ( file_exists( "$path/package.json" ) ) {
-			$json = json_decode( file_get_contents( "$path/package.json" ), true );
-			foreach ( $js_package_map as $package => $pkgslug ) {
-				if ( isset( $json['dependencies'][ $package ] ) || isset( $json['devDependencies'][ $package ] ) ) {
-					$deps[] = $pkgslug;
-				}
-			}
-		}
-
-		// Finalize.
-		$deps = array_unique( $deps );
-		sort( $deps );
-	}
-
-	ksort( $output );
-	return $output;
-}
-
-echo json_encode( get_dependencies(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) . "\n";
diff --git a/tools/get-build-order.php b/tools/get-build-order.php
deleted file mode 100755
index c7960687dfe4d..0000000000000
--- a/tools/get-build-order.php
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Tool to list projects in dependency order for build.
- *
- * @package automattic/jetpack
- */
-
-// phpcs:disable WordPress.WP.AlternativeFunctions, WordPress.PHP.DiscouragedPHPFunctions, WordPress.Security.EscapeOutput.OutputNotEscaped
-
-ob_start();
-require_once __DIR__ . '/find-project-deps.php';
-ob_end_clean();
-
-$debug_color = getenv( 'CI' ) ? '34' : '1;30';
-
-/**
- * Test if a variable is falsey.
- *
- * @param mixed $v Variable to test.
- * @return bool
- */
-function is_falsey( $v ) {
-	return ! $v;
-}
-
-// We look for packages that have no outgoing dependencies, collect then and remove them from the dependency graph, then repeat.
-// This is basically Kahn's algorithm with some steps interleaved.
-$deps = get_dependencies();
-unset( $deps['monorepo'] );
-$output = array();
-while ( $deps ) {
-	$ok = array_keys( array_filter( $deps, 'is_falsey' ) );
-	if ( ! $ok ) {
-		if ( getenv( 'CI' ) ) {
-			$lf = '%%0A';
-			fprintf( STDERR, '::error::The dependency graph contains a cycle!' );
-			$end = "\n";
-		} else {
-			$lf = "\n";
-			fprintf( STDERR, "\e[1;37;41mThe dependency graph contains a cycle!\e[0m" );
-			$end = '';
-		}
-		fprintf( STDERR, " Involved dependencies are:${lf}" );
-		$l = 0;
-		foreach ( $deps as $k => $v ) {
-			$l = max( $l, strlen( $k ) );
-		}
-		foreach ( $deps as $k => $v ) {
-			fprintf( STDERR, "  %${l}s -> %s${lf}", $k, implode( ' ', $v ) );
-		}
-		fprintf( STDERR, $end );
-		exit( 1 );
-	}
-	fprintf( STDERR, "\e[${debug_color}mReady at this step: %s\e[0m\n", implode( ' ', $ok ) );
-
-	$output = array_merge( $output, $ok );
-	foreach ( $ok as $slug ) {
-		unset( $deps[ $slug ] );
-	}
-	foreach ( $deps as &$v ) {
-		$v = array_diff( $v, $ok );
-	}
-	unset( $v );
-}
-
-echo implode( "\n", $output ) . "\n";
diff --git a/tools/js-test-runner/jest-config/default.config.js b/tools/js-test-runner/jest-config/default.config.js
index aa1774a79e75f..226c956d2b52c 100644
--- a/tools/js-test-runner/jest-config/default.config.js
+++ b/tools/js-test-runner/jest-config/default.config.js
@@ -32,6 +32,8 @@ const defaultConfig = {
 		'**/*.{js,jsx}',
 		'!**/node_modules/**',
 		'!**/vendor/**',
+		'!**/jetpack_vendor/**',
+		'!**/wordpress/**', // WorDBless.
 		'!**/__tests__/**',
 		'!**/coverage/**',
 		'!test-main.{js,jsx}',
diff --git a/tools/js-test-runner/package.json b/tools/js-test-runner/package.json
index 46296a7b14d07..dc6f630c62691 100644
--- a/tools/js-test-runner/package.json
+++ b/tools/js-test-runner/package.json
@@ -19,7 +19,7 @@
 		"@testing-library/react-hooks": "4.0.1",
 		"@testing-library/user-event": "12.8.3",
 		"@wojtekmaj/enzyme-adapter-react-17": "0.6.3",
-		"@wordpress/jest-preset-default": "7.1.3",
+		"@wordpress/jest-preset-default": "8.0.0",
 		"babel-jest": "27.3.1",
 		"chai": "4.3.4",
 		"chai-dom": "1.11.0",
diff --git a/tools/js-tools/package.json b/tools/js-tools/package.json
index 89acd891013c0..d988ec53cea05 100644
--- a/tools/js-tools/package.json
+++ b/tools/js-tools/package.json
@@ -17,20 +17,20 @@
 		"@babel/eslint-parser": "7.16.3",
 		"@octokit/auth-token": "2.4.5",
 		"@octokit/rest": "18.6.7",
-		"@wordpress/eslint-plugin": "9.3.0",
+		"@wordpress/eslint-plugin": "10.0.0",
 		"chalk": "4.1.2",
 		"debug": "4.3.3",
-		"eslint": "7.32.0",
+		"eslint": "8.8.0",
 		"eslint-config-prettier": "8.3.0",
 		"eslint-config-wpcalypso": "6.1.0",
 		"eslint-plugin-es": "4.1.0",
 		"eslint-plugin-es5": "1.5.0",
-		"eslint-plugin-inclusive-language": "1.2.1",
-		"eslint-plugin-jest": "24.7.0",
-		"eslint-plugin-jsdoc": "36.1.1",
+		"eslint-plugin-inclusive-language": "2.2.0",
+		"eslint-plugin-jest": "26.0.0",
+		"eslint-plugin-jsdoc": "37.7.0",
 		"eslint-plugin-jsx-a11y": "6.5.1",
 		"eslint-plugin-lodash": "7.3.0",
-		"eslint-plugin-prettier": "3.4.1",
+		"eslint-plugin-prettier": "4.0.0",
 		"eslint-plugin-react": "7.28.0",
 		"eslint-plugin-react-hooks": "4.3.0",
 		"eslint-plugin-wpcalypso": "5.0.0",
diff --git a/tools/phpcs-excludelist.json b/tools/phpcs-excludelist.json
index 3b2ebc6422d5c..ad3b6c379770c 100644
--- a/tools/phpcs-excludelist.json
+++ b/tools/phpcs-excludelist.json
@@ -1,30 +1,10 @@
 [
-	"projects/packages/analyzer/src/Declarations/class-class-const.php",
-	"projects/packages/analyzer/src/Declarations/class-class-method.php",
-	"projects/packages/analyzer/src/Declarations/class-class-property.php",
-	"projects/packages/analyzer/src/Declarations/class-class.php",
-	"projects/packages/analyzer/src/Declarations/class-declaration.php",
-	"projects/packages/analyzer/src/Declarations/class-function.php",
-	"projects/packages/analyzer/src/Declarations/class-visitor.php",
-	"projects/packages/analyzer/src/Dependencies/class-dependency.php",
-	"projects/packages/analyzer/src/Invocations/class-function-call.php",
-	"projects/packages/analyzer/src/Invocations/class-new.php",
-	"projects/packages/analyzer/src/Invocations/class-static-call.php",
-	"projects/packages/analyzer/src/Invocations/class-static-const.php",
-	"projects/packages/analyzer/src/Invocations/class-static-property.php",
-	"projects/packages/analyzer/src/Invocations/class-visitor.php",
-	"projects/packages/analyzer/src/class-PersistentList.php",
-	"projects/packages/analyzer/src/class-declarations.php",
-	"projects/packages/analyzer/src/class-differences.php",
-	"projects/packages/analyzer/src/class-invocations.php",
-	"projects/packages/analyzer/src/class-utils.php",
 	"projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php",
 	"projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-landing-page.php",
 	"projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php",
 	"projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php",
 	"projects/plugins/jetpack/_inc/lib/class.color.php",
 	"projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php",
-	"projects/plugins/jetpack/_inc/lib/class.jetpack-automatic-install-skin.php",
 	"projects/plugins/jetpack/_inc/lib/class.jetpack-iframe-embed.php",
 	"projects/plugins/jetpack/_inc/lib/class.jetpack-keyring-service-helper.php",
 	"projects/plugins/jetpack/_inc/lib/class.jetpack-photon-image-sizes.php",
diff --git a/tools/phpcs-new-rule.sh b/tools/phpcs-new-rule.sh
new file mode 100755
index 0000000000000..642bc7e812b47
--- /dev/null
+++ b/tools/phpcs-new-rule.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eo pipefail
+
+array=()
+while IFS=  read -r -d $'\0'; do
+    array+=("$REPLY")
+done < <(find projects -name "*.php" -type f -print0)
+
+for file in "${array[@]}"; do
+	echo "Checking $file"
+  vendor/bin/phpcs -q -s --standard="$1" --sniffs="$2" --ignore="*/vendor/*,*/wordpress/*" "$file" >> ./tools/phpcs.log || true
+done
+
+echo "Files with errors and warnings logged to /tools/phpcs.log"
+