From 69408f4413e2b63391fcbab92b87123d43f8e0d1 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 4 Feb 2021 15:31:29 -0600
Subject: [PATCH 01/21] Display the help text for the TextareaArray setting

Without this,
it's really hard to know what to enter.
This existed before,
but it usually had markup.
So instead of doing
__dangerouslySetInnerHTML={},
enter the markup in the React file,
and use other help text if it exists.
---
 js/src/edit-block/components/editor.js        | 10 +++++++
 js/src/edit-block/components/input.js         |  2 +-
 js/src/edit-block/components/select.js        |  2 +-
 .../components/settings/checkbox.js           |  2 +-
 .../edit-block/components/settings/email.js   |  2 +-
 .../components/settings/location.js           |  2 +-
 .../components/settings/new-line-format.js    |  2 +-
 .../settings/number-non-negative.js           |  2 +-
 .../edit-block/components/settings/number.js  |  2 +-
 js/src/edit-block/components/settings/text.js |  2 +-
 .../components/settings/textarea-array.js     | 30 ++++++++++++++++++-
 .../components/settings/textarea.js           |  2 +-
 .../edit-block/components/settings/width.js   |  2 +-
 .../helpers/getSettingsComponent.js           |  2 +-
 .../edit-block/helpers/getSettingsDefaults.js | 15 +---------
 php/Blocks/Controls/Multiselect.php           | 10 ++-----
 php/Blocks/Controls/Radio.php                 |  8 +----
 php/Blocks/Controls/Select.php                |  8 +----
 .../Unit/Blocks/Controls/TestMultiselect.php  |  4 +--
 tests/php/Unit/Blocks/Controls/TestRadio.php  |  2 +-
 tests/php/Unit/Blocks/Controls/TestSelect.php |  2 +-
 21 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/js/src/edit-block/components/editor.js b/js/src/edit-block/components/editor.js
index 6c5ee15a3..69cd000d7 100644
--- a/js/src/edit-block/components/editor.js
+++ b/js/src/edit-block/components/editor.js
@@ -74,6 +74,16 @@ import {
  * @property {string} [width] The width, like '25'.
  */
 
+/**
+ * @typedef {Object} Setting A field setting.
+ * @see PHP class Genesis\CustomBlocks\Blocks\Controls\ControlSetting
+ * @property {string} name The name of the setting.
+ * @property {string} label The label of the setting to display in the GCB editor.
+ * @property {string} help A help value that display in the GCB editor.
+ * @property {string} type The setting type, like 'width' or 'text', not a data type like boolean.
+ * @property {*} default The default value.
+ */
+
 /**
  * The editor component.
  *
diff --git a/js/src/edit-block/components/input.js b/js/src/edit-block/components/input.js
index 24d7f47d8..fc6b11121 100644
--- a/js/src/edit-block/components/input.js
+++ b/js/src/edit-block/components/input.js
@@ -6,7 +6,7 @@ import * as React from 'react';
 /**
  * @typedef {Object} InputProps The component props.
  * @property {Function} handleOnChange Handles a change in this setting.
- * @property {Object} setting This setting.
+ * @property {import('./editor').Setting} setting This setting.
  * @property {string} type The type of <input>, like 'text'.
  * @property {string|undefined} value The setting value.
  * @property {number} [min] The min attribute of an input[type="number"].
diff --git a/js/src/edit-block/components/select.js b/js/src/edit-block/components/select.js
index a0f87863e..2720ad94c 100644
--- a/js/src/edit-block/components/select.js
+++ b/js/src/edit-block/components/select.js
@@ -8,7 +8,7 @@ import * as React from 'react';
  * @property {Function} handleOnChange Handles a change in this setting.
  * @property {string} id The id attribute.
  * @property {Array} options The options, including their label and value.
- * @property {Object} setting This setting.
+ * @property {import('./editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  */
 
diff --git a/js/src/edit-block/components/settings/checkbox.js b/js/src/edit-block/components/settings/checkbox.js
index be1afdce1..ccc5ea58f 100644
--- a/js/src/edit-block/components/settings/checkbox.js
+++ b/js/src/edit-block/components/settings/checkbox.js
@@ -6,7 +6,7 @@ import * as React from 'react';
 /**
  * @typedef {Object} CheckboxProps The component props.
  * @property {Function} handleOnChange Handles a change in this setting.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {boolean|undefined} value The setting value.
  */
 
diff --git a/js/src/edit-block/components/settings/email.js b/js/src/edit-block/components/settings/email.js
index 6e5d308b2..955e60c36 100644
--- a/js/src/edit-block/components/settings/email.js
+++ b/js/src/edit-block/components/settings/email.js
@@ -10,7 +10,7 @@ import { Input } from '../';
 
 /**
  * @typedef {Object} EmailProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change in this setting.
  */
diff --git a/js/src/edit-block/components/settings/location.js b/js/src/edit-block/components/settings/location.js
index 36e2c4dba..c330f22d7 100644
--- a/js/src/edit-block/components/settings/location.js
+++ b/js/src/edit-block/components/settings/location.js
@@ -11,7 +11,7 @@ import { LOCATIONS_WITH_LABEL, LOCATIONS } from '../../constants';
 
 /**
  * @typedef {Object} LocationProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change to this setting.
  * @property {Function} setCurrentLocation Sets the selected location, like 'editor'.
diff --git a/js/src/edit-block/components/settings/new-line-format.js b/js/src/edit-block/components/settings/new-line-format.js
index bc22c061e..2967fba58 100644
--- a/js/src/edit-block/components/settings/new-line-format.js
+++ b/js/src/edit-block/components/settings/new-line-format.js
@@ -15,7 +15,7 @@ import { Select } from '../';
 
 /**
  * @typedef {Object} NewLineFormatProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change to this setting.
  */
diff --git a/js/src/edit-block/components/settings/number-non-negative.js b/js/src/edit-block/components/settings/number-non-negative.js
index 8dfa4a669..5fefce7d5 100644
--- a/js/src/edit-block/components/settings/number-non-negative.js
+++ b/js/src/edit-block/components/settings/number-non-negative.js
@@ -10,7 +10,7 @@ import { Input } from '../';
 
 /**
  * @typedef {Object} NumberNonNegativeProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change in this setting.
  */
diff --git a/js/src/edit-block/components/settings/number.js b/js/src/edit-block/components/settings/number.js
index 63251f299..e0a4f31a1 100644
--- a/js/src/edit-block/components/settings/number.js
+++ b/js/src/edit-block/components/settings/number.js
@@ -10,7 +10,7 @@ import { Input } from '../';
 
 /**
  * @typedef {Object} NumberProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change in this setting.
  */
diff --git a/js/src/edit-block/components/settings/text.js b/js/src/edit-block/components/settings/text.js
index 6036c6cc2..a1f141335 100644
--- a/js/src/edit-block/components/settings/text.js
+++ b/js/src/edit-block/components/settings/text.js
@@ -10,7 +10,7 @@ import { Input } from '../';
 
 /**
  * @typedef {Object} TextProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change in this setting.
  */
diff --git a/js/src/edit-block/components/settings/textarea-array.js b/js/src/edit-block/components/settings/textarea-array.js
index 9eb324f52..a2b0761e7 100644
--- a/js/src/edit-block/components/settings/textarea-array.js
+++ b/js/src/edit-block/components/settings/textarea-array.js
@@ -3,6 +3,11 @@
  */
 import * as React from 'react';
 
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies
  */
@@ -11,7 +16,7 @@ import { convertSettingsStringToArray, convertSettingsArrayToString } from '../.
 /**
  * @typedef {Object} TextareaArrayProps The component props.
  * @property {Function} handleOnChange Handles a change in this setting.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {Array|undefined} value The setting value.
  */
 
@@ -25,6 +30,7 @@ const TextareaArray = ( { handleOnChange, setting, value } ) => {
 	const id = `setting-textarea-array-${ setting.name }`;
 	const stringValue = convertSettingsArrayToString( value );
 	const textAreaValue = undefined === stringValue ? setting.default : stringValue;
+	const helpClass = 'block italic text-xs mt-1';
 
 	return (
 		<>
@@ -40,6 +46,28 @@ const TextareaArray = ( { handleOnChange, setting, value } ) => {
 				} }
 				value={ textAreaValue }
 			/>
+			{ Boolean( setting.help )
+				? (
+					<p className={ helpClass }>
+						{ setting.help }
+					</p>
+				) : (
+					<>
+						<p className={ helpClass }>
+							{ __(
+								'Each choice on a new line. To specify the value and label separately, use this format:',
+								'genesis-custom-blocks'
+							) }
+						</p>
+						<p className={ helpClass }>
+							foo : Foo
+						</p>
+						<p className={ helpClass }>
+							bar : Bar
+						</p>
+					</>
+				)
+			}
 		</>
 	);
 };
diff --git a/js/src/edit-block/components/settings/textarea.js b/js/src/edit-block/components/settings/textarea.js
index 204f83be5..f95a986cd 100644
--- a/js/src/edit-block/components/settings/textarea.js
+++ b/js/src/edit-block/components/settings/textarea.js
@@ -6,7 +6,7 @@ import * as React from 'react';
 /**
  * @typedef {Object} TextareaProps The component props.
  * @property {Function} handleOnChange Handles a change in this setting.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  */
 
diff --git a/js/src/edit-block/components/settings/width.js b/js/src/edit-block/components/settings/width.js
index 955d1b8e2..7035521aa 100644
--- a/js/src/edit-block/components/settings/width.js
+++ b/js/src/edit-block/components/settings/width.js
@@ -11,7 +11,7 @@ import { __ } from '@wordpress/i18n';
 
 /**
  * @typedef {Object} WidthProps The component props.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {string|undefined} value The setting value.
  * @property {Function} handleOnChange Handles a change in this setting.
  */
diff --git a/js/src/edit-block/helpers/getSettingsComponent.js b/js/src/edit-block/helpers/getSettingsComponent.js
index 2f2b2c89e..c5de62363 100644
--- a/js/src/edit-block/helpers/getSettingsComponent.js
+++ b/js/src/edit-block/helpers/getSettingsComponent.js
@@ -17,7 +17,7 @@ import { snakeCaseToPascalCase } from '../../common/helpers';
 /**
  * @typedef {Object} SettingsComponentProps The component props.
  * @property {Function} handleOnChange Handles a change in this setting.
- * @property {Object} setting This setting.
+ * @property {import('../editor').Setting} setting This setting.
  * @property {boolean|undefined} value The setting value.
  * @property {Function} setCurrentLocation Sets the current location, like 'editor'.
  */
diff --git a/js/src/edit-block/helpers/getSettingsDefaults.js b/js/src/edit-block/helpers/getSettingsDefaults.js
index 32772e890..1bff1f91c 100644
--- a/js/src/edit-block/helpers/getSettingsDefaults.js
+++ b/js/src/edit-block/helpers/getSettingsDefaults.js
@@ -1,16 +1,3 @@
-/**
- * @typedef {Object} Setting A field setting.
- * @see PHP class Genesis\CustomBlocks\Blocks\Controls\ControlSetting
- * @property {string} name Setting name (slug).
- * @property {string} label Setting label.
- * @property {string} type Setting type, not a data type like 'object'.
- * @property {*} default Setting default value.
- * @property {string} help Setting help text for the editor.
- * @property {*} sanitize To sanitize the setting value.
- * @property {*} validate To validate the value.
- * @property {*} value The current value.
- */
-
 /**
  * Gets the settings defaults for a given control.
  *
@@ -31,7 +18,7 @@ const getSettingsDefaults = ( controlName, controls ) => {
 	return controls[ controlName ].settings.reduce(
 		/**
 		 * @param {Object} accumulator The reducer's accumulator.
-		 * @param {Setting} setting The field setting.
+		 * @param {import('../components/editor').Setting} setting The field setting.
 		 * @return {Object} Key/value pairs of a setting name to its default value.
 		 */
 		( accumulator, setting ) => ( {
diff --git a/php/Blocks/Controls/Multiselect.php b/php/Blocks/Controls/Multiselect.php
index 7a138a28c..7a009a43c 100644
--- a/php/Blocks/Controls/Multiselect.php
+++ b/php/Blocks/Controls/Multiselect.php
@@ -53,13 +53,7 @@ public function register_settings() {
 				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => sprintf(
-					'%s %s<br />%s<br />%s',
-					__( 'Enter each choice on a new line.', 'genesis-custom-blocks' ),
-					__( 'To specify the value and label separately, use this format:', 'genesis-custom-blocks' ),
-					_x( 'foo : Foo', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' ),
-					_x( 'bar : Bar', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' )
-				),
+				'help'     => '',
 				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
 			]
 		);
@@ -69,7 +63,7 @@ public function register_settings() {
 				'label'    => __( 'Default Value', 'genesis-custom-blocks' ),
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => __( 'Enter each default value on a new line.', 'genesis-custom-blocks' ),
+				'help'     => __( 'Each default value on a new line.', 'genesis-custom-blocks' ),
 				'sanitize' => [ $this, 'sanitize_textarea_array' ],
 				'validate' => [ $this, 'validate_options' ],
 			]
diff --git a/php/Blocks/Controls/Radio.php b/php/Blocks/Controls/Radio.php
index 9c3203dc9..03e0dc257 100644
--- a/php/Blocks/Controls/Radio.php
+++ b/php/Blocks/Controls/Radio.php
@@ -46,13 +46,7 @@ public function register_settings() {
 				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => sprintf(
-					'%s %s<br />%s<br />%s',
-					__( 'Enter each choice on a new line.', 'genesis-custom-blocks' ),
-					__( 'To specify the value and label separately, use this format:', 'genesis-custom-blocks' ),
-					_x( 'foo : Foo', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' ),
-					_x( 'bar : Bar', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' )
-				),
+				'help'     => '',
 				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
 			]
 		);
diff --git a/php/Blocks/Controls/Select.php b/php/Blocks/Controls/Select.php
index b894dd976..c4069ba89 100644
--- a/php/Blocks/Controls/Select.php
+++ b/php/Blocks/Controls/Select.php
@@ -46,13 +46,7 @@ public function register_settings() {
 				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => sprintf(
-					'%s %s<br />%s<br />%s',
-					__( 'Enter each choice on a new line.', 'genesis-custom-blocks' ),
-					__( 'To specify the value and label separately, use this format:', 'genesis-custom-blocks' ),
-					_x( 'foo : Foo', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' ),
-					_x( 'bar : Bar', 'Format for the menu values. option_value : Option Name', 'genesis-custom-blocks' )
-				),
+				'help'     => '',
 				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
 			]
 		);
diff --git a/tests/php/Unit/Blocks/Controls/TestMultiselect.php b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
index 3ab57a665..1d49ea5d8 100644
--- a/tests/php/Unit/Blocks/Controls/TestMultiselect.php
+++ b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
@@ -85,7 +85,7 @@ public function test_register_settings() {
 				'label'    => 'Choices',
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => 'Enter each choice on a new line. To specify the value and label separately, use this format:<br />foo : Foo<br />bar : Bar',
+				'help'     => '',
 				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
 				'validate' => '',
 				'value'    => null,
@@ -95,7 +95,7 @@ public function test_register_settings() {
 				'label'    => 'Default Value',
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => 'Enter each default value on a new line.',
+				'help'     => 'Each default value on a new line.',
 				'sanitize' => [ $this->instance, 'sanitize_textarea_array' ],
 				'validate' => [ $this->instance, 'validate_options' ],
 				'value'    => null,
diff --git a/tests/php/Unit/Blocks/Controls/TestRadio.php b/tests/php/Unit/Blocks/Controls/TestRadio.php
index ca90ae0e7..4f04dcb7c 100644
--- a/tests/php/Unit/Blocks/Controls/TestRadio.php
+++ b/tests/php/Unit/Blocks/Controls/TestRadio.php
@@ -85,7 +85,7 @@ public function test_register_settings() {
 				'label'    => 'Choices',
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => 'Enter each choice on a new line. To specify the value and label separately, use this format:<br />foo : Foo<br />bar : Bar',
+				'help'     => '',
 				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
 				'validate' => '',
 				'value'    => null,
diff --git a/tests/php/Unit/Blocks/Controls/TestSelect.php b/tests/php/Unit/Blocks/Controls/TestSelect.php
index 241c482da..d8ab7a07c 100644
--- a/tests/php/Unit/Blocks/Controls/TestSelect.php
+++ b/tests/php/Unit/Blocks/Controls/TestSelect.php
@@ -85,7 +85,7 @@ public function test_register_settings() {
 				'label'    => 'Choices',
 				'type'     => 'textarea_array',
 				'default'  => '',
-				'help'     => 'Enter each choice on a new line. To specify the value and label separately, use this format:<br />foo : Foo<br />bar : Bar',
+				'help'     => '',
 				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
 				'validate' => '',
 				'value'    => null,

From 9176d61b7ed41fa9b688a80c944b2df8e7f6b60f Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 4 Feb 2021 15:36:54 -0600
Subject: [PATCH 02/21] Let e2e tests run by changing to wp-env

It looks like it
has to be wp-env in CircleCI.
---
 .circleci/config.yml | 2 +-
 package.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d47b65fb6..1eb3e604a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,7 @@ jobs:
           node-version: lts
       - nodegit-workaround
       - set-up-packages
-      - run: npm run env start && npm run test:e2e
+      - run: npm run wp-env start && npm run test:e2e
 
   svn-deploy:
     executor:
diff --git a/package.json b/package.json
index b2167ff08..05d6aa239 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "check-licenses": "wp-scripts check-licenses --prod --gpl2",
     "build": "wp-scripts build",
     "dev": "wp-scripts start",
-    "env": "wp-env",
+    "wp-env": "wp-env",
     "gulp": "gulp",
     "lint": "npm-run-all --parallel lint:*",
     "lint:css": "wp-scripts lint-style '**/*.scss'",

From e0c1fc57b48e03081881f998d54500fe19dc7b01 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Fri, 30 Apr 2021 14:54:37 -0500
Subject: [PATCH 03/21] Remove sanitize and validate values from settings

ControlSetting doesn't have a ->sanitize or ->validate
property anymore.
So no need to pass that.
These settings are saved in React,
and are not validated.
---
 php/Blocks/Controls/Multiselect.php           | 23 +++++-----
 php/Blocks/Controls/Radio.php                 | 11 +++--
 php/Blocks/Controls/Select.php                | 11 +++--
 .../php/Unit/Blocks/Controls/TestCheckbox.php | 42 ++++++++-----------
 .../Unit/Blocks/Controls/TestMultiselect.php  | 28 ++++++-------
 tests/php/Unit/Blocks/Controls/TestRadio.php  | 14 +++----
 tests/php/Unit/Blocks/Controls/TestSelect.php | 14 +++----
 7 files changed, 62 insertions(+), 81 deletions(-)

diff --git a/php/Blocks/Controls/Multiselect.php b/php/Blocks/Controls/Multiselect.php
index 7a009a43c..467e1ffe2 100644
--- a/php/Blocks/Controls/Multiselect.php
+++ b/php/Blocks/Controls/Multiselect.php
@@ -49,23 +49,20 @@ public function register_settings() {
 		$this->settings[] = new ControlSetting( $this->settings_config['help'] );
 		$this->settings[] = new ControlSetting(
 			[
-				'name'     => 'options',
-				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
+				'name'    => 'options',
+				'label'   => __( 'Choices', 'genesis-custom-blocks' ),
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
 			]
 		);
 		$this->settings[] = new ControlSetting(
 			[
-				'name'     => 'default',
-				'label'    => __( 'Default Value', 'genesis-custom-blocks' ),
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => __( 'Each default value on a new line.', 'genesis-custom-blocks' ),
-				'sanitize' => [ $this, 'sanitize_textarea_array' ],
-				'validate' => [ $this, 'validate_options' ],
+				'name'    => 'default',
+				'label'   => __( 'Default Value', 'genesis-custom-blocks' ),
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => __( 'Each default value on a new line.', 'genesis-custom-blocks' ),
 			]
 		);
 	}
diff --git a/php/Blocks/Controls/Radio.php b/php/Blocks/Controls/Radio.php
index 4cb51430d..17dac9349 100644
--- a/php/Blocks/Controls/Radio.php
+++ b/php/Blocks/Controls/Radio.php
@@ -42,12 +42,11 @@ public function register_settings() {
 		$this->settings[] = new ControlSetting( $this->settings_config['help'] );
 		$this->settings[] = new ControlSetting(
 			[
-				'name'     => 'options',
-				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
+				'name'    => 'options',
+				'label'   => __( 'Choices', 'genesis-custom-blocks' ),
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
 			]
 		);
 		$this->settings[] = new ControlSetting(
diff --git a/php/Blocks/Controls/Select.php b/php/Blocks/Controls/Select.php
index 39e9ab5a9..3b101615b 100644
--- a/php/Blocks/Controls/Select.php
+++ b/php/Blocks/Controls/Select.php
@@ -42,12 +42,11 @@ public function register_settings() {
 		$this->settings[] = new ControlSetting( $this->settings_config['help'] );
 		$this->settings[] = new ControlSetting(
 			[
-				'name'     => 'options',
-				'label'    => __( 'Choices', 'genesis-custom-blocks' ),
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this, 'sanitize_textarea_assoc_array' ],
+				'name'    => 'options',
+				'label'   => __( 'Choices', 'genesis-custom-blocks' ),
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
 			]
 		);
 		$this->settings[] = new ControlSetting(
diff --git a/tests/php/Unit/Blocks/Controls/TestCheckbox.php b/tests/php/Unit/Blocks/Controls/TestCheckbox.php
index 7f476e135..8d17bb3f6 100644
--- a/tests/php/Unit/Blocks/Controls/TestCheckbox.php
+++ b/tests/php/Unit/Blocks/Controls/TestCheckbox.php
@@ -52,34 +52,28 @@ public function test_construct() {
 	public function test_register_settings() {
 		$expected_settings = [
 			[
-				'name'     => 'location',
-				'label'    => 'Field Location',
-				'type'     => 'location',
-				'default'  => 'editor',
-				'help'     => '',
-				'sanitize' => [ $this->instance, 'sanitize_location' ],
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'location',
+				'label'   => 'Field Location',
+				'type'    => 'location',
+				'default' => 'editor',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
-				'name'     => 'width',
-				'label'    => 'Field Width',
-				'type'     => 'width',
-				'default'  => '100',
-				'help'     => '',
-				'sanitize' => 'sanitize_text_field',
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'width',
+				'label'   => 'Field Width',
+				'type'    => 'width',
+				'default' => '100',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
-				'name'     => 'help',
-				'label'    => 'Help Text',
-				'type'     => 'text',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => 'sanitize_text_field',
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'help',
+				'label'   => 'Help Text',
+				'type'    => 'text',
+				'default' => '',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
 				'name'     => 'default',
diff --git a/tests/php/Unit/Blocks/Controls/TestMultiselect.php b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
index 11f2b843b..32cc31f43 100644
--- a/tests/php/Unit/Blocks/Controls/TestMultiselect.php
+++ b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
@@ -75,24 +75,20 @@ public function test_register_settings() {
 				'value'   => null,
 			],
 			[
-				'name'     => 'options',
-				'label'    => 'Choices',
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'options',
+				'label'   => 'Choices',
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
-				'name'     => 'default',
-				'label'    => 'Default Value',
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => 'Each default value on a new line.',
-				'sanitize' => [ $this->instance, 'sanitize_textarea_array' ],
-				'validate' => [ $this->instance, 'validate_options' ],
-				'value'    => null,
+				'name'    => 'default',
+				'label'   => 'Default Value',
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => 'Each default value on a new line.',
+				'value'   => null,
 			],
 		];
 		$this->assert_correct_settings( $expected_settings, $this->instance->settings );
diff --git a/tests/php/Unit/Blocks/Controls/TestRadio.php b/tests/php/Unit/Blocks/Controls/TestRadio.php
index ffcc925f8..0f3c0f86b 100644
--- a/tests/php/Unit/Blocks/Controls/TestRadio.php
+++ b/tests/php/Unit/Blocks/Controls/TestRadio.php
@@ -75,14 +75,12 @@ public function test_register_settings() {
 				'value'   => null,
 			],
 			[
-				'name'     => 'options',
-				'label'    => 'Choices',
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'options',
+				'label'   => 'Choices',
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
 				'name'    => 'default',
diff --git a/tests/php/Unit/Blocks/Controls/TestSelect.php b/tests/php/Unit/Blocks/Controls/TestSelect.php
index 9d33d6aca..ff64fc3fb 100644
--- a/tests/php/Unit/Blocks/Controls/TestSelect.php
+++ b/tests/php/Unit/Blocks/Controls/TestSelect.php
@@ -75,14 +75,12 @@ public function test_register_settings() {
 				'value'   => null,
 			],
 			[
-				'name'     => 'options',
-				'label'    => 'Choices',
-				'type'     => 'textarea_array',
-				'default'  => '',
-				'help'     => '',
-				'sanitize' => [ $this->instance, 'sanitize_textarea_assoc_array' ],
-				'validate' => '',
-				'value'    => null,
+				'name'    => 'options',
+				'label'   => 'Choices',
+				'type'    => 'textarea_array',
+				'default' => '',
+				'help'    => '',
+				'value'   => null,
 			],
 			[
 				'name'    => 'default',

From 4af23d443d1fb531d523059629104180758747bf Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 2 May 2021 23:59:37 -0500
Subject: [PATCH 04/21] If a field is deleted, also delete it from the
 previewAttributes

If the field no longer exists,
there's no need to add it to the
block's attributes.
---
 js/src/edit-block/hooks/useField.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/src/edit-block/hooks/useField.js b/js/src/edit-block/hooks/useField.js
index 19f9b990f..dd6537302 100644
--- a/js/src/edit-block/hooks/useField.js
+++ b/js/src/edit-block/hooks/useField.js
@@ -320,6 +320,7 @@ const useField = () => {
 	 */
 	const deleteField = ( selectedField ) => {
 		const newBlock = { ...block };
+
 		if (
 			selectedField.hasOwnProperty( 'parent' ) &&
 			newBlock.fields[ selectedField.parent ] &&
@@ -328,6 +329,7 @@ const useField = () => {
 			delete newBlock.fields[ selectedField.parent ].sub_fields[ selectedField.name ];
 		} else {
 			delete newBlock.fields[ selectedField.name ];
+			delete newBlock?.previewAttributes[ selectedField.name ];
 		}
 
 		editBlock( newBlock );

From a344c514e1d1094676859f5744ad64cbd3b5fa05 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 14:20:37 -0500
Subject: [PATCH 05/21] See if upgrading server-side-render is possible

There's a new package
that was just released 3 days ago.
---
 package-lock.json | 522 ++++++++++++++++++++++++++++++++++++++++------
 package.json      |   2 +-
 2 files changed, 459 insertions(+), 65 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 843f6eeb7..617c1435d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7156,104 +7156,498 @@
       }
     },
     "@wordpress/server-side-render": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-1.19.5.tgz",
-      "integrity": "sha512-dqGgD1Sva+qKAQ7YcbDO4Y/vE4N0gVJOxo4cvCOG880I9geiTF9fzOUG3KToZM19H3Ct4UC+Cv3ARFVdQZZk3A==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.11.2",
-        "@wordpress/api-fetch": "^3.20.0",
-        "@wordpress/components": "^11.1.5",
-        "@wordpress/data": "^4.25.0",
-        "@wordpress/deprecated": "^2.10.0",
-        "@wordpress/element": "^2.18.0",
-        "@wordpress/i18n": "^3.16.0",
-        "@wordpress/url": "^2.19.0",
+      "version": "1.21.3",
+      "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-1.21.3.tgz",
+      "integrity": "sha512-pS2+LmTQX8S61TvaC+UyXqmFnQSXcJ3wcr3RPX1EwmpvlMuXlqdW8N5Y1TWuOT1G/ZDAwvTilLAlxeAMqrYSXA==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.13.10",
+        "@wordpress/api-fetch": "^4.0.0",
+        "@wordpress/blocks": "^8.0.3",
+        "@wordpress/components": "^13.0.3",
+        "@wordpress/compose": "^3.25.3",
+        "@wordpress/data": "^4.27.3",
+        "@wordpress/deprecated": "^2.12.3",
+        "@wordpress/element": "^2.20.3",
+        "@wordpress/i18n": "^3.20.0",
+        "@wordpress/url": "^2.22.2",
         "lodash": "^4.17.19"
       },
       "dependencies": {
+        "@types/react": {
+          "version": "16.14.5",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
+          "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
+          "dev": true,
+          "requires": {
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
+          }
+        },
+        "@wordpress/a11y": {
+          "version": "2.15.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-2.15.3.tgz",
+          "integrity": "sha512-uoCznHY3/TaNWeXutLI6juC198ykaBwZ34P51PNHHQqi3WzVoBhFx6AnAR/9Uupl3tZcekefpkVHy7AJHMAPIA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/dom-ready": "^2.13.2",
+            "@wordpress/i18n": "^3.20.0"
+          }
+        },
+        "@wordpress/api-fetch": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-4.0.0.tgz",
+          "integrity": "sha512-4nWH/gEpG7/VnEJbjbOWS0AWBnX5snPc3ZaKcXNZsLQlv9YgsS8idL/BNkUl9/ylZeez/UX4lJLVkOR5clvg8A==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/i18n": "^3.20.0",
+            "@wordpress/url": "^2.22.2"
+          }
+        },
+        "@wordpress/autop": {
+          "version": "2.12.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-2.12.2.tgz",
+          "integrity": "sha512-c3taxJCmf1Bib33GPm7ihrgFvuzKHycdyE+XWnpa9G3JgZUJTpssFSC5rC3VZ3u+QD8agStBtlOBOyxj6pjQSA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/blob": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-2.13.2.tgz",
+          "integrity": "sha512-Us71BMrvjiMjW9WTV1UzZbEBd+Q7W05P0WW+Tfo6qHJLBMYXPDN9dP9s6JhK6fzzL+U/PzotMJwA6P85BqL30w==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/block-serialization-default-parser": {
+          "version": "3.10.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-3.10.2.tgz",
+          "integrity": "sha512-0vyHHTcEw3ijY+stJqCf0iVR4bHpb84dbTZVaT2VSzISGzeVuAJpcYhIJMHvDTMcX1E2pgAfanIL8xloS6W7gQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/blocks": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-8.0.3.tgz",
+          "integrity": "sha512-/zXk5gEI/TCzsVSUIht5cmO+pFC6u3mpNV8ye0Cy4CEQVtauW969GvgEM+LVf8Mk8R5NcLdLPE88n8xxsFaRoQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/autop": "^2.12.2",
+            "@wordpress/blob": "^2.13.2",
+            "@wordpress/block-serialization-default-parser": "^3.10.2",
+            "@wordpress/compose": "^3.25.3",
+            "@wordpress/data": "^4.27.3",
+            "@wordpress/deprecated": "^2.12.3",
+            "@wordpress/dom": "^2.18.0",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/hooks": "^2.12.3",
+            "@wordpress/html-entities": "^2.11.2",
+            "@wordpress/i18n": "^3.20.0",
+            "@wordpress/icons": "^2.10.3",
+            "@wordpress/is-shallow-equal": "^3.1.3",
+            "@wordpress/shortcode": "^2.13.2",
+            "hpq": "^1.3.0",
+            "lodash": "^4.17.19",
+            "rememo": "^3.0.0",
+            "showdown": "^1.9.1",
+            "simple-html-tokenizer": "^0.5.7",
+            "tinycolor2": "^1.4.2",
+            "uuid": "^8.3.0"
+          }
+        },
         "@wordpress/components": {
-          "version": "11.1.5",
-          "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-11.1.5.tgz",
-          "integrity": "sha512-XOVD4HgqvizuqMtY1XzppNiw2ET2VefGtdclewb3sB/eBxkNtqb2hl9mHBG547Au0QZnsOylK9AOAZI0eYhMOw==",
+          "version": "13.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-13.0.3.tgz",
+          "integrity": "sha512-L5cCeZvhFsLlGVxuAIFwqZotLqrwrisFjikd6a0Aj8jlTZrb9vNQ4mDXU1Zz2toHCH3NegIUAHMHOs3Jf46tWg==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.11.2",
-            "@emotion/core": "^10.0.22",
+            "@babel/runtime": "^7.13.10",
+            "@emotion/cache": "^10.0.27",
+            "@emotion/core": "^10.1.1",
             "@emotion/css": "^10.0.22",
+            "@emotion/hash": "^0.8.0",
             "@emotion/native": "^10.0.22",
             "@emotion/styled": "^10.0.23",
-            "@wordpress/a11y": "^2.13.0",
-            "@wordpress/compose": "^3.22.0",
-            "@wordpress/date": "^3.12.0",
-            "@wordpress/deprecated": "^2.10.0",
-            "@wordpress/dom": "^2.15.0",
-            "@wordpress/element": "^2.18.0",
-            "@wordpress/hooks": "^2.10.0",
-            "@wordpress/i18n": "^3.16.0",
-            "@wordpress/icons": "^2.8.0",
-            "@wordpress/is-shallow-equal": "^2.3.0",
-            "@wordpress/keycodes": "^2.16.0",
-            "@wordpress/primitives": "^1.10.0",
-            "@wordpress/rich-text": "^3.23.0",
-            "@wordpress/warning": "^1.3.0",
+            "@wordpress/a11y": "^2.15.3",
+            "@wordpress/compose": "^3.25.3",
+            "@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",
+            "@wordpress/warning": "^1.4.2",
+            "@wp-g2/components": "^0.0.160",
+            "@wp-g2/context": "^0.0.160",
+            "@wp-g2/styles": "^0.0.160",
+            "@wp-g2/utils": "^0.0.160",
             "classnames": "^2.2.5",
             "dom-scroll-into-view": "^1.2.1",
-            "downshift": "^5.4.0",
+            "downshift": "^6.0.15",
             "gradient-parser": "^0.1.5",
+            "highlight-words-core": "^1.2.2",
             "lodash": "^4.17.19",
             "memize": "^1.1.0",
             "moment": "^2.22.1",
             "re-resizable": "^6.4.0",
             "react-dates": "^17.1.1",
-            "react-merge-refs": "^1.0.0",
-            "react-resize-aware": "^3.0.1",
+            "react-resize-aware": "^3.1.0",
             "react-spring": "^8.0.20",
-            "react-use-gesture": "^7.0.15",
-            "reakit": "^1.1.0",
+            "react-use-gesture": "^9.0.0",
+            "reakit": "^1.3.5",
             "rememo": "^3.0.0",
-            "tinycolor2": "^1.4.1",
-            "uuid": "^7.0.2"
+            "tinycolor2": "^1.4.2",
+            "uuid": "^8.3.0"
+          }
+        },
+        "@wordpress/compose": {
+          "version": "3.25.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-3.25.3.tgz",
+          "integrity": "sha512-tCO2EnJCkCH548OqA0uU8V1k/1skz2QwBlHs8ZQSpimqUS4OWWsAlndCEFe4U4vDTqFt2ow7tzAir+05Cw8MAg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/deprecated": "^2.12.3",
+            "@wordpress/dom": "^2.18.0",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/is-shallow-equal": "^3.1.3",
+            "@wordpress/keycodes": "^2.19.3",
+            "@wordpress/priority-queue": "^1.11.2",
+            "clipboard": "^2.0.1",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0",
+            "mousetrap": "^1.6.5",
+            "react-resize-aware": "^3.1.0",
+            "use-memo-one": "^1.1.1"
+          }
+        },
+        "@wordpress/data": {
+          "version": "4.27.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-4.27.3.tgz",
+          "integrity": "sha512-5763NgNV9IIa1CC3Q80dAvrH6108tJtj3IrHfUCZmUk1atSNsOMBCkLdQ7tGTTi2JFejeGEMg1LJI22JD5zM6Q==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/compose": "^3.25.3",
+            "@wordpress/deprecated": "^2.12.3",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/is-shallow-equal": "^3.1.3",
+            "@wordpress/priority-queue": "^1.11.2",
+            "@wordpress/redux-routine": "^3.14.2",
+            "equivalent-key-map": "^0.2.2",
+            "is-promise": "^4.0.0",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0",
+            "redux": "^4.0.0",
+            "turbo-combine-reducers": "^1.0.2",
+            "use-memo-one": "^1.1.1"
+          }
+        },
+        "@wordpress/date": {
+          "version": "3.15.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-3.15.1.tgz",
+          "integrity": "sha512-SuHiObvjbegL8RpaSQ6JqFnG+QyGP+oUhx1FZDMdt1nOQA9HE7D5ssVlZFlMEAdo6iS8xMuW+4SgJN3Eo1fb4w==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "moment": "^2.22.1",
+            "moment-timezone": "^0.5.31"
+          }
+        },
+        "@wordpress/deprecated": {
+          "version": "2.12.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-2.12.3.tgz",
+          "integrity": "sha512-qr+yDfTQfI3M4h6oY6IeHWwoHr4jxbILjSlV+Ht6Jjto9Owap6OuzSqR13Ev4xqIoG4C7b5B3gZXVfwVDae1zg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/hooks": "^2.12.3"
+          }
+        },
+        "@wordpress/dom": {
+          "version": "2.18.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.18.0.tgz",
+          "integrity": "sha512-tM2WeQuSObl3nzWjUTF0/dyLnA7sdl/MXaSe32D64OF89bjSyJvjUipI7gjKzI3kJ7ddGhwcTggGvSB06MOoCQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@wordpress/dom-ready": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-2.13.2.tgz",
+          "integrity": "sha512-COH7n2uZfBq4FtluSbl37N3nCEcdMXzV42ETCWKUcumiP1Zd3qnkfQKcsxTaHWY8aVt/358RvJ7ghWe3xAd+fg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/element": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-2.20.3.tgz",
+          "integrity": "sha512-f4ZPTDf9CxiiOXiMxc4v1K7jcBMT4dsiehVOpkKzCDKboNXp4qVf8oe5PE23VGZNEjcOj5Mkg9hB57R0nqvMTw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@types/react": "^16.9.0",
+            "@types/react-dom": "^16.9.0",
+            "@wordpress/escape-html": "^1.12.2",
+            "lodash": "^4.17.19",
+            "react": "^16.13.1",
+            "react-dom": "^16.13.1"
+          }
+        },
+        "@wordpress/escape-html": {
+          "version": "1.12.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.2.tgz",
+          "integrity": "sha512-FabgSwznhdaUwe6hr1CsGpgxQbzqEoGevv73WIL1B9GvlZ6csRWodgHfWh4P6fYqpzxFL4WYB8wPJ1PdO32XFA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/hooks": {
+          "version": "2.12.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-2.12.3.tgz",
+          "integrity": "sha512-LmKiwKldZt6UYqOxV/a6+eUFXdvALFnB/pQx3RmrMvO64sgFhfR6dhrlv+uVbuuezSuv8dce1jx8lUWAT0krMA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/html-entities": {
+          "version": "2.11.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-2.11.2.tgz",
+          "integrity": "sha512-WIdEGO9/o7tuTV3jpLHhFC/NBBnNdJeG9nRZbEyb37CL1fvqJA85hTugyDOhGzOVIAtpFTc6kr/gMJK1oTdopw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/i18n": {
+          "version": "3.20.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-3.20.0.tgz",
+          "integrity": "sha512-SIoOJFB4UrrYAScS4H91CYCLW9dX3Ghv8pBKc/yHGculb1AdGr6gRMlmJxZV62Cn3CZ4Ga86c+FfR+GiBu0JPg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/hooks": "^2.12.3",
+            "gettext-parser": "^1.3.1",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0",
+            "sprintf-js": "^1.1.1",
+            "tannin": "^1.2.0"
+          }
+        },
+        "@wordpress/icons": {
+          "version": "2.10.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-2.10.3.tgz",
+          "integrity": "sha512-hVXArGOHLE5pL1G3rHNzsUEuTR4/G6lB+enKYwhYSSIqWuSbyXbZq3nvibxpepPrLy9B3d5t6aR6QUmjMVzIcQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/primitives": "^1.12.3"
           }
         },
         "@wordpress/is-shallow-equal": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-2.3.0.tgz",
-          "integrity": "sha512-BUVCYZNDoT5fRJGoam/nI2Sn8QELu5z/pFe7UL+szFqQqNnMibdWqN/KoW/YO7WLJqqqTRhAs/Fa51g4oXRyHQ==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-3.1.3.tgz",
+          "integrity": "sha512-eDLhfC4aaSgklzqwc6F/F4zmJVpTVTAvhqX+q0SP/8LPcP2HuKErPHVrEc75PMWqIutja2wJg98YSNPdewrj1w==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.11.2"
+            "@babel/runtime": "^7.13.10"
           }
         },
-        "downshift": {
-          "version": "5.4.7",
-          "resolved": "https://registry.npmjs.org/downshift/-/downshift-5.4.7.tgz",
-          "integrity": "sha512-xaH0RNqwJ5pAsyk9qBmR9XJWmg1OOWMfrhzYv0NH2NjJxn77S3zBcfClw341UfhGyKg5v+qVqg/CQzvAgBNCXQ==",
+        "@wordpress/keycodes": {
+          "version": "2.19.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.19.3.tgz",
+          "integrity": "sha512-8rNdmP5M1ifTgLIL0dt/N1uTGsq/Rx1ydCXy+gg24WdxBRhyu5sudNVCtascVXo26aIfOH9OJRdqRZZTEORhog==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.10.2",
-            "compute-scroll-into-view": "^1.0.14",
-            "prop-types": "^15.7.2",
-            "react-is": "^16.13.1"
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/i18n": "^3.20.0",
+            "lodash": "^4.17.19"
           }
         },
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-          "dev": true
+        "@wordpress/primitives": {
+          "version": "1.12.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-1.12.3.tgz",
+          "integrity": "sha512-LIF44bVlJS7CJEVmk6TLuV6HZMdj5iwkyM8do4ukGY6qnZIzrXpBablgJeDBcyjzWrWRLn+w+tiZ/8l+2egoVA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/element": "^2.20.3",
+            "classnames": "^2.2.5"
+          }
+        },
+        "@wordpress/priority-queue": {
+          "version": "1.11.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-1.11.2.tgz",
+          "integrity": "sha512-ulwmUOklY3orn1xXpcPnTyGWV5B/oycxI+cHZ6EevBVgM5sq+BW3xo0PKLR/MMm6UNBtFTu/71QAJrNZcD6V1g==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/redux-routine": {
+          "version": "3.14.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-3.14.2.tgz",
+          "integrity": "sha512-aqi4UtvMP/+NhULxyCR8ktG0v4BJVTRcMpByAqDg7Oabq2sz2LPuShxd5UY8vxQYQY9t1uUJbslhom4ytcohWg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "is-promise": "^4.0.0",
+            "lodash": "^4.17.19",
+            "rungen": "^0.3.2"
+          }
+        },
+        "@wordpress/rich-text": {
+          "version": "3.25.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-3.25.3.tgz",
+          "integrity": "sha512-FdqL1/rHTsRxZ1gW1UEWuy0URmUEqMzj5hcAbOhHFPO5m0ENrkzC9bBa195KqZBSNSmBmXnDZdHu4UJUolzcZg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/compose": "^3.25.3",
+            "@wordpress/data": "^4.27.3",
+            "@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.2.5",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0",
+            "rememo": "^3.0.0"
+          }
+        },
+        "@wordpress/shortcode": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-2.13.2.tgz",
+          "integrity": "sha512-n4O5O66ARGY+h1SCvt0uOIQAJ6B4hd6EjULAWRNYgQuuF9mdhcczpGvSH76BssuvLN6bJU1RjsVy7m56kqO5xw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0"
+          }
         },
-        "react-use-gesture": {
-          "version": "7.0.16",
-          "resolved": "https://registry.npmjs.org/react-use-gesture/-/react-use-gesture-7.0.16.tgz",
-          "integrity": "sha512-gwgX+E+WQG0T1uFVl3z8j3ZwH3QQGIgVl7VtQEC2m0IscSs668sSps4Ss3CFp3Vns8xx0j9TVK4aBXH6+YrpEg==",
+        "@wordpress/url": {
+          "version": "2.22.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.22.2.tgz",
+          "integrity": "sha512-aqpYKQXzyzkCOm+GzZRYlLb+wh58g0cwR1PaKAl0UXaBS4mdS+X6biMriylb4P8CVC/RR7CSw5XI20JC24KDwQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "lodash": "^4.17.19",
+            "react-native-url-polyfill": "^1.1.2"
+          }
+        },
+        "@wordpress/warning": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-1.4.2.tgz",
+          "integrity": "sha512-MjrkSp6Jyfx+92AE32A83P503noUtGb6//BYUH4GiWzzzSNhDHgbQ0UcOJwJaEYK166DxSNpMk/JXc4YENi1Cw==",
           "dev": true
         },
-        "uuid": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+        "@wp-g2/components": {
+          "version": "0.0.160",
+          "resolved": "https://registry.npmjs.org/@wp-g2/components/-/components-0.0.160.tgz",
+          "integrity": "sha512-44qUtiF5Nl/srD7Vzbpcd0im/EIej04fOdDfa0lfDxXJDNK3RRtSSEwCRhok/M5SKCmvYbZKRUx2K0ugXNqK0Q==",
+          "dev": true,
+          "requires": {
+            "@popperjs/core": "^2.5.4",
+            "@wp-g2/context": "^0.0.160",
+            "@wp-g2/styles": "^0.0.160",
+            "@wp-g2/utils": "^0.0.160",
+            "csstype": "^3.0.3",
+            "downshift": "^6.0.15",
+            "framer-motion": "^2.1.0",
+            "highlight-words-core": "^1.2.2",
+            "history": "^4.9.0",
+            "lodash": "^4.17.19",
+            "path-to-regexp": "^1.7.0",
+            "react-colorful": "4.4.4",
+            "react-textarea-autosize": "^8.2.0",
+            "react-use-gesture": "^9.0.0",
+            "reakit": "^1.3.4"
+          }
+        },
+        "@wp-g2/context": {
+          "version": "0.0.160",
+          "resolved": "https://registry.npmjs.org/@wp-g2/context/-/context-0.0.160.tgz",
+          "integrity": "sha512-50wSQCZkdZEexP88Ljutskn7/klT2Id1ks4GpzKDSBM8kadrfNdr2iabjgJdFLIH33S+r4dzEnzLs9SFtqUgwg==",
+          "dev": true,
+          "requires": {
+            "@wp-g2/create-styles": "^0.0.160",
+            "@wp-g2/styles": "^0.0.160",
+            "@wp-g2/utils": "^0.0.160",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@wp-g2/styles": {
+          "version": "0.0.160",
+          "resolved": "https://registry.npmjs.org/@wp-g2/styles/-/styles-0.0.160.tgz",
+          "integrity": "sha512-o91jxb0ZwEDRJrtVVjnqn3qTAXjnxZ1fX5KF3Q7oz776lMZPHsyfC0hvqnOz0w7zqaZZpdWtVQRShgrYXN6JHw==",
+          "dev": true,
+          "requires": {
+            "@wp-g2/create-styles": "^0.0.160",
+            "@wp-g2/utils": "^0.0.160"
+          }
+        },
+        "@wp-g2/utils": {
+          "version": "0.0.160",
+          "resolved": "https://registry.npmjs.org/@wp-g2/utils/-/utils-0.0.160.tgz",
+          "integrity": "sha512-4FhezjKyeYVb+3PZahW1kmqXpCvVvuJM97EcGqkKf+u4Qf66J3n1niHgfnRbn8aNydYK6EFze+6/UL48U35z1w==",
+          "dev": true,
+          "requires": {
+            "copy-to-clipboard": "^3.3.1",
+            "create-emotion": "^10.0.27",
+            "deepmerge": "^4.2.2",
+            "fast-deep-equal": "^3.1.3",
+            "hoist-non-react-statics": "^3.3.2",
+            "json2mq": "^0.2.0",
+            "lodash": "^4.17.19",
+            "memize": "^1.1.0",
+            "react-merge-refs": "^1.1.0",
+            "react-resize-aware": "^3.1.0",
+            "tinycolor2": "^1.4.2",
+            "use-enhanced-state": "^0.0.13",
+            "use-isomorphic-layout-effect": "^1.0.0"
+          }
+        },
+        "csstype": {
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
           "dev": true
+        },
+        "downshift": {
+          "version": "6.1.3",
+          "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.3.tgz",
+          "integrity": "sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "compute-scroll-into-view": "^1.0.17",
+            "prop-types": "^15.7.2",
+            "react-is": "^17.0.2"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 7f7796edd..829285afb 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@wordpress/notices": "2.13.0",
     "@wordpress/postcss-plugins-preset": "2.1.0",
     "@wordpress/scripts": "14.1.0",
-    "@wordpress/server-side-render": "1.19.5",
+    "@wordpress/server-side-render": "1.21.3",
     "@wordpress/url": "2.22.0",
     "ace-builds": "1.4.12",
     "autoprefixer": "10.1.0",

From 5e84929aacfd09ccd9ec8fcac22cf90ab7e71207 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 14:31:07 -0500
Subject: [PATCH 06/21] Revert "See if upgrading server-side-render is
 possible"

This reverts commit a344c514e1d1094676859f5744ad64cbd3b5fa05.
---
 package-lock.json | 522 ++++++----------------------------------------
 package.json      |   2 +-
 2 files changed, 65 insertions(+), 459 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 617c1435d..843f6eeb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7156,498 +7156,104 @@
       }
     },
     "@wordpress/server-side-render": {
-      "version": "1.21.3",
-      "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-1.21.3.tgz",
-      "integrity": "sha512-pS2+LmTQX8S61TvaC+UyXqmFnQSXcJ3wcr3RPX1EwmpvlMuXlqdW8N5Y1TWuOT1G/ZDAwvTilLAlxeAMqrYSXA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.13.10",
-        "@wordpress/api-fetch": "^4.0.0",
-        "@wordpress/blocks": "^8.0.3",
-        "@wordpress/components": "^13.0.3",
-        "@wordpress/compose": "^3.25.3",
-        "@wordpress/data": "^4.27.3",
-        "@wordpress/deprecated": "^2.12.3",
-        "@wordpress/element": "^2.20.3",
-        "@wordpress/i18n": "^3.20.0",
-        "@wordpress/url": "^2.22.2",
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-1.19.5.tgz",
+      "integrity": "sha512-dqGgD1Sva+qKAQ7YcbDO4Y/vE4N0gVJOxo4cvCOG880I9geiTF9fzOUG3KToZM19H3Ct4UC+Cv3ARFVdQZZk3A==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@wordpress/api-fetch": "^3.20.0",
+        "@wordpress/components": "^11.1.5",
+        "@wordpress/data": "^4.25.0",
+        "@wordpress/deprecated": "^2.10.0",
+        "@wordpress/element": "^2.18.0",
+        "@wordpress/i18n": "^3.16.0",
+        "@wordpress/url": "^2.19.0",
         "lodash": "^4.17.19"
       },
       "dependencies": {
-        "@types/react": {
-          "version": "16.14.5",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
-          "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
-          "dev": true,
-          "requires": {
-            "@types/prop-types": "*",
-            "@types/scheduler": "*",
-            "csstype": "^3.0.2"
-          }
-        },
-        "@wordpress/a11y": {
-          "version": "2.15.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-2.15.3.tgz",
-          "integrity": "sha512-uoCznHY3/TaNWeXutLI6juC198ykaBwZ34P51PNHHQqi3WzVoBhFx6AnAR/9Uupl3tZcekefpkVHy7AJHMAPIA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/dom-ready": "^2.13.2",
-            "@wordpress/i18n": "^3.20.0"
-          }
-        },
-        "@wordpress/api-fetch": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-4.0.0.tgz",
-          "integrity": "sha512-4nWH/gEpG7/VnEJbjbOWS0AWBnX5snPc3ZaKcXNZsLQlv9YgsS8idL/BNkUl9/ylZeez/UX4lJLVkOR5clvg8A==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/i18n": "^3.20.0",
-            "@wordpress/url": "^2.22.2"
-          }
-        },
-        "@wordpress/autop": {
-          "version": "2.12.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-2.12.2.tgz",
-          "integrity": "sha512-c3taxJCmf1Bib33GPm7ihrgFvuzKHycdyE+XWnpa9G3JgZUJTpssFSC5rC3VZ3u+QD8agStBtlOBOyxj6pjQSA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/blob": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-2.13.2.tgz",
-          "integrity": "sha512-Us71BMrvjiMjW9WTV1UzZbEBd+Q7W05P0WW+Tfo6qHJLBMYXPDN9dP9s6JhK6fzzL+U/PzotMJwA6P85BqL30w==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/block-serialization-default-parser": {
-          "version": "3.10.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-3.10.2.tgz",
-          "integrity": "sha512-0vyHHTcEw3ijY+stJqCf0iVR4bHpb84dbTZVaT2VSzISGzeVuAJpcYhIJMHvDTMcX1E2pgAfanIL8xloS6W7gQ==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/blocks": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-8.0.3.tgz",
-          "integrity": "sha512-/zXk5gEI/TCzsVSUIht5cmO+pFC6u3mpNV8ye0Cy4CEQVtauW969GvgEM+LVf8Mk8R5NcLdLPE88n8xxsFaRoQ==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/autop": "^2.12.2",
-            "@wordpress/blob": "^2.13.2",
-            "@wordpress/block-serialization-default-parser": "^3.10.2",
-            "@wordpress/compose": "^3.25.3",
-            "@wordpress/data": "^4.27.3",
-            "@wordpress/deprecated": "^2.12.3",
-            "@wordpress/dom": "^2.18.0",
-            "@wordpress/element": "^2.20.3",
-            "@wordpress/hooks": "^2.12.3",
-            "@wordpress/html-entities": "^2.11.2",
-            "@wordpress/i18n": "^3.20.0",
-            "@wordpress/icons": "^2.10.3",
-            "@wordpress/is-shallow-equal": "^3.1.3",
-            "@wordpress/shortcode": "^2.13.2",
-            "hpq": "^1.3.0",
-            "lodash": "^4.17.19",
-            "rememo": "^3.0.0",
-            "showdown": "^1.9.1",
-            "simple-html-tokenizer": "^0.5.7",
-            "tinycolor2": "^1.4.2",
-            "uuid": "^8.3.0"
-          }
-        },
         "@wordpress/components": {
-          "version": "13.0.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-13.0.3.tgz",
-          "integrity": "sha512-L5cCeZvhFsLlGVxuAIFwqZotLqrwrisFjikd6a0Aj8jlTZrb9vNQ4mDXU1Zz2toHCH3NegIUAHMHOs3Jf46tWg==",
+          "version": "11.1.5",
+          "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-11.1.5.tgz",
+          "integrity": "sha512-XOVD4HgqvizuqMtY1XzppNiw2ET2VefGtdclewb3sB/eBxkNtqb2hl9mHBG547Au0QZnsOylK9AOAZI0eYhMOw==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@emotion/cache": "^10.0.27",
-            "@emotion/core": "^10.1.1",
+            "@babel/runtime": "^7.11.2",
+            "@emotion/core": "^10.0.22",
             "@emotion/css": "^10.0.22",
-            "@emotion/hash": "^0.8.0",
             "@emotion/native": "^10.0.22",
             "@emotion/styled": "^10.0.23",
-            "@wordpress/a11y": "^2.15.3",
-            "@wordpress/compose": "^3.25.3",
-            "@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",
-            "@wordpress/warning": "^1.4.2",
-            "@wp-g2/components": "^0.0.160",
-            "@wp-g2/context": "^0.0.160",
-            "@wp-g2/styles": "^0.0.160",
-            "@wp-g2/utils": "^0.0.160",
+            "@wordpress/a11y": "^2.13.0",
+            "@wordpress/compose": "^3.22.0",
+            "@wordpress/date": "^3.12.0",
+            "@wordpress/deprecated": "^2.10.0",
+            "@wordpress/dom": "^2.15.0",
+            "@wordpress/element": "^2.18.0",
+            "@wordpress/hooks": "^2.10.0",
+            "@wordpress/i18n": "^3.16.0",
+            "@wordpress/icons": "^2.8.0",
+            "@wordpress/is-shallow-equal": "^2.3.0",
+            "@wordpress/keycodes": "^2.16.0",
+            "@wordpress/primitives": "^1.10.0",
+            "@wordpress/rich-text": "^3.23.0",
+            "@wordpress/warning": "^1.3.0",
             "classnames": "^2.2.5",
             "dom-scroll-into-view": "^1.2.1",
-            "downshift": "^6.0.15",
+            "downshift": "^5.4.0",
             "gradient-parser": "^0.1.5",
-            "highlight-words-core": "^1.2.2",
             "lodash": "^4.17.19",
             "memize": "^1.1.0",
             "moment": "^2.22.1",
             "re-resizable": "^6.4.0",
             "react-dates": "^17.1.1",
-            "react-resize-aware": "^3.1.0",
+            "react-merge-refs": "^1.0.0",
+            "react-resize-aware": "^3.0.1",
             "react-spring": "^8.0.20",
-            "react-use-gesture": "^9.0.0",
-            "reakit": "^1.3.5",
+            "react-use-gesture": "^7.0.15",
+            "reakit": "^1.1.0",
             "rememo": "^3.0.0",
-            "tinycolor2": "^1.4.2",
-            "uuid": "^8.3.0"
-          }
-        },
-        "@wordpress/compose": {
-          "version": "3.25.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-3.25.3.tgz",
-          "integrity": "sha512-tCO2EnJCkCH548OqA0uU8V1k/1skz2QwBlHs8ZQSpimqUS4OWWsAlndCEFe4U4vDTqFt2ow7tzAir+05Cw8MAg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/deprecated": "^2.12.3",
-            "@wordpress/dom": "^2.18.0",
-            "@wordpress/element": "^2.20.3",
-            "@wordpress/is-shallow-equal": "^3.1.3",
-            "@wordpress/keycodes": "^2.19.3",
-            "@wordpress/priority-queue": "^1.11.2",
-            "clipboard": "^2.0.1",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0",
-            "mousetrap": "^1.6.5",
-            "react-resize-aware": "^3.1.0",
-            "use-memo-one": "^1.1.1"
-          }
-        },
-        "@wordpress/data": {
-          "version": "4.27.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-4.27.3.tgz",
-          "integrity": "sha512-5763NgNV9IIa1CC3Q80dAvrH6108tJtj3IrHfUCZmUk1atSNsOMBCkLdQ7tGTTi2JFejeGEMg1LJI22JD5zM6Q==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/compose": "^3.25.3",
-            "@wordpress/deprecated": "^2.12.3",
-            "@wordpress/element": "^2.20.3",
-            "@wordpress/is-shallow-equal": "^3.1.3",
-            "@wordpress/priority-queue": "^1.11.2",
-            "@wordpress/redux-routine": "^3.14.2",
-            "equivalent-key-map": "^0.2.2",
-            "is-promise": "^4.0.0",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0",
-            "redux": "^4.0.0",
-            "turbo-combine-reducers": "^1.0.2",
-            "use-memo-one": "^1.1.1"
-          }
-        },
-        "@wordpress/date": {
-          "version": "3.15.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/date/-/date-3.15.1.tgz",
-          "integrity": "sha512-SuHiObvjbegL8RpaSQ6JqFnG+QyGP+oUhx1FZDMdt1nOQA9HE7D5ssVlZFlMEAdo6iS8xMuW+4SgJN3Eo1fb4w==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "moment": "^2.22.1",
-            "moment-timezone": "^0.5.31"
-          }
-        },
-        "@wordpress/deprecated": {
-          "version": "2.12.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-2.12.3.tgz",
-          "integrity": "sha512-qr+yDfTQfI3M4h6oY6IeHWwoHr4jxbILjSlV+Ht6Jjto9Owap6OuzSqR13Ev4xqIoG4C7b5B3gZXVfwVDae1zg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/hooks": "^2.12.3"
-          }
-        },
-        "@wordpress/dom": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.18.0.tgz",
-          "integrity": "sha512-tM2WeQuSObl3nzWjUTF0/dyLnA7sdl/MXaSe32D64OF89bjSyJvjUipI7gjKzI3kJ7ddGhwcTggGvSB06MOoCQ==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@wordpress/dom-ready": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-2.13.2.tgz",
-          "integrity": "sha512-COH7n2uZfBq4FtluSbl37N3nCEcdMXzV42ETCWKUcumiP1Zd3qnkfQKcsxTaHWY8aVt/358RvJ7ghWe3xAd+fg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/element": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-2.20.3.tgz",
-          "integrity": "sha512-f4ZPTDf9CxiiOXiMxc4v1K7jcBMT4dsiehVOpkKzCDKboNXp4qVf8oe5PE23VGZNEjcOj5Mkg9hB57R0nqvMTw==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@types/react": "^16.9.0",
-            "@types/react-dom": "^16.9.0",
-            "@wordpress/escape-html": "^1.12.2",
-            "lodash": "^4.17.19",
-            "react": "^16.13.1",
-            "react-dom": "^16.13.1"
-          }
-        },
-        "@wordpress/escape-html": {
-          "version": "1.12.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.2.tgz",
-          "integrity": "sha512-FabgSwznhdaUwe6hr1CsGpgxQbzqEoGevv73WIL1B9GvlZ6csRWodgHfWh4P6fYqpzxFL4WYB8wPJ1PdO32XFA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/hooks": {
-          "version": "2.12.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-2.12.3.tgz",
-          "integrity": "sha512-LmKiwKldZt6UYqOxV/a6+eUFXdvALFnB/pQx3RmrMvO64sgFhfR6dhrlv+uVbuuezSuv8dce1jx8lUWAT0krMA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/html-entities": {
-          "version": "2.11.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-2.11.2.tgz",
-          "integrity": "sha512-WIdEGO9/o7tuTV3jpLHhFC/NBBnNdJeG9nRZbEyb37CL1fvqJA85hTugyDOhGzOVIAtpFTc6kr/gMJK1oTdopw==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/i18n": {
-          "version": "3.20.0",
-          "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-3.20.0.tgz",
-          "integrity": "sha512-SIoOJFB4UrrYAScS4H91CYCLW9dX3Ghv8pBKc/yHGculb1AdGr6gRMlmJxZV62Cn3CZ4Ga86c+FfR+GiBu0JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/hooks": "^2.12.3",
-            "gettext-parser": "^1.3.1",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0",
-            "sprintf-js": "^1.1.1",
-            "tannin": "^1.2.0"
-          }
-        },
-        "@wordpress/icons": {
-          "version": "2.10.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-2.10.3.tgz",
-          "integrity": "sha512-hVXArGOHLE5pL1G3rHNzsUEuTR4/G6lB+enKYwhYSSIqWuSbyXbZq3nvibxpepPrLy9B3d5t6aR6QUmjMVzIcQ==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/element": "^2.20.3",
-            "@wordpress/primitives": "^1.12.3"
+            "tinycolor2": "^1.4.1",
+            "uuid": "^7.0.2"
           }
         },
         "@wordpress/is-shallow-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-3.1.3.tgz",
-          "integrity": "sha512-eDLhfC4aaSgklzqwc6F/F4zmJVpTVTAvhqX+q0SP/8LPcP2HuKErPHVrEc75PMWqIutja2wJg98YSNPdewrj1w==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/keycodes": {
-          "version": "2.19.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-2.19.3.tgz",
-          "integrity": "sha512-8rNdmP5M1ifTgLIL0dt/N1uTGsq/Rx1ydCXy+gg24WdxBRhyu5sudNVCtascVXo26aIfOH9OJRdqRZZTEORhog==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/i18n": "^3.20.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@wordpress/primitives": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-1.12.3.tgz",
-          "integrity": "sha512-LIF44bVlJS7CJEVmk6TLuV6HZMdj5iwkyM8do4ukGY6qnZIzrXpBablgJeDBcyjzWrWRLn+w+tiZ/8l+2egoVA==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/element": "^2.20.3",
-            "classnames": "^2.2.5"
-          }
-        },
-        "@wordpress/priority-queue": {
-          "version": "1.11.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-1.11.2.tgz",
-          "integrity": "sha512-ulwmUOklY3orn1xXpcPnTyGWV5B/oycxI+cHZ6EevBVgM5sq+BW3xo0PKLR/MMm6UNBtFTu/71QAJrNZcD6V1g==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10"
-          }
-        },
-        "@wordpress/redux-routine": {
-          "version": "3.14.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-3.14.2.tgz",
-          "integrity": "sha512-aqi4UtvMP/+NhULxyCR8ktG0v4BJVTRcMpByAqDg7Oabq2sz2LPuShxd5UY8vxQYQY9t1uUJbslhom4ytcohWg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "is-promise": "^4.0.0",
-            "lodash": "^4.17.19",
-            "rungen": "^0.3.2"
-          }
-        },
-        "@wordpress/rich-text": {
-          "version": "3.25.3",
-          "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-3.25.3.tgz",
-          "integrity": "sha512-FdqL1/rHTsRxZ1gW1UEWuy0URmUEqMzj5hcAbOhHFPO5m0ENrkzC9bBa195KqZBSNSmBmXnDZdHu4UJUolzcZg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "@wordpress/compose": "^3.25.3",
-            "@wordpress/data": "^4.27.3",
-            "@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.2.5",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0",
-            "rememo": "^3.0.0"
-          }
-        },
-        "@wordpress/shortcode": {
-          "version": "2.13.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-2.13.2.tgz",
-          "integrity": "sha512-n4O5O66ARGY+h1SCvt0uOIQAJ6B4hd6EjULAWRNYgQuuF9mdhcczpGvSH76BssuvLN6bJU1RjsVy7m56kqO5xw==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-2.3.0.tgz",
+          "integrity": "sha512-BUVCYZNDoT5fRJGoam/nI2Sn8QELu5z/pFe7UL+szFqQqNnMibdWqN/KoW/YO7WLJqqqTRhAs/Fa51g4oXRyHQ==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0"
+            "@babel/runtime": "^7.11.2"
           }
         },
-        "@wordpress/url": {
-          "version": "2.22.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/url/-/url-2.22.2.tgz",
-          "integrity": "sha512-aqpYKQXzyzkCOm+GzZRYlLb+wh58g0cwR1PaKAl0UXaBS4mdS+X6biMriylb4P8CVC/RR7CSw5XI20JC24KDwQ==",
+        "downshift": {
+          "version": "5.4.7",
+          "resolved": "https://registry.npmjs.org/downshift/-/downshift-5.4.7.tgz",
+          "integrity": "sha512-xaH0RNqwJ5pAsyk9qBmR9XJWmg1OOWMfrhzYv0NH2NjJxn77S3zBcfClw341UfhGyKg5v+qVqg/CQzvAgBNCXQ==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10",
-            "lodash": "^4.17.19",
-            "react-native-url-polyfill": "^1.1.2"
+            "@babel/runtime": "^7.10.2",
+            "compute-scroll-into-view": "^1.0.14",
+            "prop-types": "^15.7.2",
+            "react-is": "^16.13.1"
           }
         },
-        "@wordpress/warning": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-1.4.2.tgz",
-          "integrity": "sha512-MjrkSp6Jyfx+92AE32A83P503noUtGb6//BYUH4GiWzzzSNhDHgbQ0UcOJwJaEYK166DxSNpMk/JXc4YENi1Cw==",
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
           "dev": true
         },
-        "@wp-g2/components": {
-          "version": "0.0.160",
-          "resolved": "https://registry.npmjs.org/@wp-g2/components/-/components-0.0.160.tgz",
-          "integrity": "sha512-44qUtiF5Nl/srD7Vzbpcd0im/EIej04fOdDfa0lfDxXJDNK3RRtSSEwCRhok/M5SKCmvYbZKRUx2K0ugXNqK0Q==",
-          "dev": true,
-          "requires": {
-            "@popperjs/core": "^2.5.4",
-            "@wp-g2/context": "^0.0.160",
-            "@wp-g2/styles": "^0.0.160",
-            "@wp-g2/utils": "^0.0.160",
-            "csstype": "^3.0.3",
-            "downshift": "^6.0.15",
-            "framer-motion": "^2.1.0",
-            "highlight-words-core": "^1.2.2",
-            "history": "^4.9.0",
-            "lodash": "^4.17.19",
-            "path-to-regexp": "^1.7.0",
-            "react-colorful": "4.4.4",
-            "react-textarea-autosize": "^8.2.0",
-            "react-use-gesture": "^9.0.0",
-            "reakit": "^1.3.4"
-          }
-        },
-        "@wp-g2/context": {
-          "version": "0.0.160",
-          "resolved": "https://registry.npmjs.org/@wp-g2/context/-/context-0.0.160.tgz",
-          "integrity": "sha512-50wSQCZkdZEexP88Ljutskn7/klT2Id1ks4GpzKDSBM8kadrfNdr2iabjgJdFLIH33S+r4dzEnzLs9SFtqUgwg==",
-          "dev": true,
-          "requires": {
-            "@wp-g2/create-styles": "^0.0.160",
-            "@wp-g2/styles": "^0.0.160",
-            "@wp-g2/utils": "^0.0.160",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@wp-g2/styles": {
-          "version": "0.0.160",
-          "resolved": "https://registry.npmjs.org/@wp-g2/styles/-/styles-0.0.160.tgz",
-          "integrity": "sha512-o91jxb0ZwEDRJrtVVjnqn3qTAXjnxZ1fX5KF3Q7oz776lMZPHsyfC0hvqnOz0w7zqaZZpdWtVQRShgrYXN6JHw==",
-          "dev": true,
-          "requires": {
-            "@wp-g2/create-styles": "^0.0.160",
-            "@wp-g2/utils": "^0.0.160"
-          }
-        },
-        "@wp-g2/utils": {
-          "version": "0.0.160",
-          "resolved": "https://registry.npmjs.org/@wp-g2/utils/-/utils-0.0.160.tgz",
-          "integrity": "sha512-4FhezjKyeYVb+3PZahW1kmqXpCvVvuJM97EcGqkKf+u4Qf66J3n1niHgfnRbn8aNydYK6EFze+6/UL48U35z1w==",
-          "dev": true,
-          "requires": {
-            "copy-to-clipboard": "^3.3.1",
-            "create-emotion": "^10.0.27",
-            "deepmerge": "^4.2.2",
-            "fast-deep-equal": "^3.1.3",
-            "hoist-non-react-statics": "^3.3.2",
-            "json2mq": "^0.2.0",
-            "lodash": "^4.17.19",
-            "memize": "^1.1.0",
-            "react-merge-refs": "^1.1.0",
-            "react-resize-aware": "^3.1.0",
-            "tinycolor2": "^1.4.2",
-            "use-enhanced-state": "^0.0.13",
-            "use-isomorphic-layout-effect": "^1.0.0"
-          }
-        },
-        "csstype": {
-          "version": "3.0.8",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
+        "react-use-gesture": {
+          "version": "7.0.16",
+          "resolved": "https://registry.npmjs.org/react-use-gesture/-/react-use-gesture-7.0.16.tgz",
+          "integrity": "sha512-gwgX+E+WQG0T1uFVl3z8j3ZwH3QQGIgVl7VtQEC2m0IscSs668sSps4Ss3CFp3Vns8xx0j9TVK4aBXH6+YrpEg==",
           "dev": true
         },
-        "downshift": {
-          "version": "6.1.3",
-          "resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.3.tgz",
-          "integrity": "sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
-            "compute-scroll-into-view": "^1.0.17",
-            "prop-types": "^15.7.2",
-            "react-is": "^17.0.2"
-          }
+        "uuid": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+          "dev": true
         }
       }
     },
diff --git a/package.json b/package.json
index 829285afb..7f7796edd 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@wordpress/notices": "2.13.0",
     "@wordpress/postcss-plugins-preset": "2.1.0",
     "@wordpress/scripts": "14.1.0",
-    "@wordpress/server-side-render": "1.21.3",
+    "@wordpress/server-side-render": "1.19.5",
     "@wordpress/url": "2.22.0",
     "ace-builds": "1.4.12",
     "autoprefixer": "10.1.0",

From 81c182055e82200d60806393d9285e30ae9f8a71 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 15:16:19 -0500
Subject: [PATCH 07/21] When changing a field name, change the name in the
 previewAttributes

Without this,
<ServerSideRender> could have a network error.
---
 js/src/block-editor/components/repeater-rows.js | 11 +++++++----
 js/src/edit-block/hooks/useField.js             |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/js/src/block-editor/components/repeater-rows.js b/js/src/block-editor/components/repeater-rows.js
index 7787fc80f..9553db969 100644
--- a/js/src/block-editor/components/repeater-rows.js
+++ b/js/src/block-editor/components/repeater-rows.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import * as React from 'react';
+
 /**
  * WordPress dependencies
  */
@@ -135,10 +140,8 @@ class RepeaterRows extends Component {
 			const attribute = attr[ parentName ];
 			const repeaterRows = this.getRows( attribute );
 
-			/*
-			 * Calling slice() essentially creates a copy of repeaterRows.
-			 * Without this, it looks like setAttributes() doesn't recognize a change to the array, and the component doesn't re-render.
-			 */
+			// Calling slice() essentially creates a copy of repeaterRows.
+			// Without this, it looks like setAttributes() doesn't recognize a change to the array, and the component doesn't re-render.
 			const rows = repeaterRows.slice();
 			[ rows[ from ], rows[ to ] ] = [ rows[ to ], rows[ from ] ];
 
diff --git a/js/src/edit-block/hooks/useField.js b/js/src/edit-block/hooks/useField.js
index dd6537302..bf4efb948 100644
--- a/js/src/edit-block/hooks/useField.js
+++ b/js/src/edit-block/hooks/useField.js
@@ -177,6 +177,8 @@ const useField = () => {
 	 */
 	const changeFieldName = ( fields, previousName, newName ) => {
 		const newFields = { ...fields };
+		const newBlock = { ...block };
+
 		// If this is a repeater, change the parent property of its sub_fields.
 		if ( newFields[ previousName ] && newFields[ previousName ].hasOwnProperty( 'sub_fields' ) ) {
 			newFields[ previousName ].sub_fields = getFieldsAsObject(
@@ -192,6 +194,13 @@ const useField = () => {
 		newFields[ newName ] = { ...newFields[ previousName ], name: newName };
 		delete newFields[ previousName ];
 
+		if ( newBlock?.previewAttributes?.hasOwnProperty( previousName ) ) {
+			newBlock.previewAttributes[ newName ] = newBlock.previewAttributes[ previousName ];
+			delete newBlock?.previewAttributes[ previousName ];
+		}
+
+		editBlock( newBlock );
+
 		return newFields;
 	};
 

From 66452fe8428876cfaa3daee98a1d9c89b3efc313 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 15:31:35 -0500
Subject: [PATCH 08/21] On changing the field type, delete the previewAttribute

The attribute could be of a different type.
For example, changing from a Url field
to Image, the type will change from from
string to integer.
So this prevents an error in ServerSideRender.
---
 js/src/edit-block/hooks/useField.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/edit-block/hooks/useField.js b/js/src/edit-block/hooks/useField.js
index bf4efb948..fc3465b96 100644
--- a/js/src/edit-block/hooks/useField.js
+++ b/js/src/edit-block/hooks/useField.js
@@ -158,6 +158,7 @@ const useField = () => {
 			newBlock.fields[ fieldToChange.parent ].sub_fields[ fieldToChange.name ] = newField;
 		} else {
 			newBlock.fields[ fieldToChange.name ] = newField;
+			delete newBlock?.previewAttributes[ fieldToChange.name ];
 		}
 
 		editBlock( newBlock );

From f1c4aff4fbce574795f3c13e1ff1e0e1990b99dc Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 15:47:33 -0500
Subject: [PATCH 09/21] Refactor preview into <FrontEndPreview> component

---
 js/src/edit-block/components/editor.js        | 10 +++---
 .../components/front-end-preview.js           | 34 +++++++++++++++++++
 js/src/edit-block/components/index.js         |  1 +
 3 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 js/src/edit-block/components/front-end-preview.js

diff --git a/js/src/edit-block/components/editor.js b/js/src/edit-block/components/editor.js
index 032dd94d2..cd9f4521d 100644
--- a/js/src/edit-block/components/editor.js
+++ b/js/src/edit-block/components/editor.js
@@ -13,7 +13,6 @@ import {
 	UnsavedChangesWarning,
 } from '@wordpress/editor';
 import { StrictMode, useState } from '@wordpress/element';
-import ServerSideRender from '@wordpress/server-side-render';
 
 /**
  * Internal dependencies
@@ -24,6 +23,7 @@ import {
 	EditorProvider,
 	FieldPanel,
 	FieldsGrid,
+	FrontEndPreview,
 	Header,
 	LocationButtons,
 	Main,
@@ -176,11 +176,9 @@ const Editor = ( { onError, postId, postType, settings } ) => {
 								}
 								{ FRONT_END_PREVIEW_EDITING_MODE === editorMode
 									? (
-										<ServerSideRender
-											block={ `genesis-custom-blocks/${ block.name }` }
-											attributes={ previewAttributes }
-											className="genesis-custom-blocks-editor__ssr"
-											httpMethod="POST"
+										<FrontEndPreview
+											blockName={ block.name }
+											previewAttributes={ previewAttributes }
 										/>
 									) : null
 								}
diff --git a/js/src/edit-block/components/front-end-preview.js b/js/src/edit-block/components/front-end-preview.js
new file mode 100644
index 000000000..3e74ddc1a
--- /dev/null
+++ b/js/src/edit-block/components/front-end-preview.js
@@ -0,0 +1,34 @@
+/**
+ * External dependencies
+ */
+import * as React from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import ServerSideRender from '@wordpress/server-side-render';
+
+/**
+ * @typedef {Object} FrontEndPreviewProps The header component props.
+ * @property {string} blockName The name of the block, without the namespace.
+ * @property {Object} previewAttributes The attributes to display in the preview.
+ */
+
+/**
+ * The front-end previews of the block.
+ *
+ * @param {FrontEndPreviewProps} props
+ * @return {React.ReactElement} The fields displayed in a grid.
+ */
+const FrontEndPreview = ( { blockName, previewAttributes } ) => {
+	return (
+		<ServerSideRender
+			block={ `genesis-custom-blocks/${ blockName }` }
+			attributes={ previewAttributes }
+			className="genesis-custom-blocks-editor__ssr"
+			httpMethod="POST"
+		/>
+	);
+};
+
+export default FrontEndPreview;
diff --git a/js/src/edit-block/components/index.js b/js/src/edit-block/components/index.js
index c6dd20188..baa72dc1c 100644
--- a/js/src/edit-block/components/index.js
+++ b/js/src/edit-block/components/index.js
@@ -9,6 +9,7 @@ export { default as Field } from './field';
 export { default as FieldPanel } from './field-panel';
 export { default as FieldsGrid } from './fields-grid';
 export { default as FieldSettings } from './field-settings';
+export { default as FrontEndPreview } from './front-end-preview';
 export { default as Header } from './header';
 export { default as IconSection } from './icon-section';
 export { default as Input } from './input';

From 67ae09b48072fa9a2ab1461a93ca22e546bfeb2a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 17:14:55 -0500
Subject: [PATCH 10/21] Possible approach to handling <ServerSideRender> error

---
 .../components/front-end-preview.js           | 53 ++++++++++++++++++-
 js/src/edit-block/components/header.js        |  5 +-
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/js/src/edit-block/components/front-end-preview.js b/js/src/edit-block/components/front-end-preview.js
index 3e74ddc1a..6fbd9bb36 100644
--- a/js/src/edit-block/components/front-end-preview.js
+++ b/js/src/edit-block/components/front-end-preview.js
@@ -6,6 +6,11 @@ import * as React from 'react';
 /**
  * WordPress dependencies
  */
+import { Placeholder } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+import { PostPublishButton } from '@wordpress/editor';
+import { useEffect } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
 import ServerSideRender from '@wordpress/server-side-render';
 
 /**
@@ -14,19 +19,65 @@ import ServerSideRender from '@wordpress/server-side-render';
  * @property {Object} previewAttributes The attributes to display in the preview.
  */
 
+/**
+ * @typedef {Object} ErrorResponsePlaceholderProps The header component props.
+ * @property {Object} response The response from the endpoint.
+ * @property {string} className The class name to display.
+ */
+
+/**
+ * Forked from @wordpress/server-side-render.
+ *
+ * @see https://github.com/WordPress/gutenberg/blob/3da717b8d0ac7d7821fc6d0475695ccf3ae2829f/packages/server-side-render/src/server-side-render.js#L33
+ *
+ * @param {ErrorResponsePlaceholderProps} props
+ * @return {React.ReactElement} The error placeholder.
+ */
+const ErrorResponsePlaceholder = ( { response, className } ) => {
+	const isEditedPostDirty = useSelect( ( select ) => select( 'core/editor' ).isEditedPostDirty() );
+
+	const errorMessage = sprintf(
+		// translators: %s: error message describing the problem
+		__( 'Error loading block: %s.' ),
+		response.errorMsg
+	);
+	return (
+		<Placeholder className={ className }>
+			{ errorMessage }
+			{
+				isEditedPostDirty
+					? (
+						<>
+							&nbsp;
+							{ __( 'Clicking here might prevent it:', 'genesis-custom-blocks' ) }
+							&nbsp;
+							<PostPublishButton />
+						</>
+					)
+					: null
+			}
+		</Placeholder>
+	);
+};
+
 /**
  * The front-end previews of the block.
  *
  * @param {FrontEndPreviewProps} props
- * @return {React.ReactElement} The fields displayed in a grid.
+ * @return {React.ReactElement} The front-end preview.
  */
 const FrontEndPreview = ( { blockName, previewAttributes } ) => {
+	const isEditedPostDirty = useSelect( ( select ) => select( 'core/editor' ).isEditedPostDirty() );
+
+	useEffect( () => {}, [ isEditedPostDirty ] );
+
 	return (
 		<ServerSideRender
 			block={ `genesis-custom-blocks/${ blockName }` }
 			attributes={ previewAttributes }
 			className="genesis-custom-blocks-editor__ssr"
 			httpMethod="POST"
+			ErrorResponsePlaceholder={ ErrorResponsePlaceholder }
 		/>
 	);
 };
diff --git a/js/src/edit-block/components/header.js b/js/src/edit-block/components/header.js
index 3b2e3820f..463ddae41 100644
--- a/js/src/edit-block/components/header.js
+++ b/js/src/edit-block/components/header.js
@@ -109,10 +109,7 @@ const Header = ( { editorMode, setEditorMode } ) => {
 			</button>
 			<div id="save-and-publish">
 				<span className="mr-3 text-sm">
-					<PostSavedState
-						forceIsDirty={ false }
-						forceIsSaving={ false }
-					/>
+					<PostSavedState	/>
 				</span>
 				<span className="mr-3">
 					<PostPublishButton />

From 236e8856e61ffc854d8c00ce64fdd5f5f5b88d17 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 17:30:37 -0500
Subject: [PATCH 11/21] Simpler approach to front-end preview (if it works)

The server-side will only have the saved post values.
So pass the saved previewAttributes,
not just the edited ones.
This looks to prevent errors in <ServerSideRender>.
---
 js/src/edit-block/components/editor.js        |  8 +--
 .../components/front-end-preview.js           | 71 ++++---------------
 2 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/js/src/edit-block/components/editor.js b/js/src/edit-block/components/editor.js
index cd9f4521d..41beb00f2 100644
--- a/js/src/edit-block/components/editor.js
+++ b/js/src/edit-block/components/editor.js
@@ -175,12 +175,8 @@ const Editor = ( { onError, postId, postType, settings } ) => {
 									) : null
 								}
 								{ FRONT_END_PREVIEW_EDITING_MODE === editorMode
-									? (
-										<FrontEndPreview
-											blockName={ block.name }
-											previewAttributes={ previewAttributes }
-										/>
-									) : null
+									? <FrontEndPreview />
+									: null
 								}
 								{ TEMPLATE_EDITOR_EDITING_MODE === editorMode
 									? <TemplateEditor />
diff --git a/js/src/edit-block/components/front-end-preview.js b/js/src/edit-block/components/front-end-preview.js
index 6fbd9bb36..cf5cbd9a9 100644
--- a/js/src/edit-block/components/front-end-preview.js
+++ b/js/src/edit-block/components/front-end-preview.js
@@ -6,78 +6,37 @@ import * as React from 'react';
 /**
  * WordPress dependencies
  */
-import { Placeholder } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
-import { PostPublishButton } from '@wordpress/editor';
-import { useEffect } from '@wordpress/element';
-import { __, sprintf } from '@wordpress/i18n';
 import ServerSideRender from '@wordpress/server-side-render';
 
 /**
- * @typedef {Object} FrontEndPreviewProps The header component props.
- * @property {string} blockName The name of the block, without the namespace.
- * @property {Object} previewAttributes The attributes to display in the preview.
+ * Internal dependencies
  */
+import { getBlock, getBlockNameWithNameSpace } from '../helpers';
 
 /**
- * @typedef {Object} ErrorResponsePlaceholderProps The header component props.
- * @property {Object} response The response from the endpoint.
- * @property {string} className The class name to display.
- */
-
-/**
- * Forked from @wordpress/server-side-render.
+ * The front-end preview of the block.
  *
- * @see https://github.com/WordPress/gutenberg/blob/3da717b8d0ac7d7821fc6d0475695ccf3ae2829f/packages/server-side-render/src/server-side-render.js#L33
+ * Gets the saved post with .getCurrentPost(),
+ * not the edited post.
+ * The server side only has access to the saved post.
+ * So there can be an error in <ServerSideRender>
+ * if it passes attributes that aren't yet saved.
  *
- * @param {ErrorResponsePlaceholderProps} props
- * @return {React.ReactElement} The error placeholder.
- */
-const ErrorResponsePlaceholder = ( { response, className } ) => {
-	const isEditedPostDirty = useSelect( ( select ) => select( 'core/editor' ).isEditedPostDirty() );
-
-	const errorMessage = sprintf(
-		// translators: %s: error message describing the problem
-		__( 'Error loading block: %s.' ),
-		response.errorMsg
-	);
-	return (
-		<Placeholder className={ className }>
-			{ errorMessage }
-			{
-				isEditedPostDirty
-					? (
-						<>
-							&nbsp;
-							{ __( 'Clicking here might prevent it:', 'genesis-custom-blocks' ) }
-							&nbsp;
-							<PostPublishButton />
-						</>
-					)
-					: null
-			}
-		</Placeholder>
-	);
-};
-
-/**
- * The front-end previews of the block.
- *
- * @param {FrontEndPreviewProps} props
  * @return {React.ReactElement} The front-end preview.
  */
-const FrontEndPreview = ( { blockName, previewAttributes } ) => {
-	const isEditedPostDirty = useSelect( ( select ) => select( 'core/editor' ).isEditedPostDirty() );
-
-	useEffect( () => {}, [ isEditedPostDirty ] );
+const FrontEndPreview = () => {
+	const currentPost = useSelect( ( select ) => select( 'core/editor' ).getCurrentPost() );
+	const fullBlock = getBlock( currentPost?.content );
+	const blockNameWithNameSpace = getBlockNameWithNameSpace( fullBlock );
+	const block = fullBlock[ blockNameWithNameSpace ] || {};
 
 	return (
 		<ServerSideRender
-			block={ `genesis-custom-blocks/${ blockName }` }
-			attributes={ previewAttributes }
+			block={ `genesis-custom-blocks/${ block?.name }` }
+			attributes={ block?.previewAttributes }
 			className="genesis-custom-blocks-editor__ssr"
 			httpMethod="POST"
-			ErrorResponsePlaceholder={ ErrorResponsePlaceholder }
 		/>
 	);
 };

From 19632aa6c12b56ece2611d5ab362f715352e6894 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 18:16:55 -0500
Subject: [PATCH 12/21] Handle the Front-end preview for new post

If there is nothing saved,
there will be nothing to preview.
---
 .../components/front-end-preview.js           | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/js/src/edit-block/components/front-end-preview.js b/js/src/edit-block/components/front-end-preview.js
index cf5cbd9a9..cd735771c 100644
--- a/js/src/edit-block/components/front-end-preview.js
+++ b/js/src/edit-block/components/front-end-preview.js
@@ -7,6 +7,8 @@ import * as React from 'react';
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
+import { PostSavedState } from '@wordpress/editor';
+import { __ } from '@wordpress/i18n';
 import ServerSideRender from '@wordpress/server-side-render';
 
 /**
@@ -27,17 +29,43 @@ import { getBlock, getBlockNameWithNameSpace } from '../helpers';
  */
 const FrontEndPreview = () => {
 	const currentPost = useSelect( ( select ) => select( 'core/editor' ).getCurrentPost() );
+	const isPostNew = useSelect( ( select ) => select( 'core/editor' ).isEditedPostNew() );
+	const isPostDirty = useSelect( ( select ) => select( 'core/editor' ).isEditedPostDirty() );
+
 	const fullBlock = getBlock( currentPost?.content );
 	const blockNameWithNameSpace = getBlockNameWithNameSpace( fullBlock );
 	const block = fullBlock[ blockNameWithNameSpace ] || {};
 
+	// There's nothing entered or saved, so <ServerSideRender> would have an error.
+	if ( isPostNew && ! isPostDirty ) {
+		return (
+			<p className="mt-4">
+				{ __( 'Please add fields to the block to preview it.', 'genesis-custom-blocks' ) }
+			</p>
+		);
+	}
+
 	return (
-		<ServerSideRender
-			block={ `genesis-custom-blocks/${ block?.name }` }
-			attributes={ block?.previewAttributes }
-			className="genesis-custom-blocks-editor__ssr"
-			httpMethod="POST"
-		/>
+		<>
+			{
+				isPostNew && isPostDirty
+					? (
+						<div className="mt-4 flex flex-row items-center">
+							{ __( 'Please save your block to preview it:', 'genesis-custom-blocks' ) }
+							&nbsp;
+							<PostSavedState />
+						</div>
+					)
+					: (
+						<ServerSideRender
+							block={ `genesis-custom-blocks/${ block?.name }` }
+							attributes={ block?.previewAttributes }
+							className="genesis-custom-blocks-editor__ssr"
+							httpMethod="POST"
+						/>
+					)
+			}
+		</>
 	);
 };
 

From 7cb75dbd027fe47862ce8b10c1d87d2b84df4d7e Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 18:41:22 -0500
Subject: [PATCH 13/21] If there is no field to preview, suggest that they add
 a field

Maybe if this were more effortless,
it would allow them to click a <button> to do that.
---
 .../edit-block/components/editor-preview.js   | 62 +++++++++++++++++++
 js/src/edit-block/components/editor.js        | 33 ++--------
 js/src/edit-block/components/index.js         |  1 +
 js/src/edit-block/hooks/useField.js           |  4 +-
 4 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 js/src/edit-block/components/editor-preview.js

diff --git a/js/src/edit-block/components/editor-preview.js b/js/src/edit-block/components/editor-preview.js
new file mode 100644
index 000000000..641a8fa2e
--- /dev/null
+++ b/js/src/edit-block/components/editor-preview.js
@@ -0,0 +1,62 @@
+/**
+ * External dependencies
+ */
+import * as React from 'react';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { useBlock, useField } from '../hooks';
+import { Fields } from '../../block-editor/components';
+
+/**
+ * The editor preview.
+ *
+ * @return {React.ReactElement} The editor preview.
+ */
+const EditorPreview = () => {
+	const { block, changeBlock } = useBlock();
+	const { getFields } = useField();
+	const { previewAttributes = {} } = block;
+	const fields = getFields();
+
+	/** @param {Object} newAttributes Attribute (field) name and value. */
+	const setAttributes = ( newAttributes ) => {
+		changeBlock( {
+			previewAttributes: {
+				...previewAttributes,
+				...newAttributes,
+			},
+		} );
+	};
+
+	return (
+		<div className="block-form">
+			{
+				Boolean( Object.keys( fields ).length )
+					? (
+						<Fields
+							key="example-fields"
+							fields={ fields }
+							parentBlockProps={ {
+								setAttributes,
+								attributes: previewAttributes,
+							} }
+							parentBlock={ {} }
+						/>
+					) : (
+						<p>
+							{ __( 'Please add a field to preview the block.', 'genesis-custom-blocks' ) }
+						</p>
+					)
+			}
+		</div>
+	);
+};
+
+export default EditorPreview;
diff --git a/js/src/edit-block/components/editor.js b/js/src/edit-block/components/editor.js
index 41beb00f2..2b4b37544 100644
--- a/js/src/edit-block/components/editor.js
+++ b/js/src/edit-block/components/editor.js
@@ -20,6 +20,7 @@ import { StrictMode, useState } from '@wordpress/element';
 import {
 	BlockPanel,
 	BrowserURL,
+	EditorPreview,
 	EditorProvider,
 	FieldPanel,
 	FieldsGrid,
@@ -39,8 +40,7 @@ import {
 	TEMPLATE_EDITOR_EDITING_MODE,
 } from '../constants';
 import { DEFAULT_LOCATION } from '../../common/constants';
-import { useBlock, useField, useTemplate } from '../hooks';
-import { Fields } from '../../block-editor/components';
+import { useBlock, useTemplate } from '../hooks';
 
 /**
  * @callback onErrorType Handler for errors.
@@ -100,10 +100,8 @@ import { Fields } from '../../block-editor/components';
  * @return {React.ReactElement} The editor.
  */
 const Editor = ( { onError, postId, postType, settings } ) => {
-	const { block, changeBlock } = useBlock();
+	const { block } = useBlock();
 	const { template } = useTemplate();
-	const { previewAttributes = {} } = block;
-	const { getFields } = useField();
 	const post = useSelect(
 		( select ) => select( 'core' ).getEntityRecord( 'postType', postType, postId ),
 		[ postId, postType ]
@@ -114,16 +112,6 @@ const Editor = ( { onError, postId, postType, settings } ) => {
 	const [ panelDisplaying, setPanelDisplaying ] = useState( BLOCK_PANEL );
 	const [ selectedField, setSelectedField ] = useState( NO_FIELD_SELECTED );
 
-	/** @param {Object} newAttributes Attribute (field) name and value. */
-	const setAttributes = ( newAttributes ) => {
-		changeBlock( {
-			previewAttributes: {
-				...previewAttributes,
-				...newAttributes,
-			},
-		} );
-	};
-
 	if ( ! post ) {
 		return null;
 	}
@@ -149,19 +137,8 @@ const Editor = ( { onError, postId, postType, settings } ) => {
 									setCurrentLocation={ setCurrentLocation }
 								/>
 								{ EDITOR_PREVIEW_EDITING_MODE === editorMode && block && block.fields
-									? (
-										<div className="block-form">
-											<Fields
-												key="example-fields"
-												fields={ getFields() }
-												parentBlockProps={ {
-													setAttributes,
-													attributes: previewAttributes,
-												} }
-												parentBlock={ {} }
-											/>
-										</div>
-									) : null
+									? <EditorPreview />
+									: null
 								}
 								{ BUILDER_EDITING_MODE === editorMode
 									? (
diff --git a/js/src/edit-block/components/index.js b/js/src/edit-block/components/index.js
index baa72dc1c..86da225ee 100644
--- a/js/src/edit-block/components/index.js
+++ b/js/src/edit-block/components/index.js
@@ -4,6 +4,7 @@ export { default as BrowserURL } from './browser-url';
 export { default as CategorySection } from './category-section';
 export { default as ClipboardCopy } from './clipboard-copy';
 export { default as Editor } from './editor';
+export { default as EditorPreview } from './editor-preview';
 export { default as EditorProvider } from './editor-provider';
 export { default as Field } from './field';
 export { default as FieldPanel } from './field-panel';
diff --git a/js/src/edit-block/hooks/useField.js b/js/src/edit-block/hooks/useField.js
index fc3465b96..47a030cc5 100644
--- a/js/src/edit-block/hooks/useField.js
+++ b/js/src/edit-block/hooks/useField.js
@@ -339,7 +339,9 @@ const useField = () => {
 			delete newBlock.fields[ selectedField.parent ].sub_fields[ selectedField.name ];
 		} else {
 			delete newBlock.fields[ selectedField.name ];
-			delete newBlock?.previewAttributes[ selectedField.name ];
+			if ( newBlock?.previewAttributes?.hasOwnProperty( selectedField.name ) ) {
+				delete newBlock?.previewAttributes[ selectedField.name ];
+			}
 		}
 
 		editBlock( newBlock );

From 50286108d6b8689569d27e2e315fc9731de71283 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Mon, 3 May 2021 18:47:22 -0500
Subject: [PATCH 14/21] Change text to 'edit the block,' as it doesn't need
 fields

Some blocks won't have fields,
just a template.
---
 js/src/edit-block/components/front-end-preview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/edit-block/components/front-end-preview.js b/js/src/edit-block/components/front-end-preview.js
index cd735771c..73b93369a 100644
--- a/js/src/edit-block/components/front-end-preview.js
+++ b/js/src/edit-block/components/front-end-preview.js
@@ -40,7 +40,7 @@ const FrontEndPreview = () => {
 	if ( isPostNew && ! isPostDirty ) {
 		return (
 			<p className="mt-4">
-				{ __( 'Please add fields to the block to preview it.', 'genesis-custom-blocks' ) }
+				{ __( 'Please edit the block to preview it.', 'genesis-custom-blocks' ) }
 			</p>
 		);
 	}

From 54928392042d32bec6e45dfcca60b7b1324f44d4 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 4 May 2021 15:13:48 -0500
Subject: [PATCH 15/21] See if userEven helps the test pass

---
 tests/e2e/specs/all-fields.js      | 4 +++-
 tests/e2e/specs/template-editor.js | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/specs/all-fields.js b/tests/e2e/specs/all-fields.js
index 177dbbcfb..366c3486d 100644
--- a/tests/e2e/specs/all-fields.js
+++ b/tests/e2e/specs/all-fields.js
@@ -6,6 +6,7 @@ import os from 'os';
 import path from 'path';
 import { v4 as uuid } from 'uuid';
 import { getDocument, queries } from 'pptr-testing-library';
+import userEvent from '@testing-library/user-event'
 
 /**
  * WordPress dependencies
@@ -18,7 +19,7 @@ import {
 
 describe( 'AllFields', () => {
 	it( 'creates the block and makes the fields available in the block editor', async () => {
-		const { findAllByLabelText, findAllByText, findByRole, findByText, findByLabelText } = queries;
+		const { findAllByLabelText, findAllByText, findByRole, findByText, findByLabelText, findByRole } = queries;
 		const blockName = 'Testing Example';
 		const fields = {
 			text: {
@@ -102,6 +103,7 @@ describe( 'AllFields', () => {
 			await findByLabelText( $editBlockDocument, 'Field Label' );
 			await page.keyboard.type( fields[ fieldType ].label );
 			await page.select( '#field-control', fieldType );
+			await findByRole( $editBlockDocument, 'combobox', { name: 'Field Type' } );
 		};
 
 		await addNewField( 'text' );
diff --git a/tests/e2e/specs/template-editor.js b/tests/e2e/specs/template-editor.js
index 9e2b4efdb..debbbc186 100644
--- a/tests/e2e/specs/template-editor.js
+++ b/tests/e2e/specs/template-editor.js
@@ -31,7 +31,6 @@ describe( 'TemplateEditor', () => {
 		await findByLabelText( $editBlockDocument, 'Field Label' );
 
 		await page.keyboard.type( field.label );
-		await page.select( '#field-control', field.type );
 		await ( await findByText( $editBlockDocument, 'Template Editor' ) ).click();
 		( await page.waitForSelector( '#gcb-template-editor' ) ).type( templateMarkup );
 	} );

From abd69799a1b1fce8e85c2be5ca54d1cc3b76d0aa Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 4 May 2021 15:58:09 -0500
Subject: [PATCH 16/21] Fix failed e2e test

It looks like this was a real failure:
one of the issues was a deletion of
something that didn't exist.
---
 js/src/edit-block/hooks/useField.js |    4 +-
 package-lock.json                   | 2975 +++++++++++++++++++++------
 package.json                        |    4 +-
 tests/e2e/specs/all-fields.js       |    4 +-
 4 files changed, 2353 insertions(+), 634 deletions(-)

diff --git a/js/src/edit-block/hooks/useField.js b/js/src/edit-block/hooks/useField.js
index 47a030cc5..95b67a652 100644
--- a/js/src/edit-block/hooks/useField.js
+++ b/js/src/edit-block/hooks/useField.js
@@ -158,7 +158,9 @@ const useField = () => {
 			newBlock.fields[ fieldToChange.parent ].sub_fields[ fieldToChange.name ] = newField;
 		} else {
 			newBlock.fields[ fieldToChange.name ] = newField;
-			delete newBlock?.previewAttributes[ fieldToChange.name ];
+			if ( newBlock.hasOwnProperty( 'previewAttributes' ) ) {
+				delete newBlock.previewAttributes[ fieldToChange.name ];
+			}
 		}
 
 		editBlock( newBlock );
diff --git a/package-lock.json b/package-lock.json
index 843f6eeb7..1ee554a8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1484,9 +1484,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1577,9 +1577,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1704,9 +1704,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1834,9 +1834,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -2448,12 +2448,12 @@
       }
     },
     "@testing-library/user-event": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.1.2.tgz",
-      "integrity": "sha512-ClbmHIYzGFGr0J0Uw7ZD+VcHzpdlj2BenffyMMiEqqJ+mey8fJQdc3qs7lczKoEQyaN+YmK2QqJbpYkwuVSGEg==",
+      "version": "13.1.8",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.1.8.tgz",
+      "integrity": "sha512-M04HgOlJvxILf5xyrkJaEQfFOtcvhy3usLldQIEg9zgFIYQofSmFGVfFlS7BWowqlBGLrItwGMlPXCoBgoHSiw==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.10.2"
+        "@babel/runtime": "^7.12.5"
       }
     },
     "@types/anymatch": {
@@ -4620,228 +4620,1315 @@
         "uuid": "^8.3.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "@babel/highlight": "^7.10.4"
           }
         },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+        "@types/react": {
+          "version": "16.14.5",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
+          "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "@wordpress/babel-plugin-import-jsx-pragma": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.0.3.tgz",
+          "integrity": "sha512-XGF1ovD+/u9yw5JAFMWVd0PRtU9HNNhVizbNn1CN0OlpENaeN9IFUhhK/JHxtvl3xaOHv/pjjP3msTLGH9RK6Q==",
+          "dev": true
+        },
+        "@wordpress/babel-preset-default": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-5.2.2.tgz",
+          "integrity": "sha512-xn/uOJRrkXBZoVv/iR4vc6GOAmmBpNSujO+ZoJzdy0zSJqV8vgzt7y/uZZetpJuyZAD8lR3aHxL7MUWos2PtfA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@babel/core": "^7.13.10",
+            "@babel/plugin-transform-react-jsx": "^7.12.7",
+            "@babel/plugin-transform-runtime": "^7.13.10",
+            "@babel/preset-env": "^7.13.10",
+            "@babel/preset-typescript": "^7.13.0",
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/babel-plugin-import-jsx-pragma": "^3.0.3",
+            "@wordpress/browserslist-config": "^3.0.3",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/warning": "^1.4.2",
+            "core-js": "^3.6.4"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "@wordpress/base-styles": {
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.4.3.tgz",
+          "integrity": "sha512-HabpKnrXN2CEC10IvQrZWjg6hQDxPt1jhARl7DCZBKqUTYmdbRYxQ6ZKoPnJcgbk2O6iIjBGXe8i4Gz+84I4Xw==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "@wordpress/browserslist-config": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-3.0.3.tgz",
+          "integrity": "sha512-hbGJt0+EKiVaa1VhVnm4nwWEzXH7/KMJVsEwk3IZjoYTqKLOWw3zQa6E7eh+jdJifEFrPkQNZs4QcICv6Z+1kQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@wordpress/edit-post": {
-      "version": "3.27.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.27.0.tgz",
-      "integrity": "sha512-jirj8/M6NN+iuFUAqacRO51QY9iXl7wDu5t+i9B7hEAONWAvLxx6d/So66ndTR810l+8Y+rO1tzUzRgOC/vRlg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@wordpress/a11y": "^2.15.0",
-        "@wordpress/api-fetch": "^3.22.0",
-        "@wordpress/block-editor": "^5.3.0",
-        "@wordpress/block-library": "^2.29.0",
-        "@wordpress/blocks": "^8.0.0",
-        "@wordpress/components": "^13.0.0",
-        "@wordpress/compose": "^3.25.0",
-        "@wordpress/core-data": "^2.26.0",
-        "@wordpress/data": "^4.27.0",
-        "@wordpress/data-controls": "^1.21.0",
-        "@wordpress/editor": "^9.26.0",
-        "@wordpress/element": "^2.20.0",
-        "@wordpress/hooks": "^2.12.0",
-        "@wordpress/i18n": "^3.19.0",
-        "@wordpress/icons": "^2.10.0",
-        "@wordpress/interface": "^1.1.0",
-        "@wordpress/keyboard-shortcuts": "^1.14.0",
-        "@wordpress/keycodes": "^2.19.0",
-        "@wordpress/media-utils": "^1.20.0",
-        "@wordpress/notices": "^2.13.0",
-        "@wordpress/plugins": "^2.25.0",
-        "@wordpress/primitives": "^1.12.0",
-        "@wordpress/url": "^2.22.0",
-        "@wordpress/viewport": "^2.26.0",
-        "@wordpress/warning": "^1.4.0",
-        "classnames": "^2.2.5",
-        "lodash": "^4.17.19",
-        "memize": "^1.1.0",
-        "rememo": "^3.0.0"
-      }
-    },
-    "@wordpress/editor": {
-      "version": "9.26.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.26.0.tgz",
-      "integrity": "sha512-lUeTNTWIDiL0yR3zWHkCpSBytxR15opKvxjQl6zjmwSji8qSCDlKXMS5gZpJDmNr6UqCv3M+n6gOiNGxUSwfTw==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@wordpress/api-fetch": "^3.22.0",
-        "@wordpress/autop": "^2.12.0",
-        "@wordpress/blob": "^2.13.0",
-        "@wordpress/block-editor": "^5.3.0",
-        "@wordpress/blocks": "^8.0.0",
-        "@wordpress/components": "^13.0.0",
-        "@wordpress/compose": "^3.25.0",
-        "@wordpress/core-data": "^2.26.0",
-        "@wordpress/data": "^4.27.0",
-        "@wordpress/data-controls": "^1.21.0",
-        "@wordpress/date": "^3.14.0",
-        "@wordpress/deprecated": "^2.12.0",
-        "@wordpress/element": "^2.20.0",
-        "@wordpress/hooks": "^2.12.0",
-        "@wordpress/html-entities": "^2.11.0",
-        "@wordpress/i18n": "^3.19.0",
-        "@wordpress/icons": "^2.10.0",
-        "@wordpress/is-shallow-equal": "^3.1.0",
-        "@wordpress/keyboard-shortcuts": "^1.14.0",
-        "@wordpress/keycodes": "^2.19.0",
-        "@wordpress/media-utils": "^1.20.0",
-        "@wordpress/notices": "^2.13.0",
-        "@wordpress/reusable-blocks": "^1.2.0",
-        "@wordpress/rich-text": "^3.25.0",
-        "@wordpress/server-side-render": "^1.21.0",
-        "@wordpress/url": "^2.22.0",
-        "@wordpress/wordcount": "^2.15.0",
-        "classnames": "^2.2.5",
-        "lodash": "^4.17.19",
-        "memize": "^1.1.0",
-        "react-autosize-textarea": "^7.1.0",
-        "rememo": "^3.0.0"
-      },
-      "dependencies": {
-        "@types/react": {
-          "version": "16.14.5",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
-          "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
+        "@wordpress/dependency-extraction-webpack-plugin": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-3.1.2.tgz",
+          "integrity": "sha512-UpUty3GIqn0A8A+x8UlVuvAu3BfaeIFsb6iY6vA5HC7IPps8EbBtIF8wL8NVGBy3lwh2uchuGmR1E9jcWRXYMw==",
           "dev": true,
           "requires": {
-            "@types/prop-types": "*",
-            "@types/scheduler": "*",
-            "csstype": "^3.0.2"
+            "json2php": "^0.0.4",
+            "webpack-sources": "^2.2.0"
           }
         },
-        "@wordpress/a11y": {
-          "version": "2.15.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-2.15.1.tgz",
-          "integrity": "sha512-0aH0rrW2dCGa99ubSdehFDYXOt2at0u+SyBJ+WNx9MOeP3EjUJGCMnadOW2yX7otZn0DtPQfHoLid+GpSB/RiQ==",
+        "@wordpress/element": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-2.20.3.tgz",
+          "integrity": "sha512-f4ZPTDf9CxiiOXiMxc4v1K7jcBMT4dsiehVOpkKzCDKboNXp4qVf8oe5PE23VGZNEjcOj5Mkg9hB57R0nqvMTw==",
           "dev": true,
           "requires": {
             "@babel/runtime": "^7.13.10",
-            "@wordpress/dom-ready": "^2.13.1",
-            "@wordpress/i18n": "^3.19.1"
-          },
-          "dependencies": {
-            "@wordpress/hooks": {
-              "version": "2.12.1",
-              "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-2.12.1.tgz",
-              "integrity": "sha512-Ubnz9V8mrlCCkZ8RwKKHIljZcuroM/uVHR9q1JIqEXs/iJtzWMutf3qla2+HsZ+3W+AaiEOEatbyVUkgsRvouA==",
-              "dev": true,
-              "requires": {
-                "@babel/runtime": "^7.13.10"
-              }
-            },
-            "@wordpress/i18n": {
-              "version": "3.19.1",
-              "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-3.19.1.tgz",
-              "integrity": "sha512-GGyQSl+b9mIkgyAsrfP7963o+Fml0Pn3QTt5tIcEeRqZP09eNOEWzXUVNS9//ExWXQI5tBcmy15EKKxIhLgb0A==",
-              "dev": true,
-              "requires": {
-                "@babel/runtime": "^7.13.10",
-                "@wordpress/hooks": "^2.12.1",
-                "gettext-parser": "^1.3.1",
-                "lodash": "^4.17.19",
-                "memize": "^1.1.0",
-                "sprintf-js": "^1.1.1",
-                "tannin": "^1.2.0"
-              }
-            }
+            "@types/react": "^16.9.0",
+            "@types/react-dom": "^16.9.0",
+            "@wordpress/escape-html": "^1.12.2",
+            "lodash": "^4.17.19",
+            "react": "^16.13.1",
+            "react-dom": "^16.13.1"
           }
         },
-        "@wordpress/block-serialization-default-parser": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-3.10.1.tgz",
-          "integrity": "sha512-8hz+t9YUWnmuh2P5LpAotj5Xt2hXR6OobdtEFahTl21X+UcSVEKVhnWsHQESQ8uxwUm5k+3ZCdn5FjJK+XOdTw==",
+        "@wordpress/escape-html": {
+          "version": "1.12.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.2.tgz",
+          "integrity": "sha512-FabgSwznhdaUwe6hr1CsGpgxQbzqEoGevv73WIL1B9GvlZ6csRWodgHfWh4P6fYqpzxFL4WYB8wPJ1PdO32XFA==",
           "dev": true,
           "requires": {
             "@babel/runtime": "^7.13.10"
           }
         },
-        "@wordpress/dom": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.17.1.tgz",
-          "integrity": "sha512-V+NPVa/9fB4pj+4dLlMEG0tOC6bwaBcQcWFSAWQ2uLHq3r9u5vESryzzHnveTGRsCwdx+d+L/ALYSxxAf3JMZA==",
+        "@wordpress/eslint-plugin": {
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.0.4.tgz",
+          "integrity": "sha512-tNK08dH/60MYbvRenq4lt8QPtol+JQFqyETEEjD7GWKvUve5Q90qsrjB2mwvD+/frMuQjnfUvOcW/kC8VD9E3g==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10",
-            "lodash": "^4.17.19"
+            "@typescript-eslint/eslint-plugin": "^4.15.0",
+            "@typescript-eslint/parser": "^4.15.0",
+            "@wordpress/prettier-config": "^1.0.3",
+            "babel-eslint": "^10.1.0",
+            "cosmiconfig": "^7.0.0",
+            "eslint-config-prettier": "^7.1.0",
+            "eslint-plugin-import": "^2.22.1",
+            "eslint-plugin-jest": "^24.1.3",
+            "eslint-plugin-jsdoc": "^30.7.13",
+            "eslint-plugin-jsx-a11y": "^6.4.1",
+            "eslint-plugin-prettier": "^3.3.0",
+            "eslint-plugin-react": "^7.22.0",
+            "eslint-plugin-react-hooks": "^4.2.0",
+            "globals": "^12.0.0",
+            "prettier": "npm:wp-prettier@2.2.1-beta-1",
+            "requireindex": "^1.2.0"
           }
         },
-        "@wordpress/dom-ready": {
-          "version": "2.13.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-2.13.1.tgz",
-          "integrity": "sha512-y8y4vz7xxOfAFJcZ5KM2F1MK8nlFm5nRSX5Wb0HKk/ZQkwK40mogngHUh5jUjzgjZfNSLQRbehRDNzNqgFdMZw==",
+        "@wordpress/postcss-plugins-preset": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-2.1.2.tgz",
+          "integrity": "sha512-y5W7NcT5CK3V6mEco36fMURJtR4cEibmV42ZzQ9mZdln1zzdrpnJUsMj4CscO4eSMv9hzNaYT97SCQWB8j5NVg==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10"
+            "@wordpress/base-styles": "^3.4.2",
+            "@wordpress/postcss-themes": "^3.0.3",
+            "autoprefixer": "^9.8.6",
+            "postcss-custom-properties": "^10.0.0"
           }
         },
-        "@wordpress/escape-html": {
-          "version": "1.12.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.1.tgz",
-          "integrity": "sha512-moudz8yUXiI2dGi+OWcNxKffbpF7B+XCG0dt9W3HRzSwalWAeo4CNzA5wSve1BYk8wMX8BiSGO+8ew+2Yr+cug==",
+        "@wordpress/postcss-themes": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/postcss-themes/-/postcss-themes-3.0.3.tgz",
+          "integrity": "sha512-Af6sCRK3twS3snx6nZIVDsycZypzyf2FgWRAEVmmQgI4ITLcxr0t7yqNLIkvdkKuPqKxgJ/NzUHPzqqovR7oXg==",
           "dev": true,
           "requires": {
-            "@babel/runtime": "^7.13.10"
+            "postcss": "^7.0.32"
           }
         },
-        "@wordpress/primitives": {
-          "version": "1.12.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-1.12.1.tgz",
-          "integrity": "sha512-c86Pu5Olser2UkJLyr21UrmpWgchhf2/MXWDLRAxQdELXV/Z8B2vVcluiPHYWYOfznKuW0kLv+PIFnMpC8jisw==",
-          "dev": true,
-          "requires": {
-            "@babel/runtime": "^7.13.10",
+        "@wordpress/prettier-config": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.0.3.tgz",
+          "integrity": "sha512-BWiped4eH3EWZ4FckDTFWrDKmb2Xi5zGef9fm9f1vg+MiloNvEItVczoXHY3BK4nF9m171xsGx22WZSi7dVopA==",
+          "dev": true
+        },
+        "@wordpress/scripts": {
+          "version": "14.1.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-14.1.1.tgz",
+          "integrity": "sha512-BaYVzUXWy6Bx9Bx1mtAtg4UQyl+pNmRMLpukU97Jo4SITOEsBzagdcJBCTwuLuE3FqmfZMxuYuUeBJftIngXEQ==",
+          "dev": true,
+          "requires": {
+            "@svgr/webpack": "^5.2.0",
+            "@wordpress/babel-preset-default": "^5.2.1",
+            "@wordpress/dependency-extraction-webpack-plugin": "^3.1.2",
+            "@wordpress/eslint-plugin": "^9.0.3",
+            "@wordpress/jest-preset-default": "^7.0.3",
+            "@wordpress/npm-package-json-lint-config": "^4.0.3",
+            "@wordpress/postcss-plugins-preset": "^2.1.2",
+            "@wordpress/prettier-config": "^1.0.3",
+            "@wordpress/stylelint-config": "^19.0.3",
+            "babel-jest": "^26.6.3",
+            "babel-loader": "^8.2.2",
+            "chalk": "^4.0.0",
+            "check-node-version": "^4.1.0",
+            "clean-webpack-plugin": "^3.0.0",
+            "cross-spawn": "^5.1.0",
+            "css-loader": "^3.5.2",
+            "cwd": "^0.10.0",
+            "dir-glob": "^3.0.1",
+            "eslint": "^7.17.0",
+            "eslint-plugin-markdown": "^1.0.2",
+            "expect-puppeteer": "^4.4.0",
+            "file-loader": "^6.2.0",
+            "ignore-emit-webpack-plugin": "^2.0.6",
+            "jest": "^26.6.3",
+            "jest-dev-server": "^4.4.0",
+            "jest-environment-node": "^26.6.2",
+            "markdownlint": "^0.18.0",
+            "markdownlint-cli": "^0.21.0",
+            "merge-deep": "^3.0.3",
+            "mini-css-extract-plugin": "^0.9.0",
+            "minimist": "^1.2.0",
+            "npm-package-json-lint": "^5.0.0",
+            "postcss-loader": "^3.0.0",
+            "prettier": "npm:wp-prettier@2.2.1-beta-1",
+            "puppeteer-core": "^5.5.0",
+            "read-pkg-up": "^1.0.1",
+            "resolve-bin": "^0.4.0",
+            "sass": "^1.26.11",
+            "sass-loader": "^8.0.2",
+            "source-map-loader": "^0.2.4",
+            "stylelint": "^13.8.0",
+            "terser-webpack-plugin": "^3.0.3",
+            "thread-loader": "^2.1.3",
+            "url-loader": "^3.0.0",
+            "webpack": "^4.42.0",
+            "webpack-bundle-analyzer": "^4.2.0",
+            "webpack-cli": "^3.3.11",
+            "webpack-livereload-plugin": "^2.3.0",
+            "webpack-sources": "^2.2.0"
+          }
+        },
+        "@wordpress/warning": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-1.4.2.tgz",
+          "integrity": "sha512-MjrkSp6Jyfx+92AE32A83P503noUtGb6//BYUH4GiWzzzSNhDHgbQ0UcOJwJaEYK166DxSNpMk/JXc4YENi1Cw==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "astral-regex": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+          "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+          "dev": true
+        },
+        "autoprefixer": {
+          "version": "9.8.6",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+          "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+          "dev": true,
+          "requires": {
+            "browserslist": "^4.12.0",
+            "caniuse-lite": "^1.0.30001109",
+            "colorette": "^1.2.1",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "postcss": "^7.0.32",
+            "postcss-value-parser": "^4.1.0"
+          }
+        },
+        "babel-loader": {
+          "version": "8.2.2",
+          "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+          "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+          "dev": true,
+          "requires": {
+            "find-cache-dir": "^3.3.1",
+            "loader-utils": "^1.4.0",
+            "make-dir": "^3.1.0",
+            "schema-utils": "^2.6.5"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "clone-deep": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4",
+            "kind-of": "^6.0.2",
+            "shallow-clone": "^3.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "css-loader": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
+          "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.3.1",
+            "cssesc": "^3.0.0",
+            "icss-utils": "^4.1.1",
+            "loader-utils": "^1.2.3",
+            "normalize-path": "^3.0.0",
+            "postcss": "^7.0.32",
+            "postcss-modules-extract-imports": "^2.0.0",
+            "postcss-modules-local-by-default": "^3.0.2",
+            "postcss-modules-scope": "^2.2.0",
+            "postcss-modules-values": "^3.0.0",
+            "postcss-value-parser": "^4.1.0",
+            "schema-utils": "^2.7.0",
+            "semver": "^6.3.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "csstype": {
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "eslint": {
+          "version": "7.25.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+          "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "7.12.11",
+            "@eslint/eslintrc": "^0.4.0",
+            "ajv": "^6.10.0",
+            "chalk": "^4.0.0",
+            "cross-spawn": "^7.0.2",
+            "debug": "^4.0.1",
+            "doctrine": "^3.0.0",
+            "enquirer": "^2.3.5",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^2.1.0",
+            "eslint-visitor-keys": "^2.0.0",
+            "espree": "^7.3.1",
+            "esquery": "^1.4.0",
+            "esutils": "^2.0.2",
+            "file-entry-cache": "^6.0.1",
+            "functional-red-black-tree": "^1.0.1",
+            "glob-parent": "^5.0.0",
+            "globals": "^13.6.0",
+            "ignore": "^4.0.6",
+            "import-fresh": "^3.0.0",
+            "imurmurhash": "^0.1.4",
+            "is-glob": "^4.0.0",
+            "js-yaml": "^3.13.1",
+            "json-stable-stringify-without-jsonify": "^1.0.1",
+            "levn": "^0.4.1",
+            "lodash": "^4.17.21",
+            "minimatch": "^3.0.4",
+            "natural-compare": "^1.4.0",
+            "optionator": "^0.9.1",
+            "progress": "^2.0.0",
+            "regexpp": "^3.1.0",
+            "semver": "^7.2.1",
+            "strip-ansi": "^6.0.0",
+            "strip-json-comments": "^3.1.0",
+            "table": "^6.0.4",
+            "text-table": "^0.2.0",
+            "v8-compile-cache": "^2.0.3"
+          },
+          "dependencies": {
+            "cross-spawn": {
+              "version": "7.0.3",
+              "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+              "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+              "dev": true,
+              "requires": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+              }
+            },
+            "debug": {
+              "version": "4.3.1",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+              "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+              "dev": true,
+              "requires": {
+                "ms": "2.1.2"
+              }
+            },
+            "doctrine": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+              "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2"
+              }
+            },
+            "globals": {
+              "version": "13.8.0",
+              "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
+              "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+              "dev": true,
+              "requires": {
+                "type-fest": "^0.20.2"
+              }
+            },
+            "lodash": {
+              "version": "4.17.21",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+              "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+              "dev": true
+            },
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+              "dev": true
+            },
+            "type-fest": {
+              "version": "0.20.2",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+              "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+              "dev": true
+            }
+          }
+        },
+        "eslint-plugin-import": {
+          "version": "2.22.1",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+          "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+          "dev": true,
+          "requires": {
+            "array-includes": "^3.1.1",
+            "array.prototype.flat": "^1.2.3",
+            "contains-path": "^0.1.0",
+            "debug": "^2.6.9",
+            "doctrine": "1.5.0",
+            "eslint-import-resolver-node": "^0.3.4",
+            "eslint-module-utils": "^2.6.0",
+            "has": "^1.0.3",
+            "minimatch": "^3.0.4",
+            "object.values": "^1.1.1",
+            "read-pkg-up": "^2.0.0",
+            "resolve": "^1.17.0",
+            "tsconfig-paths": "^3.9.0"
+          },
+          "dependencies": {
+            "read-pkg-up": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+              "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+              "dev": true,
+              "requires": {
+                "find-up": "^2.0.0",
+                "read-pkg": "^2.0.0"
+              }
+            }
+          }
+        },
+        "eslint-plugin-jsdoc": {
+          "version": "30.7.13",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz",
+          "integrity": "sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==",
+          "dev": true,
+          "requires": {
+            "comment-parser": "^0.7.6",
+            "debug": "^4.3.1",
+            "jsdoctypeparser": "^9.0.0",
+            "lodash": "^4.17.20",
+            "regextras": "^0.7.1",
+            "semver": "^7.3.4",
+            "spdx-expression-parse": "^3.0.1"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "4.3.1",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+              "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+              "dev": true,
+              "requires": {
+                "ms": "2.1.2"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+              "dev": true
+            }
+          }
+        },
+        "eslint-plugin-jsx-a11y": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz",
+          "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.11.2",
+            "aria-query": "^4.2.2",
+            "array-includes": "^3.1.1",
+            "ast-types-flow": "^0.0.7",
+            "axe-core": "^4.0.2",
+            "axobject-query": "^2.2.0",
+            "damerau-levenshtein": "^1.0.6",
+            "emoji-regex": "^9.0.0",
+            "has": "^1.0.3",
+            "jsx-ast-utils": "^3.1.0",
+            "language-tags": "^1.0.5"
+          }
+        },
+        "eslint-plugin-react-hooks": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
+          "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
+          "dev": true
+        },
+        "file-entry-cache": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+          "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+          "dev": true,
+          "requires": {
+            "flat-cache": "^3.0.4"
+          }
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "flat-cache": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+          "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+          "dev": true,
+          "requires": {
+            "flatted": "^3.1.0",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "flatted": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
+          "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+          "dev": true
+        },
+        "globals": {
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.8.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ignore-emit-webpack-plugin": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/ignore-emit-webpack-plugin/-/ignore-emit-webpack-plugin-2.0.6.tgz",
+          "integrity": "sha512-/zC18RWCC2wz4ZwnS4UoujGWzvSKy28DLjtE+jrGBOXej6YdmityhBDzE8E0NlktEqi4tgdNbydX8B6G4haHSQ==",
+          "dev": true
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "jsx-ast-utils": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
+          "integrity": "sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==",
+          "dev": true,
+          "requires": {
+            "array-includes": "^3.1.2",
+            "object.assign": "^4.1.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "mini-css-extract-plugin": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+          "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.1.0",
+            "normalize-url": "1.9.1",
+            "schema-utils": "^1.0.0",
+            "webpack-sources": "^1.1.0"
+          },
+          "dependencies": {
+            "schema-utils": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "dev": true,
+              "requires": {
+                "ajv": "^6.1.0",
+                "ajv-errors": "^1.0.0",
+                "ajv-keywords": "^3.1.0"
+              }
+            },
+            "webpack-sources": {
+              "version": "1.4.3",
+              "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+              "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+              "dev": true,
+              "requires": {
+                "source-list-map": "^2.0.0",
+                "source-map": "~0.6.1"
+              }
+            }
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "prepend-http": "^1.0.0",
+            "query-string": "^4.1.0",
+            "sort-keys": "^1.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+              "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^4.1.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+              "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.2.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+              "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+              "dev": true
+            },
+            "path-exists": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+              "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+              "dev": true
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.35",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "3.2.1",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+              "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^1.9.0"
+              }
+            },
+            "chalk": {
+              "version": "2.4.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+              },
+              "dependencies": {
+                "supports-color": {
+                  "version": "5.5.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+                  "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+                  "dev": true,
+                  "requires": {
+                    "has-flag": "^3.0.0"
+                  }
+                }
+              }
+            },
+            "color-convert": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+              "dev": true,
+              "requires": {
+                "color-name": "1.1.3"
+              }
+            },
+            "color-name": {
+              "version": "1.1.3",
+              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+              "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+              "dev": true
+            },
+            "has-flag": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+              "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "6.1.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+              "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss-loader": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+          "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.1.0",
+            "postcss": "^7.0.0",
+            "postcss-load-config": "^2.0.0",
+            "schema-utils": "^1.0.0"
+          },
+          "dependencies": {
+            "schema-utils": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "dev": true,
+              "requires": {
+                "ajv": "^6.1.0",
+                "ajv-errors": "^1.0.0",
+                "ajv-keywords": "^3.1.0"
+              }
+            }
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "sass-loader": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+          "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+          "dev": true,
+          "requires": {
+            "clone-deep": "^4.0.1",
+            "loader-utils": "^1.2.3",
+            "neo-async": "^2.6.1",
+            "schema-utils": "^2.6.1",
+            "semver": "^6.3.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "shallow-clone": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.2"
+          }
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "table": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+          "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
+          "dev": true,
+          "requires": {
+            "ajv": "^8.0.1",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.flatten": "^4.4.0",
+            "lodash.truncate": "^4.4.2",
+            "slice-ansi": "^4.0.0",
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "8.2.0",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+              "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
+              "dev": true,
+              "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+              }
+            }
+          }
+        },
+        "thread-loader": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
+          "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
+          "dev": true,
+          "requires": {
+            "loader-runner": "^2.3.1",
+            "loader-utils": "^1.1.0",
+            "neo-async": "^2.6.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        },
+        "url-loader": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz",
+          "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==",
+          "dev": true,
+          "requires": {
+            "loader-utils": "^1.2.3",
+            "mime": "^2.4.4",
+            "schema-utils": "^2.5.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "@wordpress/edit-post": {
+      "version": "3.27.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.27.0.tgz",
+      "integrity": "sha512-jirj8/M6NN+iuFUAqacRO51QY9iXl7wDu5t+i9B7hEAONWAvLxx6d/So66ndTR810l+8Y+rO1tzUzRgOC/vRlg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@wordpress/a11y": "^2.15.0",
+        "@wordpress/api-fetch": "^3.22.0",
+        "@wordpress/block-editor": "^5.3.0",
+        "@wordpress/block-library": "^2.29.0",
+        "@wordpress/blocks": "^8.0.0",
+        "@wordpress/components": "^13.0.0",
+        "@wordpress/compose": "^3.25.0",
+        "@wordpress/core-data": "^2.26.0",
+        "@wordpress/data": "^4.27.0",
+        "@wordpress/data-controls": "^1.21.0",
+        "@wordpress/editor": "^9.26.0",
+        "@wordpress/element": "^2.20.0",
+        "@wordpress/hooks": "^2.12.0",
+        "@wordpress/i18n": "^3.19.0",
+        "@wordpress/icons": "^2.10.0",
+        "@wordpress/interface": "^1.1.0",
+        "@wordpress/keyboard-shortcuts": "^1.14.0",
+        "@wordpress/keycodes": "^2.19.0",
+        "@wordpress/media-utils": "^1.20.0",
+        "@wordpress/notices": "^2.13.0",
+        "@wordpress/plugins": "^2.25.0",
+        "@wordpress/primitives": "^1.12.0",
+        "@wordpress/url": "^2.22.0",
+        "@wordpress/viewport": "^2.26.0",
+        "@wordpress/warning": "^1.4.0",
+        "classnames": "^2.2.5",
+        "lodash": "^4.17.19",
+        "memize": "^1.1.0",
+        "rememo": "^3.0.0"
+      }
+    },
+    "@wordpress/editor": {
+      "version": "9.26.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.26.0.tgz",
+      "integrity": "sha512-lUeTNTWIDiL0yR3zWHkCpSBytxR15opKvxjQl6zjmwSji8qSCDlKXMS5gZpJDmNr6UqCv3M+n6gOiNGxUSwfTw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@wordpress/api-fetch": "^3.22.0",
+        "@wordpress/autop": "^2.12.0",
+        "@wordpress/blob": "^2.13.0",
+        "@wordpress/block-editor": "^5.3.0",
+        "@wordpress/blocks": "^8.0.0",
+        "@wordpress/components": "^13.0.0",
+        "@wordpress/compose": "^3.25.0",
+        "@wordpress/core-data": "^2.26.0",
+        "@wordpress/data": "^4.27.0",
+        "@wordpress/data-controls": "^1.21.0",
+        "@wordpress/date": "^3.14.0",
+        "@wordpress/deprecated": "^2.12.0",
+        "@wordpress/element": "^2.20.0",
+        "@wordpress/hooks": "^2.12.0",
+        "@wordpress/html-entities": "^2.11.0",
+        "@wordpress/i18n": "^3.19.0",
+        "@wordpress/icons": "^2.10.0",
+        "@wordpress/is-shallow-equal": "^3.1.0",
+        "@wordpress/keyboard-shortcuts": "^1.14.0",
+        "@wordpress/keycodes": "^2.19.0",
+        "@wordpress/media-utils": "^1.20.0",
+        "@wordpress/notices": "^2.13.0",
+        "@wordpress/reusable-blocks": "^1.2.0",
+        "@wordpress/rich-text": "^3.25.0",
+        "@wordpress/server-side-render": "^1.21.0",
+        "@wordpress/url": "^2.22.0",
+        "@wordpress/wordcount": "^2.15.0",
+        "classnames": "^2.2.5",
+        "lodash": "^4.17.19",
+        "memize": "^1.1.0",
+        "react-autosize-textarea": "^7.1.0",
+        "rememo": "^3.0.0"
+      },
+      "dependencies": {
+        "@types/react": {
+          "version": "16.14.5",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
+          "integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
+          "dev": true,
+          "requires": {
+            "@types/prop-types": "*",
+            "@types/scheduler": "*",
+            "csstype": "^3.0.2"
+          }
+        },
+        "@wordpress/a11y": {
+          "version": "2.15.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-2.15.1.tgz",
+          "integrity": "sha512-0aH0rrW2dCGa99ubSdehFDYXOt2at0u+SyBJ+WNx9MOeP3EjUJGCMnadOW2yX7otZn0DtPQfHoLid+GpSB/RiQ==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "@wordpress/dom-ready": "^2.13.1",
+            "@wordpress/i18n": "^3.19.1"
+          },
+          "dependencies": {
+            "@wordpress/hooks": {
+              "version": "2.12.1",
+              "resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-2.12.1.tgz",
+              "integrity": "sha512-Ubnz9V8mrlCCkZ8RwKKHIljZcuroM/uVHR9q1JIqEXs/iJtzWMutf3qla2+HsZ+3W+AaiEOEatbyVUkgsRvouA==",
+              "dev": true,
+              "requires": {
+                "@babel/runtime": "^7.13.10"
+              }
+            },
+            "@wordpress/i18n": {
+              "version": "3.19.1",
+              "resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-3.19.1.tgz",
+              "integrity": "sha512-GGyQSl+b9mIkgyAsrfP7963o+Fml0Pn3QTt5tIcEeRqZP09eNOEWzXUVNS9//ExWXQI5tBcmy15EKKxIhLgb0A==",
+              "dev": true,
+              "requires": {
+                "@babel/runtime": "^7.13.10",
+                "@wordpress/hooks": "^2.12.1",
+                "gettext-parser": "^1.3.1",
+                "lodash": "^4.17.19",
+                "memize": "^1.1.0",
+                "sprintf-js": "^1.1.1",
+                "tannin": "^1.2.0"
+              }
+            }
+          }
+        },
+        "@wordpress/block-serialization-default-parser": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-3.10.1.tgz",
+          "integrity": "sha512-8hz+t9YUWnmuh2P5LpAotj5Xt2hXR6OobdtEFahTl21X+UcSVEKVhnWsHQESQ8uxwUm5k+3ZCdn5FjJK+XOdTw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/dom": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-2.17.1.tgz",
+          "integrity": "sha512-V+NPVa/9fB4pj+4dLlMEG0tOC6bwaBcQcWFSAWQ2uLHq3r9u5vESryzzHnveTGRsCwdx+d+L/ALYSxxAf3JMZA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@wordpress/dom-ready": {
+          "version": "2.13.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-2.13.1.tgz",
+          "integrity": "sha512-y8y4vz7xxOfAFJcZ5KM2F1MK8nlFm5nRSX5Wb0HKk/ZQkwK40mogngHUh5jUjzgjZfNSLQRbehRDNzNqgFdMZw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/escape-html": {
+          "version": "1.12.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.1.tgz",
+          "integrity": "sha512-moudz8yUXiI2dGi+OWcNxKffbpF7B+XCG0dt9W3HRzSwalWAeo4CNzA5wSve1BYk8wMX8BiSGO+8ew+2Yr+cug==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10"
+          }
+        },
+        "@wordpress/primitives": {
+          "version": "1.12.1",
+          "resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-1.12.1.tgz",
+          "integrity": "sha512-c86Pu5Olser2UkJLyr21UrmpWgchhf2/MXWDLRAxQdELXV/Z8B2vVcluiPHYWYOfznKuW0kLv+PIFnMpC8jisw==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.13.10",
             "@wordpress/element": "^2.20.1",
             "classnames": "^2.2.5"
           },
@@ -5775,12 +6862,12 @@
       }
     },
     "@wordpress/jest-preset-default": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.0.2.tgz",
-      "integrity": "sha512-biEKSoiHwopjw1yYY24T/yI44Z3ExCdeHHIHbztcYNcgEB1IcObZ4WKVGRxftcmkaP6TEce3sxX62D+PBNwCQg==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-7.0.3.tgz",
+      "integrity": "sha512-KE2lwBOmmmyq73k/YBiT1Om7fnFnEU1/iNPn6RVyt5/LSTKEmgS1Uy4tFZbA10uNW1838PZwd4UvWP/UZ5uQCA==",
       "dev": true,
       "requires": {
-        "@wordpress/jest-console": "^4.0.2",
+        "@wordpress/jest-console": "^4.0.3",
         "babel-jest": "^26.6.3",
         "enzyme": "^3.11.0",
         "enzyme-adapter-react-16": "^1.15.2",
@@ -5788,9 +6875,9 @@
       },
       "dependencies": {
         "@wordpress/jest-console": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.0.2.tgz",
-          "integrity": "sha512-EFDdRd53zzB2Nf+QGkGGs6woR6m4KUgWU/bGAU0f5g9p3oe8kgj6Tbdy02TKI+yfCDiKNlgEDh09u52Hz0w7vg==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-4.0.3.tgz",
+          "integrity": "sha512-58JHySEL8P+IRo+6B/oQIoXuM1R6FnYZPY4LNIULmmh/6usoBYGk1KGW9qpcTzcD+xT2VYzIOabjV0RlstZkvw==",
           "dev": true,
           "requires": {
             "@babel/runtime": "^7.13.10",
@@ -5863,9 +6950,9 @@
       }
     },
     "@wordpress/npm-package-json-lint-config": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.0.2.tgz",
-      "integrity": "sha512-C3v9rxHfXXqRoaCYv8lu4C0g8KHIvEs5JqFjRroW1bpe1yC/f9YSVj04mlwsSgtHUwPcDQZ5osQec4gDs5/nGw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.0.3.tgz",
+      "integrity": "sha512-xN11CqH8oUmLbDd8/+0UU3rYuNNnF2PWedTrIDqcuZ9Lm+w3yEZJgzBv4XsZ4fS1R4c9oNBPhih0jdOxUCHpFg==",
       "dev": true
     },
     "@wordpress/plugins": {
@@ -6055,56 +7142,59 @@
       }
     },
     "@wordpress/scripts": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-14.1.0.tgz",
-      "integrity": "sha512-WZkgcAMq1UPOJCyYyfuUC5qWFUxXHIUxKU8NR3D+x5Yr27KvG5aeEiDTHyJHkIhmN01diB3Sq+ybnncm4V5oaA==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-15.0.1.tgz",
+      "integrity": "sha512-CuuqjeDUC4N6zm1oZ23I9Xoanhz+Spx5Xilg5EIqlkKpiBpno+5BwykX24h73g2NIWzPjnxPIlIEp7D9PQ+FMw==",
       "dev": true,
       "requires": {
         "@svgr/webpack": "^5.2.0",
-        "@wordpress/babel-preset-default": "^5.2.0",
-        "@wordpress/dependency-extraction-webpack-plugin": "^3.1.1",
-        "@wordpress/eslint-plugin": "^9.0.2",
-        "@wordpress/jest-preset-default": "^7.0.2",
-        "@wordpress/npm-package-json-lint-config": "^4.0.2",
-        "@wordpress/postcss-plugins-preset": "^2.1.1",
-        "@wordpress/prettier-config": "^1.0.2",
-        "@wordpress/stylelint-config": "^19.0.2",
+        "@wordpress/babel-preset-default": "^5.2.2",
+        "@wordpress/dependency-extraction-webpack-plugin": "^3.1.2",
+        "@wordpress/eslint-plugin": "^9.0.4",
+        "@wordpress/jest-preset-default": "^7.0.3",
+        "@wordpress/npm-package-json-lint-config": "^4.0.3",
+        "@wordpress/postcss-plugins-preset": "^3.0.0",
+        "@wordpress/prettier-config": "^1.0.3",
+        "@wordpress/stylelint-config": "^19.0.3",
         "babel-jest": "^26.6.3",
         "babel-loader": "^8.2.2",
         "chalk": "^4.0.0",
         "check-node-version": "^4.1.0",
         "clean-webpack-plugin": "^3.0.0",
         "cross-spawn": "^5.1.0",
-        "css-loader": "^3.5.2",
+        "css-loader": "^5.1.3",
         "cwd": "^0.10.0",
         "dir-glob": "^3.0.1",
         "eslint": "^7.17.0",
         "eslint-plugin-markdown": "^1.0.2",
         "expect-puppeteer": "^4.4.0",
         "file-loader": "^6.2.0",
+        "filenamify": "^4.2.0",
         "ignore-emit-webpack-plugin": "^2.0.6",
         "jest": "^26.6.3",
+        "jest-circus": "^26.6.3",
         "jest-dev-server": "^4.4.0",
         "jest-environment-node": "^26.6.2",
         "markdownlint": "^0.18.0",
         "markdownlint-cli": "^0.21.0",
         "merge-deep": "^3.0.3",
-        "mini-css-extract-plugin": "^0.9.0",
+        "mini-css-extract-plugin": "^1.3.9",
         "minimist": "^1.2.0",
         "npm-package-json-lint": "^5.0.0",
-        "postcss-loader": "^3.0.0",
+        "postcss": "^8.2.2",
+        "postcss-loader": "^4.2.0",
         "prettier": "npm:wp-prettier@2.2.1-beta-1",
         "puppeteer-core": "^5.5.0",
         "read-pkg-up": "^1.0.1",
         "resolve-bin": "^0.4.0",
         "sass": "^1.26.11",
-        "sass-loader": "^8.0.2",
+        "sass-loader": "^10.1.1",
         "source-map-loader": "^0.2.4",
         "stylelint": "^13.8.0",
         "terser-webpack-plugin": "^3.0.3",
-        "thread-loader": "^2.1.3",
-        "url-loader": "^3.0.0",
-        "webpack": "^4.42.0",
+        "thread-loader": "^3.0.1",
+        "url-loader": "^4.1.1",
+        "webpack": "^4.46.0",
         "webpack-bundle-analyzer": "^4.2.0",
         "webpack-cli": "^3.3.11",
         "webpack-livereload-plugin": "^2.3.0",
@@ -6132,15 +7222,15 @@
           }
         },
         "@wordpress/babel-plugin-import-jsx-pragma": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.0.2.tgz",
-          "integrity": "sha512-l/6TRs0oZATS5s3mZhMg79tLcyyosiszdD0Om149c+rEgZ2PJS1vGgrNJvGiU5yj+42Xuz7196IZ0zbXjy8aUQ==",
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.0.3.tgz",
+          "integrity": "sha512-XGF1ovD+/u9yw5JAFMWVd0PRtU9HNNhVizbNn1CN0OlpENaeN9IFUhhK/JHxtvl3xaOHv/pjjP3msTLGH9RK6Q==",
           "dev": true
         },
         "@wordpress/babel-preset-default": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-5.2.0.tgz",
-          "integrity": "sha512-5nRUbA105bEx0U5/CpRBXM4T1UR37Q89PPy7Wed7t2r9ECADjtUTyIwCwjuDHfYMKOS3YL5NDXbMMVpS3cQlUQ==",
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-5.2.2.tgz",
+          "integrity": "sha512-xn/uOJRrkXBZoVv/iR4vc6GOAmmBpNSujO+ZoJzdy0zSJqV8vgzt7y/uZZetpJuyZAD8lR3aHxL7MUWos2PtfA==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.13.10",
@@ -6149,29 +7239,29 @@
             "@babel/preset-env": "^7.13.10",
             "@babel/preset-typescript": "^7.13.0",
             "@babel/runtime": "^7.13.10",
-            "@wordpress/babel-plugin-import-jsx-pragma": "^3.0.2",
-            "@wordpress/browserslist-config": "^3.0.2",
-            "@wordpress/element": "^2.20.1",
-            "@wordpress/warning": "^1.4.1",
+            "@wordpress/babel-plugin-import-jsx-pragma": "^3.0.3",
+            "@wordpress/browserslist-config": "^3.0.3",
+            "@wordpress/element": "^2.20.3",
+            "@wordpress/warning": "^1.4.2",
             "core-js": "^3.6.4"
           }
         },
         "@wordpress/base-styles": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.4.1.tgz",
-          "integrity": "sha512-H2a/jzcTEQcYYn+pFPQ8FGrfRGN+qPESyrrF3w+ty8SM4/+xH/Kn5mos/a8/7lGA/ChYeSC5b1lnO19E3gvPcQ==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-3.4.3.tgz",
+          "integrity": "sha512-HabpKnrXN2CEC10IvQrZWjg6hQDxPt1jhARl7DCZBKqUTYmdbRYxQ6ZKoPnJcgbk2O6iIjBGXe8i4Gz+84I4Xw==",
           "dev": true
         },
         "@wordpress/browserslist-config": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-3.0.2.tgz",
-          "integrity": "sha512-xtqeXdeGzC8DUE5eSYNKrLkUy8kihoakOe3W/jq3QLnIfTCtjK1jBFV/vk9fge9QuvUcOCiWP1bDxBeYKXgQHA==",
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-3.0.3.tgz",
+          "integrity": "sha512-hbGJt0+EKiVaa1VhVnm4nwWEzXH7/KMJVsEwk3IZjoYTqKLOWw3zQa6E7eh+jdJifEFrPkQNZs4QcICv6Z+1kQ==",
           "dev": true
         },
         "@wordpress/dependency-extraction-webpack-plugin": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-3.1.1.tgz",
-          "integrity": "sha512-gLp6DMYlXO+0RZECjFCoKJvN4wmZDV0WCrQBwfXmBsieod97pNYr/xABpkAkg6XoR9/LZ1f18M3xsgrCWGrxNQ==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-3.1.2.tgz",
+          "integrity": "sha512-UpUty3GIqn0A8A+x8UlVuvAu3BfaeIFsb6iY6vA5HC7IPps8EbBtIF8wL8NVGBy3lwh2uchuGmR1E9jcWRXYMw==",
           "dev": true,
           "requires": {
             "json2php": "^0.0.4",
@@ -6179,38 +7269,38 @@
           }
         },
         "@wordpress/element": {
-          "version": "2.20.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-2.20.1.tgz",
-          "integrity": "sha512-aHfv3rnY8yea3VvfabPpyQXuYTQLKMcOSRxG+ydxptQNlQjEBe+KtCXyqr5g7bpqEBT5waFSr3IbJKk+G+hZxA==",
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/element/-/element-2.20.3.tgz",
+          "integrity": "sha512-f4ZPTDf9CxiiOXiMxc4v1K7jcBMT4dsiehVOpkKzCDKboNXp4qVf8oe5PE23VGZNEjcOj5Mkg9hB57R0nqvMTw==",
           "dev": true,
           "requires": {
             "@babel/runtime": "^7.13.10",
             "@types/react": "^16.9.0",
             "@types/react-dom": "^16.9.0",
-            "@wordpress/escape-html": "^1.12.1",
+            "@wordpress/escape-html": "^1.12.2",
             "lodash": "^4.17.19",
             "react": "^16.13.1",
             "react-dom": "^16.13.1"
           }
         },
         "@wordpress/escape-html": {
-          "version": "1.12.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.1.tgz",
-          "integrity": "sha512-moudz8yUXiI2dGi+OWcNxKffbpF7B+XCG0dt9W3HRzSwalWAeo4CNzA5wSve1BYk8wMX8BiSGO+8ew+2Yr+cug==",
+          "version": "1.12.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-1.12.2.tgz",
+          "integrity": "sha512-FabgSwznhdaUwe6hr1CsGpgxQbzqEoGevv73WIL1B9GvlZ6csRWodgHfWh4P6fYqpzxFL4WYB8wPJ1PdO32XFA==",
           "dev": true,
           "requires": {
             "@babel/runtime": "^7.13.10"
           }
         },
         "@wordpress/eslint-plugin": {
-          "version": "9.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.0.2.tgz",
-          "integrity": "sha512-XmD2jpxmFoAFJgxaMuKs2zT1fGsZQGWLFgc7zENOw7EFKwDNP4o8YqsU6IbkSfX0QTSqB+D91Tq1B6HBq9FCxA==",
+          "version": "9.0.4",
+          "resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-9.0.4.tgz",
+          "integrity": "sha512-tNK08dH/60MYbvRenq4lt8QPtol+JQFqyETEEjD7GWKvUve5Q90qsrjB2mwvD+/frMuQjnfUvOcW/kC8VD9E3g==",
           "dev": true,
           "requires": {
             "@typescript-eslint/eslint-plugin": "^4.15.0",
             "@typescript-eslint/parser": "^4.15.0",
-            "@wordpress/prettier-config": "^1.0.2",
+            "@wordpress/prettier-config": "^1.0.3",
             "babel-eslint": "^10.1.0",
             "cosmiconfig": "^7.0.0",
             "eslint-config-prettier": "^7.1.0",
@@ -6227,38 +7317,50 @@
           }
         },
         "@wordpress/postcss-plugins-preset": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-2.1.1.tgz",
-          "integrity": "sha512-TAl0EIu3psL8neWdtvHz8ValknhUkTlPyOMogPaJozmKKfhIKWxZPEO0+5iyevdZ9+U4kQY+j9hVAHUW4tRVZg==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-3.0.0.tgz",
+          "integrity": "sha512-4RJFxpSMWHPsCCoDCxvBjj90uzchEnyIA3Xlh7EiYivq4S/pWpEq5MZxzASJJ78DxFSFf7PlEVy9nHZzrd3NWA==",
           "dev": true,
           "requires": {
-            "@wordpress/base-styles": "^3.4.1",
-            "@wordpress/postcss-themes": "^3.0.2",
-            "autoprefixer": "^9.8.6",
-            "postcss-custom-properties": "^10.0.0"
+            "@wordpress/base-styles": "^3.4.3",
+            "@wordpress/postcss-themes": "^4.0.0",
+            "autoprefixer": "^10.2.5",
+            "postcss-custom-properties": "^11.0.0"
           }
         },
         "@wordpress/postcss-themes": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/postcss-themes/-/postcss-themes-3.0.2.tgz",
-          "integrity": "sha512-8hmGYKKKtK0SzL+nnSuFNkpd9Ffq57NKtusyc99WvNMiYdDeTXLWulQzlgzrT8tx7Ss8MuPSM7yH3bHI3h1CTA==",
-          "dev": true,
-          "requires": {
-            "postcss": "^7.0.32"
-          }
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@wordpress/postcss-themes/-/postcss-themes-4.0.0.tgz",
+          "integrity": "sha512-g5twdcVPTeV8adYEWUBXTpp/Ztc6Mfw5bN8MOema/FUMeQVrWKP0yVZRFeu5XL+hMZmZ2MdtlKWPoz8p/GqUZw==",
+          "dev": true
         },
         "@wordpress/prettier-config": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.0.2.tgz",
-          "integrity": "sha512-puyOhbJuMjUeo2EcHmmh88mk0BFAUMTXWKyzJ0y3hlPXaPnjXdir/trj2hrI9FvWTnygLWU98qxhQUfhbIhPdw==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-1.0.3.tgz",
+          "integrity": "sha512-BWiped4eH3EWZ4FckDTFWrDKmb2Xi5zGef9fm9f1vg+MiloNvEItVczoXHY3BK4nF9m171xsGx22WZSi7dVopA==",
           "dev": true
         },
         "@wordpress/warning": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-1.4.1.tgz",
-          "integrity": "sha512-Egpk1Tv4L0jVRUob0HF6iy4PLDDxN/0ALHHPzCkK2TXI9K5LurstbQV2KnM5/Q2cHc1J70n09Fd3P1E3DiCxEA==",
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-1.4.2.tgz",
+          "integrity": "sha512-MjrkSp6Jyfx+92AE32A83P503noUtGb6//BYUH4GiWzzzSNhDHgbQ0UcOJwJaEYK166DxSNpMk/JXc4YENi1Cw==",
           "dev": true
         },
+        "acorn": {
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "astral-regex": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -6266,17 +7368,16 @@
           "dev": true
         },
         "autoprefixer": {
-          "version": "9.8.6",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-          "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+          "version": "10.2.5",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.5.tgz",
+          "integrity": "sha512-7H4AJZXvSsn62SqZyJCP+1AWwOuoYpUfK6ot9vm0e87XD6mT8lDywc9D9OTJPMULyGcvmIxzTAMeG2Cc+YX+fA==",
           "dev": true,
           "requires": {
-            "browserslist": "^4.12.0",
-            "caniuse-lite": "^1.0.30001109",
-            "colorette": "^1.2.1",
+            "browserslist": "^4.16.3",
+            "caniuse-lite": "^1.0.30001196",
+            "colorette": "^1.2.2",
+            "fraction.js": "^4.0.13",
             "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^7.0.32",
             "postcss-value-parser": "^4.1.0"
           }
         },
@@ -6292,57 +7393,63 @@
             "schema-utils": "^2.6.5"
           }
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "lru-cache": {
+              "version": "5.1.1",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+              "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
               "dev": true,
               "requires": {
-                "color-convert": "^2.0.1"
+                "yallist": "^3.0.2"
               }
             },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "glob": "^7.1.3"
               }
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+              "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+              "dev": true
             }
           }
         },
-        "clone-deep": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
-            "is-plain-object": "^2.0.4",
-            "kind-of": "^6.0.2",
-            "shallow-clone": "^3.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
@@ -6361,38 +7468,61 @@
           "dev": true
         },
         "css-loader": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
-          "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.3.1",
-            "cssesc": "^3.0.0",
-            "icss-utils": "^4.1.1",
-            "loader-utils": "^1.2.3",
-            "normalize-path": "^3.0.0",
-            "postcss": "^7.0.32",
-            "postcss-modules-extract-imports": "^2.0.0",
-            "postcss-modules-local-by-default": "^3.0.2",
-            "postcss-modules-scope": "^2.2.0",
-            "postcss-modules-values": "^3.0.0",
+          "version": "5.2.4",
+          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.4.tgz",
+          "integrity": "sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^6.2.0",
+            "icss-utils": "^5.1.0",
+            "loader-utils": "^2.0.0",
+            "postcss": "^8.2.10",
+            "postcss-modules-extract-imports": "^3.0.0",
+            "postcss-modules-local-by-default": "^4.0.0",
+            "postcss-modules-scope": "^3.0.0",
+            "postcss-modules-values": "^4.0.0",
             "postcss-value-parser": "^4.1.0",
-            "schema-utils": "^2.7.0",
-            "semver": "^6.3.0"
+            "schema-utils": "^3.0.0",
+            "semver": "^7.3.5"
           },
           "dependencies": {
-            "semver": {
-              "version": "6.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-              "dev": true
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+              "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            },
+            "schema-utils": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+              "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+              "dev": true,
+              "requires": {
+                "@types/json-schema": "^7.0.6",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+              }
             }
           }
         },
         "csstype": {
-          "version": "3.0.7",
-          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-          "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==",
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+          "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==",
           "dev": true
         },
         "debug": {
@@ -6404,6 +7534,16 @@
             "ms": "2.0.0"
           }
         },
+        "define-property": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+          "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.2",
+            "isobject": "^3.0.1"
+          }
+        },
         "doctrine": {
           "version": "1.5.0",
           "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
@@ -6415,9 +7555,9 @@
           }
         },
         "eslint": {
-          "version": "7.24.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
-          "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
+          "version": "7.25.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz",
+          "integrity": "sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "7.12.11",
@@ -6607,6 +7747,16 @@
           "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
           "dev": true
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "file-entry-cache": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -6661,12 +7811,62 @@
             "type-fest": "^0.8.1"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "icss-utils": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+          "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+          "dev": true
+        },
         "ignore-emit-webpack-plugin": {
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/ignore-emit-webpack-plugin/-/ignore-emit-webpack-plugin-2.0.6.tgz",
           "integrity": "sha512-/zC18RWCC2wz4ZwnS4UoujGWzvSKy28DLjtE+jrGBOXej6YdmityhBDzE8E0NlktEqi4tgdNbydX8B6G4haHSQ==",
           "dev": true
         },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        },
         "is-plain-object": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6676,6 +7876,12 @@
             "isobject": "^3.0.1"
           }
         },
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+          "dev": true
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -6772,27 +7978,67 @@
             }
           }
         },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
         "mini-css-extract-plugin": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-          "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz",
+          "integrity": "sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw==",
           "dev": true,
           "requires": {
-            "loader-utils": "^1.1.0",
-            "normalize-url": "1.9.1",
-            "schema-utils": "^1.0.0",
+            "loader-utils": "^2.0.0",
+            "schema-utils": "^3.0.0",
             "webpack-sources": "^1.1.0"
           },
           "dependencies": {
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+              "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            },
             "schema-utils": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+              "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
               "dev": true,
               "requires": {
-                "ajv": "^6.1.0",
-                "ajv-errors": "^1.0.0",
-                "ajv-keywords": "^3.1.0"
+                "@types/json-schema": "^7.0.6",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
               }
             },
             "webpack-sources": {
@@ -6813,18 +8059,6 @@
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
-        "normalize-url": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-          "dev": true,
-          "requires": {
-            "object-assign": "^4.0.1",
-            "prepend-http": "^1.0.0",
-            "query-string": "^4.1.0",
-            "sort-keys": "^1.0.0"
-          }
-        },
         "p-limit": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -6940,65 +8174,106 @@
           }
         },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "8.2.13",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.13.tgz",
+          "integrity": "sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              },
-              "dependencies": {
-                "supports-color": {
-                  "version": "5.5.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                  "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                  "dev": true,
-                  "requires": {
-                    "has-flag": "^3.0.0"
-                  }
-                }
-              }
-            }
+            "colorette": "^1.2.2",
+            "nanoid": "^3.1.22",
+            "source-map": "^0.6.1"
+          }
+        },
+        "postcss-custom-properties": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-11.0.0.tgz",
+          "integrity": "sha512-Fhnx/QLt+CTt23A/KKVx1anZD9nmVpOxKCKv5owWacMoOsBXFhMAD6SZYbmPMH4nHdIeMUnWOvLZnlY4niS0sA==",
+          "dev": true,
+          "requires": {
+            "postcss-values-parser": "^4.0.0"
           }
         },
         "postcss-loader": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-          "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
+          "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
           "dev": true,
           "requires": {
-            "loader-utils": "^1.1.0",
-            "postcss": "^7.0.0",
-            "postcss-load-config": "^2.0.0",
-            "schema-utils": "^1.0.0"
+            "cosmiconfig": "^7.0.0",
+            "klona": "^2.0.4",
+            "loader-utils": "^2.0.0",
+            "schema-utils": "^3.0.0",
+            "semver": "^7.3.4"
           },
           "dependencies": {
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+              "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            },
             "schema-utils": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+              "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
               "dev": true,
               "requires": {
-                "ajv": "^6.1.0",
-                "ajv-errors": "^1.0.0",
-                "ajv-keywords": "^3.1.0"
+                "@types/json-schema": "^7.0.6",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
               }
             }
           }
         },
+        "postcss-modules-extract-imports": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+          "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+          "dev": true
+        },
+        "postcss-modules-local-by-default": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+          "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+          "dev": true,
+          "requires": {
+            "icss-utils": "^5.0.0",
+            "postcss-selector-parser": "^6.0.2",
+            "postcss-value-parser": "^4.1.0"
+          }
+        },
+        "postcss-modules-scope": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+          "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+          "dev": true,
+          "requires": {
+            "postcss-selector-parser": "^6.0.4"
+          }
+        },
+        "postcss-modules-values": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+          "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+          "dev": true,
+          "requires": {
+            "icss-utils": "^5.0.0"
+          }
+        },
         "read-pkg": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -7011,42 +8286,58 @@
           }
         },
         "sass-loader": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-          "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+          "version": "10.1.1",
+          "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
+          "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
           "dev": true,
           "requires": {
-            "clone-deep": "^4.0.1",
-            "loader-utils": "^1.2.3",
-            "neo-async": "^2.6.1",
-            "schema-utils": "^2.6.1",
-            "semver": "^6.3.0"
+            "klona": "^2.0.4",
+            "loader-utils": "^2.0.0",
+            "neo-async": "^2.6.2",
+            "schema-utils": "^3.0.0",
+            "semver": "^7.3.2"
           },
           "dependencies": {
-            "semver": {
-              "version": "6.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-              "dev": true
+            "json5": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+              "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "loader-utils": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+              "dev": true,
+              "requires": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+              }
+            },
+            "schema-utils": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+              "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+              "dev": true,
+              "requires": {
+                "@types/json-schema": "^7.0.6",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+              }
             }
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "shallow-clone": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.2"
+            "lru-cache": "^6.0.0"
           }
         },
         "shebang-command": {
@@ -7073,17 +8364,6 @@
             "ansi-styles": "^4.0.0",
             "astral-regex": "^2.0.0",
             "is-fullwidth-code-point": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            }
           }
         },
         "source-map": {
@@ -7092,36 +8372,43 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "ssri": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
         "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         },
         "table": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz",
-          "integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+          "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
           "dev": true,
           "requires": {
             "ajv": "^8.0.1",
-            "is-boolean-object": "^1.1.0",
-            "is-number-object": "^1.0.4",
-            "is-string": "^1.0.5",
             "lodash.clonedeep": "^4.5.0",
             "lodash.flatten": "^4.4.0",
             "lodash.truncate": "^4.4.2",
             "slice-ansi": "^4.0.0",
-            "string-width": "^4.2.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0"
           },
           "dependencies": {
             "ajv": {
-              "version": "8.1.0",
-              "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
-              "integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
+              "version": "8.2.0",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+              "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
               "dev": true,
               "requires": {
                 "fast-deep-equal": "^3.1.1",
@@ -7138,6 +8425,172 @@
           "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
         },
+        "webpack": {
+          "version": "4.46.0",
+          "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
+          "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+          "dev": true,
+          "requires": {
+            "@webassemblyjs/ast": "1.9.0",
+            "@webassemblyjs/helper-module-context": "1.9.0",
+            "@webassemblyjs/wasm-edit": "1.9.0",
+            "@webassemblyjs/wasm-parser": "1.9.0",
+            "acorn": "^6.4.1",
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1",
+            "chrome-trace-event": "^1.0.2",
+            "enhanced-resolve": "^4.5.0",
+            "eslint-scope": "^4.0.3",
+            "json-parse-better-errors": "^1.0.2",
+            "loader-runner": "^2.4.0",
+            "loader-utils": "^1.2.3",
+            "memory-fs": "^0.4.1",
+            "micromatch": "^3.1.10",
+            "mkdirp": "^0.5.3",
+            "neo-async": "^2.6.1",
+            "node-libs-browser": "^2.2.1",
+            "schema-utils": "^1.0.0",
+            "tapable": "^1.1.3",
+            "terser-webpack-plugin": "^1.4.3",
+            "watchpack": "^1.7.4",
+            "webpack-sources": "^1.4.1"
+          },
+          "dependencies": {
+            "eslint-scope": {
+              "version": "4.0.3",
+              "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+              "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+              "dev": true,
+              "requires": {
+                "esrecurse": "^4.1.0",
+                "estraverse": "^4.1.1"
+              }
+            },
+            "find-cache-dir": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+              "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+              "dev": true,
+              "requires": {
+                "commondir": "^1.0.1",
+                "make-dir": "^2.0.0",
+                "pkg-dir": "^3.0.0"
+              }
+            },
+            "find-up": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+              "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+              "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "make-dir": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+              "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+              "dev": true,
+              "requires": {
+                "pify": "^4.0.1",
+                "semver": "^5.6.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+              "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+              "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+              "dev": true
+            },
+            "pify": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+              "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+              "dev": true
+            },
+            "pkg-dir": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+              "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+              "dev": true,
+              "requires": {
+                "find-up": "^3.0.0"
+              }
+            },
+            "schema-utils": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+              "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+              "dev": true,
+              "requires": {
+                "ajv": "^6.1.0",
+                "ajv-errors": "^1.0.0",
+                "ajv-keywords": "^3.1.0"
+              }
+            },
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            },
+            "terser-webpack-plugin": {
+              "version": "1.4.5",
+              "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+              "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+              "dev": true,
+              "requires": {
+                "cacache": "^12.0.2",
+                "find-cache-dir": "^2.1.0",
+                "is-wsl": "^1.1.0",
+                "schema-utils": "^1.0.0",
+                "serialize-javascript": "^4.0.0",
+                "source-map": "^0.6.1",
+                "terser": "^4.1.2",
+                "webpack-sources": "^1.4.0",
+                "worker-farm": "^1.7.0"
+              }
+            },
+            "webpack-sources": {
+              "version": "1.4.3",
+              "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+              "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+              "dev": true,
+              "requires": {
+                "source-list-map": "^2.0.0",
+                "source-map": "~0.6.1"
+              }
+            }
+          }
+        },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7269,9 +8722,9 @@
       }
     },
     "@wordpress/stylelint-config": {
-      "version": "19.0.2",
-      "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.0.2.tgz",
-      "integrity": "sha512-7tr2NL9VMqLjeZsEvjDoy7b0tm6KrVswZvxr5sJkgaJn4rOpI88SgKV3jh2qCZj4JTr8lfArzMS6dH9Ee2M0xw==",
+      "version": "19.0.3",
+      "resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-19.0.3.tgz",
+      "integrity": "sha512-67iCYE5T9TSgzQAnJfQZPl2ENZ+uujH1AarH/u7LibG3/JIf6CpofjmYvaBoLFtKQvBsYZhUaXJ18oIHdn4N0g==",
       "dev": true,
       "requires": {
         "stylelint-config-recommended": "^3.0.0",
@@ -8797,9 +10250,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -9918,28 +11371,28 @@
       }
     },
     "cheerio-select": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.3.0.tgz",
-      "integrity": "sha512-mLgqdHxVOQyhOIkG5QnRkDg7h817Dkf0dAvlCio2TJMmR72cJKH0bF28SHXvLkVrGcGOiub0/Bs/CMnPeQO7qw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.4.0.tgz",
+      "integrity": "sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==",
       "dev": true,
       "requires": {
-        "css-select": "^4.0.0",
+        "css-select": "^4.1.2",
         "css-what": "^5.0.0",
         "domelementtype": "^2.2.0",
-        "domhandler": "^4.1.0",
-        "domutils": "^2.5.2"
+        "domhandler": "^4.2.0",
+        "domutils": "^2.6.0"
       },
       "dependencies": {
         "css-select": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.0.0.tgz",
-          "integrity": "sha512-I7favumBlDP/nuHBKLfL5RqvlvRdn/W29evvWJ+TaoGPm7QD+xSIN5eY2dyGjtkUmemh02TZrqJb4B8DWo6PoQ==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.2.tgz",
+          "integrity": "sha512-nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw==",
           "dev": true,
           "requires": {
             "boolbase": "^1.0.0",
             "css-what": "^5.0.0",
-            "domhandler": "^4.1.0",
-            "domutils": "^2.5.1",
+            "domhandler": "^4.2.0",
+            "domutils": "^2.6.0",
             "nth-check": "^2.0.0"
           }
         },
@@ -9967,14 +11420,14 @@
           "dev": true
         },
         "domutils": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.2.tgz",
-          "integrity": "sha512-MHTthCb1zj8f1GVfRpeZUbohQf/HdBos0oX5gZcQFepOZPLLRyj6Wn7XS7EMnY7CVpwv8863u2vyE83Hfu28HQ==",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz",
+          "integrity": "sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==",
           "dev": true,
           "requires": {
             "dom-serializer": "^1.0.1",
             "domelementtype": "^2.2.0",
-            "domhandler": "^4.1.0"
+            "domhandler": "^4.2.0"
           }
         },
         "nth-check": {
@@ -11182,6 +12635,12 @@
         "mimic-response": "^2.0.0"
       }
     },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+      "dev": true
+    },
     "deep-extend": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz",
@@ -11538,9 +12997,9 @@
       }
     },
     "domhandler": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz",
-      "integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
+      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.2.0"
@@ -13344,6 +14803,23 @@
       "dev": true,
       "optional": true
     },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
+      "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.1",
+        "trim-repeated": "^1.0.0"
+      }
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -13458,9 +14934,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -14959,14 +16435,14 @@
           "dev": true
         },
         "domutils": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.2.tgz",
-          "integrity": "sha512-MHTthCb1zj8f1GVfRpeZUbohQf/HdBos0oX5gZcQFepOZPLLRyj6Wn7XS7EMnY7CVpwv8863u2vyE83Hfu28HQ==",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz",
+          "integrity": "sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==",
           "dev": true,
           "requires": {
             "dom-serializer": "^1.0.1",
             "domelementtype": "^2.2.0",
-            "domhandler": "^4.1.0"
+            "domhandler": "^4.2.0"
           }
         }
       }
@@ -15410,9 +16886,9 @@
       "dev": true
     },
     "irregular-plurals": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.2.0.tgz",
-      "integrity": "sha512-YqTdPLfwP7YFN0SsD3QUVCkm9ZG2VzOXv3DOrw5G5mkMbVwptTwVcFv7/C0vOpBmgTxAeTG19XpUs1E522LW9Q==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
+      "integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
       "dev": true
     },
     "is-absolute": {
@@ -15985,9 +17461,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -16247,6 +17723,86 @@
         }
       }
     },
+    "jest-circus": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-26.6.3.tgz",
+      "integrity": "sha512-ACrpWZGcQMpbv13XbzRzpytEJlilP/Su0JtNCi5r/xLpOUhnaIJr8leYYpLEMgPFURZISEHrnnpmB54Q/UziPw==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "stack-utils": "^2.0.2",
+        "throat": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "jest-config": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
@@ -16283,9 +17839,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -16485,9 +18041,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -16638,9 +18194,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -16779,9 +18335,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -16874,9 +18430,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17007,9 +18563,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17115,9 +18671,9 @@
           "dev": true
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17521,9 +19077,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17610,9 +19166,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17675,9 +19231,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17741,9 +19297,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -17877,9 +19433,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
-          "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
+          "version": "8.2.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+          "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
           "dev": true
         }
       }
@@ -18516,9 +20072,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -20107,9 +21663,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -23802,12 +25358,104 @@
       }
     },
     "sass": {
-      "version": "1.32.8",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
-      "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
+      "version": "1.32.12",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz",
+      "integrity": "sha512-zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==",
       "dev": true,
       "requires": {
-        "chokidar": ">=2.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.5.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
     "sass-graph": {
@@ -24871,6 +26519,15 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
     "style-loader": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
@@ -24904,16 +26561,16 @@
       "dev": true
     },
     "stylelint": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz",
-      "integrity": "sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==",
+      "version": "13.13.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
+      "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
       "dev": true,
       "requires": {
         "@stylelint/postcss-css-in-js": "^0.37.2",
         "@stylelint/postcss-markdown": "^0.36.2",
         "autoprefixer": "^9.8.6",
-        "balanced-match": "^1.0.0",
-        "chalk": "^4.1.0",
+        "balanced-match": "^2.0.0",
+        "chalk": "^4.1.1",
         "cosmiconfig": "^7.0.0",
         "debug": "^4.3.1",
         "execall": "^2.0.0",
@@ -24922,7 +26579,7 @@
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.2",
+        "globby": "^11.0.3",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
         "ignore": "^5.1.8",
@@ -24930,10 +26587,10 @@
         "imurmurhash": "^0.1.4",
         "known-css-properties": "^0.21.0",
         "lodash": "^4.17.21",
-        "log-symbols": "^4.0.0",
+        "log-symbols": "^4.1.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
-        "micromatch": "^4.0.2",
+        "micromatch": "^4.0.4",
         "normalize-selector": "^0.2.0",
         "postcss": "^7.0.35",
         "postcss-html": "^0.36.0",
@@ -24943,7 +26600,7 @@
         "postcss-safe-parser": "^4.0.2",
         "postcss-sass": "^0.4.4",
         "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.4",
+        "postcss-selector-parser": "^6.0.5",
         "postcss-syntax": "^0.36.2",
         "postcss-value-parser": "^4.1.0",
         "resolve-from": "^5.0.0",
@@ -24954,15 +26611,15 @@
         "style-search": "^0.1.0",
         "sugarss": "^2.0.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.0.7",
-        "v8-compile-cache": "^2.2.0",
+        "table": "^6.6.0",
+        "v8-compile-cache": "^2.3.0",
         "write-file-atomic": "^3.0.3"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
-          "integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+          "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -24992,6 +26649,21 @@
             "postcss-value-parser": "^4.1.0"
           }
         },
+        "balanced-match": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+          "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -25010,9 +26682,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -25069,6 +26741,15 @@
             "flat-cache": "^3.0.4"
           }
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
         "flat-cache": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -25126,6 +26807,12 @@
           "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
           "dev": true
         },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -25179,6 +26866,16 @@
             "yargs-parser": "^20.2.3"
           }
         },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
         "normalize-package-data": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
@@ -25191,6 +26888,12 @@
             "validate-npm-package-license": "^3.0.1"
           }
         },
+        "picomatch": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+          "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
+          "dev": true
+        },
         "postcss": {
           "version": "7.0.35",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -25226,6 +26929,16 @@
             }
           }
         },
+        "postcss-selector-parser": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
+          "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        },
         "read-pkg": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -25342,20 +27055,27 @@
           }
         },
         "table": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/table/-/table-6.0.9.tgz",
-          "integrity": "sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+          "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
           "dev": true,
           "requires": {
             "ajv": "^8.0.1",
-            "is-boolean-object": "^1.1.0",
-            "is-number-object": "^1.0.4",
-            "is-string": "^1.0.5",
             "lodash.clonedeep": "^4.5.0",
             "lodash.flatten": "^4.4.0",
             "lodash.truncate": "^4.4.2",
             "slice-ansi": "^4.0.0",
-            "string-width": "^4.2.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
           }
         },
         "trim-newlines": {
@@ -25871,34 +27591,33 @@
       "dev": true
     },
     "thread-loader": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
-      "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.3.tgz",
+      "integrity": "sha512-/s8dGDkKLF89qAsn2b0PNdXS68pKhj+/Rqd7YDht/OvTlBoMm0FAsndceowSX1GEKVLo8yKRil9e+W0PpI/q1g==",
       "dev": true,
       "requires": {
-        "loader-runner": "^2.3.1",
-        "loader-utils": "^1.1.0",
-        "neo-async": "^2.6.0"
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.1.0",
+        "loader-utils": "^2.0.0",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
+        "loader-runner": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+          "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+          "dev": true
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
           "dev": true,
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -26232,6 +27951,15 @@
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
       "dev": true
     },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -26816,34 +28544,25 @@
       }
     },
     "url-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-3.0.0.tgz",
-      "integrity": "sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
+      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "mime": "^2.4.4",
-        "schema-utils": "^2.5.0"
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.27",
+        "schema-utils": "^3.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
           "dev": true,
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -27667,15 +29386,15 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
-          "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
+          "version": "8.2.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+          "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
           "dev": true
         },
         "acorn-walk": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.0.2.tgz",
-          "integrity": "sha512-+bpA9MJsHdZ4bgfDcpk0ozQyhhVct7rzOmO0s1IIr0AGGgKBljss8n2zp11rRP2wid5VGeh04CgeKzgat5/25A==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
+          "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==",
           "dev": true
         },
         "ansi-styles": {
@@ -27688,9 +29407,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -28258,9 +29977,9 @@
       }
     },
     "ws": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
-      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
+      "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
       "dev": true
     },
     "x-is-string": {
diff --git a/package.json b/package.json
index 7f7796edd..e59e3d6a9 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@material-ui/icons": "4.11.2",
     "@testing-library/jest-dom": "5.11.4",
     "@testing-library/react": "10.4.9",
-    "@testing-library/user-event": "12.1.2",
+    "@testing-library/user-event": "13.1.8",
     "@types/classnames": "2.2.11",
     "@types/wordpress__core-data": "2.4.3",
     "@types/wordpress__data": "4.6.9",
@@ -55,7 +55,7 @@
     "@wordpress/keycodes": "2.19.0",
     "@wordpress/notices": "2.13.0",
     "@wordpress/postcss-plugins-preset": "2.1.0",
-    "@wordpress/scripts": "14.1.0",
+    "@wordpress/scripts": "15.0.1",
     "@wordpress/server-side-render": "1.19.5",
     "@wordpress/url": "2.22.0",
     "ace-builds": "1.4.12",
diff --git a/tests/e2e/specs/all-fields.js b/tests/e2e/specs/all-fields.js
index 366c3486d..b994869d3 100644
--- a/tests/e2e/specs/all-fields.js
+++ b/tests/e2e/specs/all-fields.js
@@ -6,7 +6,6 @@ import os from 'os';
 import path from 'path';
 import { v4 as uuid } from 'uuid';
 import { getDocument, queries } from 'pptr-testing-library';
-import userEvent from '@testing-library/user-event'
 
 /**
  * WordPress dependencies
@@ -19,7 +18,7 @@ import {
 
 describe( 'AllFields', () => {
 	it( 'creates the block and makes the fields available in the block editor', async () => {
-		const { findAllByLabelText, findAllByText, findByRole, findByText, findByLabelText, findByRole } = queries;
+		const { findAllByLabelText, findAllByText, findByLabelText, findByRole, findByText } = queries;
 		const blockName = 'Testing Example';
 		const fields = {
 			text: {
@@ -103,7 +102,6 @@ describe( 'AllFields', () => {
 			await findByLabelText( $editBlockDocument, 'Field Label' );
 			await page.keyboard.type( fields[ fieldType ].label );
 			await page.select( '#field-control', fieldType );
-			await findByRole( $editBlockDocument, 'combobox', { name: 'Field Type' } );
 		};
 
 		await addNewField( 'text' );

From 4a8b58a1b3c62b3c7eda93e7322ec49aa33a3e64 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 4 May 2021 16:01:13 -0500
Subject: [PATCH 17/21] Make e2e test more robust: query for role, not selector

This will look for a combobox (select)
with a lable, as that's more like

what a user would look for.
---
 tests/e2e/specs/all-fields.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/e2e/specs/all-fields.js b/tests/e2e/specs/all-fields.js
index b994869d3..9086619a7 100644
--- a/tests/e2e/specs/all-fields.js
+++ b/tests/e2e/specs/all-fields.js
@@ -102,6 +102,8 @@ describe( 'AllFields', () => {
 			await findByLabelText( $editBlockDocument, 'Field Label' );
 			await page.keyboard.type( fields[ fieldType ].label );
 			await page.select( '#field-control', fieldType );
+			await ( await findByRole( $editBlockDocument, 'combobox', { name: /field type/i } ) )
+				.select( fieldType );
 		};
 
 		await addNewField( 'text' );

From 094953fbc009c60be3b1cd8dc8079e812e271a6a Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 4 May 2021 16:07:00 -0500
Subject: [PATCH 18/21] Add artifacts/ to .gitignore, it looks like the new
 wordpress/scripts adds that dir

When e2e tests fail,
it looks like it uses that to add a screenshot.
---
 .gitignore  | 1 +
 gulpfile.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index aff92d981..2f389e11e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,6 +106,7 @@ node_modules
 vendor
 
 # Tests
+artifacts/
 tests/data/
 tests/includes/
 coverage/
diff --git a/gulpfile.js b/gulpfile.js
index d41f611e5..67ed234a9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -68,6 +68,7 @@ gulp.task( 'wporg:trunk', function() {
 gulp.task( 'clean:bundle', function() {
 	return del( [
 		'package/trunk/package',
+		'package/trunk/artifacts',
 		'package/trunk/assets/wporg',
 		'package/trunk/coverage',
 		'package/trunk/js/src',

From ce7d120ce2bdb801588a196d6ea7c17ed9545308 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Tue, 4 May 2021 23:46:40 -0500
Subject: [PATCH 19/21] Pluralize the attributes names and values

newAttributes is actually a
key/value pair, I think.
---
 js/src/edit-block/components/editor-preview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/edit-block/components/editor-preview.js b/js/src/edit-block/components/editor-preview.js
index 641a8fa2e..3152e6c53 100644
--- a/js/src/edit-block/components/editor-preview.js
+++ b/js/src/edit-block/components/editor-preview.js
@@ -25,7 +25,7 @@ const EditorPreview = () => {
 	const { previewAttributes = {} } = block;
 	const fields = getFields();
 
-	/** @param {Object} newAttributes Attribute (field) name and value. */
+	/** @param {Object} newAttributes Attribute (field) names and values. */
 	const setAttributes = ( newAttributes ) => {
 		changeBlock( {
 			previewAttributes: {

From a538af9929aa4687e62c6b8254663c9f9719a20f Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 5 May 2021 01:09:00 -0500
Subject: [PATCH 20/21] Add a new component for the Multiselect defaults

These should be saved as a string[],
not as an array of objects, like before.
---
 .../edit-block/components/settings/index.js   |  1 +
 .../components/settings/textarea-default.js   | 69 +++++++++++++++++++
 php/Blocks/Controls/Multiselect.php           |  4 +-
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 js/src/edit-block/components/settings/textarea-default.js

diff --git a/js/src/edit-block/components/settings/index.js b/js/src/edit-block/components/settings/index.js
index 22731c279..a11d8f2d0 100644
--- a/js/src/edit-block/components/settings/index.js
+++ b/js/src/edit-block/components/settings/index.js
@@ -7,4 +7,5 @@ export { default as NumberNonNegative } from './number-non-negative';
 export { default as Text } from './text';
 export { default as Textarea } from './textarea';
 export { default as TextareaArray } from './textarea-array';
+export { default as TextareaDefault } from './textarea-default';
 export { default as Width } from './width';
diff --git a/js/src/edit-block/components/settings/textarea-default.js b/js/src/edit-block/components/settings/textarea-default.js
new file mode 100644
index 000000000..bcd030309
--- /dev/null
+++ b/js/src/edit-block/components/settings/textarea-default.js
@@ -0,0 +1,69 @@
+/**
+ * External dependencies
+ */
+import * as React from 'react';
+
+/**
+ * Converts the default setting to a string.
+ *
+ * @param {Array|*} initial The default setting as an array, or another type that will be returned.
+ * @return {string|*} The setting converted to a string, or if passed a non-array, the same type it was passed.
+ */
+const convertDefaultArrayToString = ( initial ) => {
+	return Array.isArray( initial )
+		? initial.join( '\n' )
+		: initial;
+};
+
+/**
+ * Converts the default setting to an array.
+ *
+ * @param {string|*} initial The settings default as a string, or another type that will be returned.
+ * @return {Array|*} The setting converted to an array, or if passed a non-string, the same type it was passed.
+ */
+const convertDefaultStringToArray = ( initial ) => {
+	return 'string' === typeof initial
+		? initial.split( /\r\n|[\r\n]/ )
+		: initial;
+};
+
+/**
+ * @typedef {Object} TextareaDefaultProps The component props.
+ * @property {Function} handleOnChange Handles a change in this setting.
+ * @property {import('../editor').Setting} setting This setting.
+ * @property {Array|undefined} value The setting value.
+ */
+
+/**
+ * The textarea default component.
+ *
+ * @param {TextareaDefaultProps} props The component props.
+ * @return {React.ReactElement} The textarea default component.
+ */
+const TextareaDefault = ( { handleOnChange, setting, value } ) => {
+	const id = `setting-textarea-default-${ setting.name }`;
+	const stringValue = convertDefaultArrayToString( value );
+	const textAreaValue = undefined === stringValue ? setting.default : stringValue;
+
+	return (
+		<>
+			<label className="text-sm" htmlFor={ id }>{ setting.label }</label>
+			<textarea
+				id={ id }
+				className="flex items-center w-full rounded-sm border border-gray-600 mt-2 px-2 text-sm"
+				rows={ 6 }
+				onChange={ ( event ) => {
+					if ( event.target ) {
+						handleOnChange( convertDefaultStringToArray( event.target.value ) );
+					}
+				} }
+				value={ textAreaValue }
+			/>
+			<p className="block italic text-xs mt-1">
+				{ setting.help }
+			</p>
+		</>
+	);
+};
+
+export default TextareaDefault;
diff --git a/php/Blocks/Controls/Multiselect.php b/php/Blocks/Controls/Multiselect.php
index 467e1ffe2..009f3dbc2 100644
--- a/php/Blocks/Controls/Multiselect.php
+++ b/php/Blocks/Controls/Multiselect.php
@@ -60,8 +60,8 @@ public function register_settings() {
 			[
 				'name'    => 'default',
 				'label'   => __( 'Default Value', 'genesis-custom-blocks' ),
-				'type'    => 'textarea_array',
-				'default' => '',
+				'type'    => 'textarea_default',
+				'default' => [],
 				'help'    => __( 'Each default value on a new line.', 'genesis-custom-blocks' ),
 			]
 		);

From 96156f2241081f3b8d3339aaad9165b8767df951 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Wed, 5 May 2021 01:14:06 -0500
Subject: [PATCH 21/21] Fix the failed PHPUnit test

---
 tests/php/Unit/Blocks/Controls/TestMultiselect.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/php/Unit/Blocks/Controls/TestMultiselect.php b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
index 32cc31f43..e08c0db6f 100644
--- a/tests/php/Unit/Blocks/Controls/TestMultiselect.php
+++ b/tests/php/Unit/Blocks/Controls/TestMultiselect.php
@@ -85,8 +85,8 @@ public function test_register_settings() {
 			[
 				'name'    => 'default',
 				'label'   => 'Default Value',
-				'type'    => 'textarea_array',
-				'default' => '',
+				'type'    => 'textarea_default',
+				'default' => [],
 				'help'    => 'Each default value on a new line.',
 				'value'   => null,
 			],