From b565ab1295a8f897fcf60c83f4340c1f68e42b4b Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 01:14:11 +0530
Subject: [PATCH 01/25] add support for self hosted analytics

---
 assets/src/js/admin/main.js |  5 +++++
 src/Admin/Settings.php      | 28 ++++++++++++++++++++++++++++
 src/Includes/Helpers.php    | 14 +++++++++++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index e3641b7..5946d38 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -17,6 +17,9 @@ document.addEventListener( 'DOMContentLoaded', () => {
 		const customDomainPrefix = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain_prefix]"]' ).value;
 		const customDomainElement = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain]"]:checked' );
 		const isCustomDomain = null !== customDomainElement ? parseInt( customDomainElement.value ) : 0;
+		const selfHostedDomain = formElement.querySelector( 'input[name="plausible_analytics_settings[self_hosted_domain]"]' ).value;
+		const selfHostedAnalyticsElement = formElement.querySelector( 'input[name="plausible_analytics_settings[is_self_hosted_analytics]"]:checked' );
+		const isSelfHostedAnalytics = null !== selfHostedAnalyticsElement ? parseInt( selfHostedAnalyticsElement.value ) : 0;
 		const trackAdminElement = formElement.querySelector( 'input[name="plausible_analytics_settings[track_administrator]"]:checked' );
 		const isTrackAdmin = null !== trackAdminElement ? parseInt( trackAdminElement.value ) : 0;
 		const roadBlock = null !== formElement.querySelector( '.plausible-analytics-admin-settings-roadblock' ) ? document.querySelector( '.plausible-analytics-admin-settings-roadblock' ).value : '';
@@ -29,6 +32,8 @@ document.addEventListener( 'DOMContentLoaded', () => {
 		formData.append( 'domain_name', domainName );
 		formData.append( 'custom_domain', isCustomDomain === 1 );
 		formData.append( 'custom_domain_prefix', customDomainPrefix );
+		formData.append( 'is_self_hosted_analytics', isSelfHostedAnalytics === 1 );
+		formData.append( 'self_hosted_domain', selfHostedDomain );
 		formData.append( 'track_administrator', isTrackAdmin === 1 );
 
 		fetch(
diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php
index 7ec40e1..ec293de 100644
--- a/src/Admin/Settings.php
+++ b/src/Admin/Settings.php
@@ -61,6 +61,7 @@ public function plausible_analytics_settings_page() {
 		$settings             = Helpers::get_settings();
 		$domain               = ! empty( $settings['domain_name'] ) ? $settings['domain_name'] : Helpers::get_domain();
 		$custom_domain_prefix = ! empty( $settings['custom_domain_prefix'] ) ? $settings['custom_domain_prefix'] : 'analytics';
+		$self_hosted_domain   = ! empty( $settings['self_hosted_domain'] ) ? $settings['self_hosted_domain'] : 'example.com';
 		?>
 		<div class="plausible-analytics-header">
 			<div class="plausible-analytics-logo">
@@ -134,6 +135,33 @@ public function plausible_analytics_settings_page() {
 						?>
 					</div>
 				</div>
+				<div class="plausible-analytics-admin-field">
+					<div class="plausible-analytics-admin-field-header">
+						<label for="self-hosted-analytics">
+							<?php esc_html_e( 'Is Self Hosted Analytics?', 'plausible-analytics' ); ?>
+							<span class="plausible-analytics-admin-field-input">
+								<input type="text" name="plausible_analytics_settings[self_hosted_domain]" value="<?php echo $self_hosted_domain; ?>"/>
+							</span>
+						</label>
+						<?php echo Helpers::display_toggle_switch( 'is_self_hosted_analytics' ); ?>
+					</div>
+					<div class="plausible-analytics-description">
+						<?php
+						echo sprintf(
+							'<ol><li>%1$s <a href="%2$s" target="_blank">%3$s</a></li><li>%4$s %5$s %6$s %7$s %8$s</li></ol>',
+							esc_html__( 'Enable the custom domain functionality in your Plausible account.', 'plausible-analytics' ),
+							esc_url( 'https://docs.plausible.io/custom-domain/' ),
+							esc_html__( 'See how &raquo;', 'plausible-analytics' ),
+							esc_html__( 'Enable this setting and configure it to link with Plausible Analytics on your custom domain.', 'plausible-analytics' ),
+							__( 'For example,', 'plausible-analytics' ),
+							"<code>stats.$domain</code>",
+							__( 'or', 'plausible-analytics' ),
+							"<code>analytics.$domain</code>"
+						);
+
+						?>
+					</div>
+				</div>
 				<div class="plausible-analytics-admin-field">
 					<div class="plausible-analytics-admin-field-header">
 						<label for="track-administrator">
diff --git a/src/Includes/Helpers.php b/src/Includes/Helpers.php
index 7c716b6..8010aab 100644
--- a/src/Includes/Helpers.php
+++ b/src/Includes/Helpers.php
@@ -41,10 +41,18 @@ public static function get_domain() {
 	 * @return string
 	 */
 	public static function get_analytics_url() {
-		$settings = self::get_settings();
-		$domain   = $settings['domain_name'];
-		$url      = 'https://plausible.io/js/plausible.js';
+		$settings       = self::get_settings();
+		$domain         = $settings['domain_name'];
+		$default_domain = 'plausible.io';
+
+		// Triggered when self hosted analytics is enabled.
+		if ( 'true' === $settings['is_self_hosted_analytics'] ) {
+			$default_domain = $settings['self_hosted_domain'];
+		}
+
+		$url = "https://{$default_domain}/js/plausible.js";
 
+		// Triggered when custom domain is enabled.
 		if ( 'true' === $settings['custom_domain'] ) {
 			$custom_domain_prefix = $settings['custom_domain_prefix'];
 			$url                  = "https://{$custom_domain_prefix}.{$domain}/js/index.js";

From 3866e71766ec198918e083127f71d8bad3b6da0a Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 01:58:09 +0530
Subject: [PATCH 02/25] improve eslint

---
 .eslintrc.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 09ec095..3cf9c16 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -129,7 +129,12 @@
         "no-undef-init": "error",
         "no-unreachable": "error",
         "no-unsafe-negation": "error",
-        "no-unused-expressions": "error",
+        "no-unused-expressions": [
+            "error",
+            {
+                "allowTernary": true
+            }
+        ],
         "no-unused-vars": "error",
         "no-useless-computed-key": "error",
         "no-useless-constructor": "error",

From 3c9700f6ed30f53bc6b68a23678a29a118ddf110 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 01:58:33 +0530
Subject: [PATCH 03/25] improve toggling custom domain and self hosted

---
 assets/src/js/admin/main.js | 38 +++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index 5946d38..de8fbf2 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -1,25 +1,39 @@
 document.addEventListener( 'DOMContentLoaded', () => {
 	const saveSettings = document.getElementById( 'plausible-analytics-save-btn' );
+	const formElement = document.getElementById( 'plausible-analytics-settings-form' );
 
-	saveSettings.addEventListener( 'click', ( e ) => {
-		e.preventDefault();
+	// Bailout, if `formElement` doesn't exist.
+	if ( null === formElement ) {
+		return;
+	}
+
+	const customDomainElement = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain]"]' );
+	const selfHostedAnalyticsElement = formElement.querySelector( 'input[name="plausible_analytics_settings[is_self_hosted_analytics]"]' );
 
-		const formElement = document.getElementById( 'plausible-analytics-settings-form' );
+	customDomainElement.addEventListener( 'change', ( e ) => {
+		if ( e.target.checked ) {
+			selfHostedAnalyticsElement.removeAttribute( 'checked' );
+			selfHostedAnalyticsElement.checked ?? selfHostedAnalyticsElement.click();
+		}
+	} );
 
-		// Bailout, if `formElement` doesn't exist.
-		if ( null === formElement ) {
-			return;
+	selfHostedAnalyticsElement.addEventListener( 'change', ( e ) => {
+		if ( e.target.checked ) {
+			customDomainElement.removeAttribute( 'checked' );
+			customDomainElement.checked ?? customDomainElement.click();
 		}
+	} );
+
+	saveSettings.addEventListener( 'click', ( e ) => {
+		e.preventDefault();
 
 		const formData = new FormData();
 		const spinner = formElement.querySelector( '.plausible-analytics-spinner' );
 		const domainName = formElement.querySelector( 'input[name="plausible_analytics_settings[domain_name]"]' ).value;
 		const customDomainPrefix = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain_prefix]"]' ).value;
-		const customDomainElement = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain]"]:checked' );
-		const isCustomDomain = null !== customDomainElement ? parseInt( customDomainElement.value ) : 0;
+		const isCustomDomain = null !== customDomainElement ? customDomainElement.checked : false;
 		const selfHostedDomain = formElement.querySelector( 'input[name="plausible_analytics_settings[self_hosted_domain]"]' ).value;
-		const selfHostedAnalyticsElement = formElement.querySelector( 'input[name="plausible_analytics_settings[is_self_hosted_analytics]"]:checked' );
-		const isSelfHostedAnalytics = null !== selfHostedAnalyticsElement ? parseInt( selfHostedAnalyticsElement.value ) : 0;
+		const isSelfHostedAnalytics = null !== selfHostedAnalyticsElement ? selfHostedAnalyticsElement.checked : false;
 		const trackAdminElement = formElement.querySelector( 'input[name="plausible_analytics_settings[track_administrator]"]:checked' );
 		const isTrackAdmin = null !== trackAdminElement ? parseInt( trackAdminElement.value ) : 0;
 		const roadBlock = null !== formElement.querySelector( '.plausible-analytics-admin-settings-roadblock' ) ? document.querySelector( '.plausible-analytics-admin-settings-roadblock' ).value : '';
@@ -30,9 +44,9 @@ document.addEventListener( 'DOMContentLoaded', () => {
 		formData.append( 'action', 'plausible_analytics_save_admin_settings' );
 		formData.append( 'roadblock', roadBlock );
 		formData.append( 'domain_name', domainName );
-		formData.append( 'custom_domain', isCustomDomain === 1 );
+		formData.append( 'custom_domain', isCustomDomain === true );
 		formData.append( 'custom_domain_prefix', customDomainPrefix );
-		formData.append( 'is_self_hosted_analytics', isSelfHostedAnalytics === 1 );
+		formData.append( 'is_self_hosted_analytics', isSelfHostedAnalytics === true );
 		formData.append( 'self_hosted_domain', selfHostedDomain );
 		formData.append( 'track_administrator', isTrackAdmin === 1 );
 

From bb2d05a2b49209c1e588ee56d5480a5932ee723e Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 01:58:50 +0530
Subject: [PATCH 04/25] remove unused expression check

---
 .eslintrc.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 3cf9c16..023b9e3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -129,12 +129,6 @@
         "no-undef-init": "error",
         "no-unreachable": "error",
         "no-unsafe-negation": "error",
-        "no-unused-expressions": [
-            "error",
-            {
-                "allowTernary": true
-            }
-        ],
         "no-unused-vars": "error",
         "no-useless-computed-key": "error",
         "no-useless-constructor": "error",

From 14dc657accf10529ac6df9726bc447e8534cdba4 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 02:00:04 +0530
Subject: [PATCH 05/25] minor improvement to toggle js

---
 assets/src/js/admin/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index de8fbf2..aacebbd 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -13,14 +13,14 @@ document.addEventListener( 'DOMContentLoaded', () => {
 	customDomainElement.addEventListener( 'change', ( e ) => {
 		if ( e.target.checked ) {
 			selfHostedAnalyticsElement.removeAttribute( 'checked' );
-			selfHostedAnalyticsElement.checked ?? selfHostedAnalyticsElement.click();
+			selfHostedAnalyticsElement.checked ? selfHostedAnalyticsElement.click() : '';
 		}
 	} );
 
 	selfHostedAnalyticsElement.addEventListener( 'change', ( e ) => {
 		if ( e.target.checked ) {
 			customDomainElement.removeAttribute( 'checked' );
-			customDomainElement.checked ?? customDomainElement.click();
+			customDomainElement.checked ? customDomainElement.click() : '';
 		}
 	} );
 

From f0ca02786b86d2dd0ad9e731ec710f58895ec691 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Thu, 26 Nov 2020 02:04:10 +0530
Subject: [PATCH 06/25] description improvement for settings

---
 src/Admin/Settings.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php
index ec293de..818869b 100644
--- a/src/Admin/Settings.php
+++ b/src/Admin/Settings.php
@@ -148,15 +148,10 @@ public function plausible_analytics_settings_page() {
 					<div class="plausible-analytics-description">
 						<?php
 						echo sprintf(
-							'<ol><li>%1$s <a href="%2$s" target="_blank">%3$s</a></li><li>%4$s %5$s %6$s %7$s %8$s</li></ol>',
-							esc_html__( 'Enable the custom domain functionality in your Plausible account.', 'plausible-analytics' ),
-							esc_url( 'https://docs.plausible.io/custom-domain/' ),
-							esc_html__( 'See how &raquo;', 'plausible-analytics' ),
-							esc_html__( 'Enable this setting and configure it to link with Plausible Analytics on your custom domain.', 'plausible-analytics' ),
-							__( 'For example,', 'plausible-analytics' ),
-							"<code>stats.$domain</code>",
-							__( 'or', 'plausible-analytics' ),
-							"<code>analytics.$domain</code>"
+							'%1$s <a href="%2$s" target="_blank">%3$s</a>',
+							esc_html__( 'Enable the self-hosted analytics and enter the domain name you used to host the self-hosted version of Plausible Analytics.', 'plausible-analytics' ),
+							esc_url( 'https://docs.plausible.io/self-hosting/' ),
+							esc_html__( 'See more about self hosting &raquo;', 'plausible-analytics' )
 						);
 
 						?>

From 23cff1018acc79ce37027f4b1738bf2ec68e91ee Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 5 Dec 2020 01:18:53 +0530
Subject: [PATCH 07/25] update composer files

---
 composer.json |  4 ++--
 composer.lock | 57 +++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index fe34c8f..f7fab3b 100644
--- a/composer.json
+++ b/composer.json
@@ -14,8 +14,8 @@
     "require": {},
     "require-dev": {
         "squizlabs/php_codesniffer": "*",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.6",
-        "phpcompatibility/php-compatibility": "^9.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "*",
+        "phpcompatibility/php-compatibility": "*",
         "phpcompatibility/phpcompatibility-wp": "*",
         "wp-coding-standards/wpcs": "*"
     },
diff --git a/composer.lock b/composer.lock
index 0e98aad..6724b2b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2c5198ac34ef3d62115a1af3d1dbf612",
+    "content-hash": "59442429f0ddf027941c0452178582bf",
     "packages": [],
     "packages-dev": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.6.2",
+            "version": "v0.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "8001af8eb107fbfcedc31a8b51e20b07d85b457a"
+                "reference": "e8d808670b8f882188368faaf1144448c169c0b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/8001af8eb107fbfcedc31a8b51e20b07d85b457a",
-                "reference": "8001af8eb107fbfcedc31a8b51e20b07d85b457a",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7",
+                "reference": "e8d808670b8f882188368faaf1144448c169c0b7",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0",
-                "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "^2|^3"
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev"
             },
             "require-dev": {
                 "composer/composer": "*",
@@ -71,7 +71,11 @@
                 "stylecheck",
                 "tests"
             ],
-            "time": "2020-01-29T20:22:20+00:00"
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
+            "time": "2020-06-25T14:57:39+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -129,6 +133,10 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
             "time": "2019-12-27T09:44:58+00:00"
         },
         {
@@ -181,6 +189,10 @@
                 "polyfill",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie"
+            },
             "time": "2019-11-04T15:17:54+00:00"
         },
         {
@@ -231,20 +243,24 @@
                 "standards",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
+            },
             "time": "2019-08-28T14:22:28+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.6",
+            "version": "3.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
-                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
                 "shasum": ""
             },
             "require": {
@@ -282,7 +298,12 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2020-08-10T04:50:15+00:00"
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2020-10-23T02:01:07+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
@@ -328,6 +349,11 @@
                 "standards",
                 "wordpress"
             ],
+            "support": {
+                "issues": "https://github.com/WordPress/WordPress-Coding-Standards/issues",
+                "source": "https://github.com/WordPress/WordPress-Coding-Standards",
+                "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
+            },
             "time": "2020-05-13T23:57:56+00:00"
         }
     ],
@@ -337,5 +363,6 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "2.0.0"
 }

From f6f95ed243fbce7db7bf0dc300f352e9515c8fb8 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 5 Dec 2020 01:22:40 +0530
Subject: [PATCH 08/25] resolve undefined index notice

---
 src/Includes/Helpers.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Includes/Helpers.php b/src/Includes/Helpers.php
index 8010aab..6290e27 100644
--- a/src/Includes/Helpers.php
+++ b/src/Includes/Helpers.php
@@ -46,14 +46,20 @@ public static function get_analytics_url() {
 		$default_domain = 'plausible.io';
 
 		// Triggered when self hosted analytics is enabled.
-		if ( 'true' === $settings['is_self_hosted_analytics'] ) {
+		if (
+			! empty( $settings['is_self_hosted_analytics'] ) &&
+			'true' === $settings['is_self_hosted_analytics']
+		) {
 			$default_domain = $settings['self_hosted_domain'];
 		}
 
 		$url = "https://{$default_domain}/js/plausible.js";
 
 		// Triggered when custom domain is enabled.
-		if ( 'true' === $settings['custom_domain'] ) {
+		if (
+			! empty( $settings['custom_domain'] ) &&
+			'true' === $settings['custom_domain']
+		) {
 			$custom_domain_prefix = $settings['custom_domain_prefix'];
 			$url                  = "https://{$custom_domain_prefix}.{$domain}/js/index.js";
 		}

From d35af26c34ee2f35217bb404fc884e475991360d Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 5 Dec 2020 01:24:46 +0530
Subject: [PATCH 09/25] resolve notice on display toggle switch

---
 src/Includes/Helpers.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Includes/Helpers.php b/src/Includes/Helpers.php
index 6290e27..9dd1e4f 100644
--- a/src/Includes/Helpers.php
+++ b/src/Includes/Helpers.php
@@ -93,10 +93,11 @@ public static function get_analytics_dashboard_url() {
 	 * @return void
 	 */
 	public static function display_toggle_switch( $name ) {
-		$settings = Helpers::get_settings();
+		$settings            = Helpers::get_settings();
+		$individual_settings = ! empty( $settings[ $name ] ) ? $settings[ $name ] : '';
 		?>
 		<label class="plausible-analytics-switch">
-			<input <?php checked( $settings[ $name ], 'true' ); ?> class="plausible-analytics-switch-checkbox" name="plausible_analytics_settings[<?php echo $name; ?>]" value="1" type="checkbox" />
+			<input <?php checked( $individual_settings, 'true' ); ?> class="plausible-analytics-switch-checkbox" name="plausible_analytics_settings[<?php echo $name; ?>]" value="1" type="checkbox" />
 			<span class="plausible-analytics-switch-slider"></span>
 		</label>
 		<?php

From e1e79a4e6dafa547bcd448d6d9fc4aa9128806a7 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 5 Dec 2020 01:50:21 +0530
Subject: [PATCH 10/25] improve css for menu tabs

---
 assets/src/css/admin/general.scss | 76 +++++++++++++++++++++++++++++++
 assets/src/css/admin/main.scss    | 75 +-----------------------------
 assets/src/css/admin/menu.scss    | 26 +++++++++++
 3 files changed, 104 insertions(+), 73 deletions(-)
 create mode 100644 assets/src/css/admin/general.scss
 create mode 100644 assets/src/css/admin/menu.scss

diff --git a/assets/src/css/admin/general.scss b/assets/src/css/admin/general.scss
new file mode 100644
index 0000000..f145c73
--- /dev/null
+++ b/assets/src/css/admin/general.scss
@@ -0,0 +1,76 @@
+.plausible-analytics-hidden {
+	display: none;
+}
+
+.plausible-analytics-header {
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	padding: 0;
+	padding: 0;
+	margin: 0 0 0 -20px;
+
+	.plausible-analytics-logo {
+		padding: 20px;
+		border-right: 1px solid #f1f1f1;
+
+		img {
+			width: 36px;
+			height: 100%;
+		}
+	}
+
+	.plausible-analytics-title {
+		padding: 20px;
+	}
+
+	.plausible-analytics-actions {
+		display: flex;
+		margin-left: auto;
+		padding: 20px;
+	}
+}
+
+.plausible-analytics-wrap {
+	width: 800px;
+	margin: 0 auto;
+	margin-top: 50px;
+
+	.plausible-analytics-admin-field {
+		background-color: #fff;
+		margin-bottom: 20px;
+		padding: 15px;
+
+		.plausible-analytics-admin-field-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			label {
+				font-weight: 700;
+
+				.plausible-analytics-admin-field-input {
+					font-weight: 400;
+					font-size: 14px;
+
+					input[type='text'] {
+						background-color: #f5f5f5;
+						border: none;
+						border-radius: 5px;
+					}
+				}
+			}
+		}
+		.plausible-analytics-description {
+			font-style: italic;
+			color: #989898;
+			border-top: 1px dashed #e5e5e5;
+			padding: 10px 0 0 0;
+			margin: 15px 0 0 0;
+
+			ol {
+				margin: 5px 15px;
+			}
+		}
+	}
+}
diff --git a/assets/src/css/admin/main.scss b/assets/src/css/admin/main.scss
index fa9f1cb..c9e536b 100644
--- a/assets/src/css/admin/main.scss
+++ b/assets/src/css/admin/main.scss
@@ -1,78 +1,7 @@
 @import './_variables';
 @import './_mixins';
+@import './menu.scss';
+@import './general.scss';
 @import './switch.scss';
 @import './trigger.scss';
 @import './spinner.scss';
-
-.plausible-analytics-header {
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	padding: 0;
-	padding: 0;
-	margin: 0 0 0 -20px;
-
-	.plausible-analytics-logo {
-		padding: 20px;
-		border-right: 1px solid #f1f1f1;
-
-		img {
-			width: 36px;
-			height: 100%;
-		}
-	}
-
-	.plausible-analytics-title {
-		padding: 20px;
-	}
-
-	.plausible-analytics-actions {
-		display: flex;
-		margin-left: auto;
-		padding: 20px;
-	}
-}
-
-.plausible-analytics-wrap {
-	width: 800px;
-	margin: 0 auto;
-	margin-top: 50px;
-
-	.plausible-analytics-admin-field {
-		background-color: #fff;
-		margin-bottom: 20px;
-		padding: 15px;
-
-		.plausible-analytics-admin-field-header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			label {
-				font-weight: 700;
-
-				.plausible-analytics-admin-field-input {
-					font-weight: 400;
-					font-size: 14px;
-
-					input[type='text'] {
-						background-color: #f5f5f5;
-						border: none;
-						border-radius: 5px;
-					}
-				}
-			}
-		}
-		.plausible-analytics-description {
-			font-style: italic;
-			color: #989898;
-			border-top: 1px dashed #e5e5e5;
-			padding: 10px 0 0 0;
-			margin: 15px 0 0 0;
-
-			ol {
-				margin: 5px 15px;
-			}
-		}
-	}
-}
diff --git a/assets/src/css/admin/menu.scss b/assets/src/css/admin/menu.scss
new file mode 100644
index 0000000..69e6829
--- /dev/null
+++ b/assets/src/css/admin/menu.scss
@@ -0,0 +1,26 @@
+.plausible-analytics-admin-menu {
+	// padding: 0 !important;
+
+	ul {
+		display: flex;
+		align-items: center;
+
+		li {
+			list-style: none;
+			margin: 0;
+
+			a {
+				padding: 15px;
+				text-decoration: none;
+				text-transform: uppercase;
+				color: #333;
+				font-weight: 500;
+
+				&.active {
+					border-bottom: 3px solid $base-color;
+					color: $base-color;
+				}
+			}
+		}
+	}
+}

From 3f39994860cd77eab6b2b19116e6d207dc4cc96c Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 5 Dec 2020 01:50:40 +0530
Subject: [PATCH 11/25] restructure settings page based on menu

---
 src/Admin/Settings.php | 175 +++++++++++++++++++++++------------------
 1 file changed, 97 insertions(+), 78 deletions(-)

diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php
index 818869b..0624b68 100644
--- a/src/Admin/Settings.php
+++ b/src/Admin/Settings.php
@@ -81,92 +81,111 @@ public function plausible_analytics_settings_page() {
 		</div>
 		<div class="wrap plausible-analytics-wrap">
 			<form id="plausible-analytics-settings-form" class="plausible-analytics-form">
-				<div class="plausible-analytics-admin-field">
-					<div class="plausible-analytics-admin-field-header">
-						<label for="domain-connected">
-							<?php esc_html_e( 'Domain Name', 'plausible-analytics' ); ?>
-							<span class="plausible-analytics-admin-field-input">
-								<input type="text" name="plausible_analytics_settings[domain_name]" value="<?php echo $domain; ?>"/>
-							</span>
-						</label>
-						<div>
-							<a class="plausible-analytics-link" href="<?php echo Helpers::get_analytics_dashboard_url(); ?>" target="_blank">
-								<?php esc_html_e( 'Open Analytics', 'plausible-analytics' ); ?>
+				<div class="plausible-analytics-admin-field plausible-analytics-admin-menu">
+					<ul>
+						<li>
+							<a href="#" class="active" data-tab="general">
+								<?php esc_html_e( 'General', 'plausible-analytics' ); ?>
 							</a>
-						</div>
-					</div>
-					<p class="plausible-analytics-description">
-						<?php
-						echo sprintf(
-							'%1$s <a href="%2$s" target="_blank">%3$s</a> %4$s',
-							esc_html__( 'We have fetched the domain name for which Plausible Analytics will be used. We assume that you have already setup the domain on our website.', 'plausible-analytics' ),
-							esc_url( 'https://docs.plausible.io/register-account' ),
-							esc_html__( 'Follow these instructions', 'plausible-analytics' ),
-							esc_html__( 'to add your site to Plausible.', 'plausible-analytics' )
-						);
-						?>
-					</p>
+						</li>
+						<li>
+							<a href="#" data-tab="self-hosted">
+								<?php esc_html_e( 'Self Hosted', 'plausible-analytics' ); ?>
+							</a>
+						</li>
+					</ul>
 				</div>
-				<div class="plausible-analytics-admin-field">
-					<div class="plausible-analytics-admin-field-header">
-						<label for="custom-domain">
-							<?php esc_html_e( 'Custom Domain', 'plausible-analytics' ); ?>
-							<span class="plausible-analytics-admin-field-input">
-								<input type="text" name="plausible_analytics_settings[custom_domain_prefix]" value="<?php echo $custom_domain_prefix; ?>"/>
-								<?php echo ".{$domain}"; ?>
-							</span>
-						</label>
-						<?php echo Helpers::display_toggle_switch( 'custom_domain' ); ?>
+				<div id="plausible-analytics-content-general" class="plausible-analytics-content-general">
+					<div class="plausible-analytics-admin-field">
+						<div class="plausible-analytics-admin-field-header">
+							<label for="domain-connected">
+								<?php esc_html_e( 'Domain Name', 'plausible-analytics' ); ?>
+								<span class="plausible-analytics-admin-field-input">
+									<input type="text" name="plausible_analytics_settings[domain_name]" value="<?php echo $domain; ?>"/>
+								</span>
+							</label>
+							<div>
+								<a class="plausible-analytics-link" href="<?php echo Helpers::get_analytics_dashboard_url(); ?>" target="_blank">
+									<?php esc_html_e( 'Open Analytics', 'plausible-analytics' ); ?>
+								</a>
+							</div>
+						</div>
+						<p class="plausible-analytics-description">
+							<?php
+							echo sprintf(
+								'%1$s <a href="%2$s" target="_blank">%3$s</a> %4$s',
+								esc_html__( 'We have fetched the domain name for which Plausible Analytics will be used. We assume that you have already setup the domain on our website.', 'plausible-analytics' ),
+								esc_url( 'https://docs.plausible.io/register-account' ),
+								esc_html__( 'Follow these instructions', 'plausible-analytics' ),
+								esc_html__( 'to add your site to Plausible.', 'plausible-analytics' )
+							);
+							?>
+						</p>
 					</div>
-					<div class="plausible-analytics-description">
-						<?php
-						echo sprintf(
-							'<ol><li>%1$s <a href="%2$s" target="_blank">%3$s</a></li><li>%4$s %5$s %6$s %7$s %8$s</li></ol>',
-							esc_html__( 'Enable the custom domain functionality in your Plausible account.', 'plausible-analytics' ),
-							esc_url( 'https://docs.plausible.io/custom-domain/' ),
-							esc_html__( 'See how &raquo;', 'plausible-analytics' ),
-							esc_html__( 'Enable this setting and configure it to link with Plausible Analytics on your custom domain.', 'plausible-analytics' ),
-							__( 'For example,', 'plausible-analytics' ),
-							"<code>stats.$domain</code>",
-							__( 'or', 'plausible-analytics' ),
-							"<code>analytics.$domain</code>"
-						);
+					<div class="plausible-analytics-admin-field">
+						<div class="plausible-analytics-admin-field-header">
+							<label for="custom-domain">
+								<?php esc_html_e( 'Custom Domain', 'plausible-analytics' ); ?>
+								<span class="plausible-analytics-admin-field-input">
+									<input type="text" name="plausible_analytics_settings[custom_domain_prefix]" value="<?php echo $custom_domain_prefix; ?>"/>
+									<?php echo ".{$domain}"; ?>
+								</span>
+							</label>
+							<?php echo Helpers::display_toggle_switch( 'custom_domain' ); ?>
+						</div>
+						<div class="plausible-analytics-description">
+							<?php
+							echo sprintf(
+								'<ol><li>%1$s <a href="%2$s" target="_blank">%3$s</a></li><li>%4$s %5$s %6$s %7$s %8$s</li></ol>',
+								esc_html__( 'Enable the custom domain functionality in your Plausible account.', 'plausible-analytics' ),
+								esc_url( 'https://docs.plausible.io/custom-domain/' ),
+								esc_html__( 'See how &raquo;', 'plausible-analytics' ),
+								esc_html__( 'Enable this setting and configure it to link with Plausible Analytics on your custom domain.', 'plausible-analytics' ),
+								__( 'For example,', 'plausible-analytics' ),
+								"<code>stats.$domain</code>",
+								__( 'or', 'plausible-analytics' ),
+								"<code>analytics.$domain</code>"
+							);
 
-						?>
-					</div>
-				</div>
-				<div class="plausible-analytics-admin-field">
-					<div class="plausible-analytics-admin-field-header">
-						<label for="self-hosted-analytics">
-							<?php esc_html_e( 'Is Self Hosted Analytics?', 'plausible-analytics' ); ?>
-							<span class="plausible-analytics-admin-field-input">
-								<input type="text" name="plausible_analytics_settings[self_hosted_domain]" value="<?php echo $self_hosted_domain; ?>"/>
-							</span>
-						</label>
-						<?php echo Helpers::display_toggle_switch( 'is_self_hosted_analytics' ); ?>
+							?>
+						</div>
 					</div>
-					<div class="plausible-analytics-description">
-						<?php
-						echo sprintf(
-							'%1$s <a href="%2$s" target="_blank">%3$s</a>',
-							esc_html__( 'Enable the self-hosted analytics and enter the domain name you used to host the self-hosted version of Plausible Analytics.', 'plausible-analytics' ),
-							esc_url( 'https://docs.plausible.io/self-hosting/' ),
-							esc_html__( 'See more about self hosting &raquo;', 'plausible-analytics' )
-						);
-
-						?>
+					<div class="plausible-analytics-admin-field">
+						<div class="plausible-analytics-admin-field-header">
+							<label for="track-administrator">
+								<?php esc_html_e( 'Track analytics for administrator', 'plausible-analytics' ); ?>
+							</label>
+							<?php echo Helpers::display_toggle_switch( 'track_administrator' ); ?>
+						</div>
+						<p class="plausible-analytics-description">
+							<?php esc_html_e( 'By default, we won\'t be tracking analytics for administrator. If you want to track analytics for administrator then please enable this setting.', 'plausible-analytics' ); ?>
+						</p>
 					</div>
 				</div>
-				<div class="plausible-analytics-admin-field">
-					<div class="plausible-analytics-admin-field-header">
-						<label for="track-administrator">
-							<?php esc_html_e( 'Track analytics for administrator', 'plausible-analytics' ); ?>
-						</label>
-						<?php echo Helpers::display_toggle_switch( 'track_administrator' ); ?>
+
+				<div id="plausible-analytics-content-self-hosted" class="plausible-analytics-content-self-hosted plausible-analytics-hidden">
+					<div class="plausible-analytics-admin-field">
+						<div class="plausible-analytics-admin-field-header">
+							<label for="self-hosted-analytics">
+								<?php esc_html_e( 'Is Self Hosted Analytics?', 'plausible-analytics' ); ?>
+								<span class="plausible-analytics-admin-field-input">
+									<input type="text" name="plausible_analytics_settings[self_hosted_domain]" value="<?php echo $self_hosted_domain; ?>"/>
+								</span>
+							</label>
+							<?php echo Helpers::display_toggle_switch( 'is_self_hosted_analytics' ); ?>
+						</div>
+						<div class="plausible-analytics-description">
+							<?php
+							echo sprintf(
+								'%1$s <a href="%2$s" target="_blank">%3$s</a>',
+								esc_html__( 'Enable the self-hosted analytics and enter the domain name you used to host the self-hosted version of Plausible Analytics.', 'plausible-analytics' ),
+								esc_url( 'https://docs.plausible.io/self-hosting/' ),
+								esc_html__( 'See more about self hosting &raquo;', 'plausible-analytics' )
+							);
+
+							?>
+						</div>
 					</div>
-					<p class="plausible-analytics-description">
-						<?php esc_html_e( 'By default, we won\'t be tracking analytics for administrator. If you want to track analytics for administrator then please enable this setting.', 'plausible-analytics' ); ?>
-					</p>
 				</div>
 				<div class="plausible-analytics-admin-field">
 					<div class="plausible-analytics-admin-field-header">

From c92e3ad8e5c72f412ddc679a592c515109e44e25 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 6 Dec 2020 00:18:46 +0530
Subject: [PATCH 12/25] display content based on tab selection

---
 assets/src/css/admin/general.scss |  8 ++++++++
 assets/src/css/admin/menu.scss    |  4 ++++
 assets/src/js/admin/main.js       | 29 ++++++++++++++++-------------
 src/Admin/Settings.php            |  6 +++---
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/assets/src/css/admin/general.scss b/assets/src/css/admin/general.scss
index f145c73..a80421f 100644
--- a/assets/src/css/admin/general.scss
+++ b/assets/src/css/admin/general.scss
@@ -2,6 +2,14 @@
 	display: none;
 }
 
+.plausible-analytics-show {
+	display: block;
+}
+
+.plausible-analytics-content {
+	@extend .plausible-analytics-hidden;
+}
+
 .plausible-analytics-header {
 	display: flex;
 	align-items: center;
diff --git a/assets/src/css/admin/menu.scss b/assets/src/css/admin/menu.scss
index 69e6829..89e96fc 100644
--- a/assets/src/css/admin/menu.scss
+++ b/assets/src/css/admin/menu.scss
@@ -15,10 +15,14 @@
 				text-transform: uppercase;
 				color: #333;
 				font-weight: 500;
+				outline: none;
+				box-shadow: none;
 
 				&.active {
 					border-bottom: 3px solid $base-color;
 					color: $base-color;
+					outline: none;
+					box-shadow: none;
 				}
 			}
 		}
diff --git a/assets/src/js/admin/main.js b/assets/src/js/admin/main.js
index aacebbd..2ea47ed 100644
--- a/assets/src/js/admin/main.js
+++ b/assets/src/js/admin/main.js
@@ -7,23 +7,26 @@ document.addEventListener( 'DOMContentLoaded', () => {
 		return;
 	}
 
-	const customDomainElement = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain]"]' );
-	const selfHostedAnalyticsElement = formElement.querySelector( 'input[name="plausible_analytics_settings[is_self_hosted_analytics]"]' );
+	const tabsWrap = formElement.querySelector( '.plausible-analytics-admin-tabs' );
+	const tabs = Array.from( tabsWrap.querySelectorAll( 'a' ) );
+	const tabContents = Array.from( formElement.querySelectorAll( '.plausible-analytics-content' ) );
 
-	customDomainElement.addEventListener( 'change', ( e ) => {
-		if ( e.target.checked ) {
-			selfHostedAnalyticsElement.removeAttribute( 'checked' );
-			selfHostedAnalyticsElement.checked ? selfHostedAnalyticsElement.click() : '';
-		}
-	} );
+	tabs.forEach( ( tab ) => {
+		tab.addEventListener( 'click', ( e ) => {
+			e.preventDefault();
+			const tabName = e.target.getAttribute( 'data-tab' );
+
+			tabs.map( ( tabElement ) => tabElement.classList.remove( 'active' ) );
+			tabContents.map( ( tabContent ) => tabContent.classList.remove( 'plausible-analytics-show' ) );
 
-	selfHostedAnalyticsElement.addEventListener( 'change', ( e ) => {
-		if ( e.target.checked ) {
-			customDomainElement.removeAttribute( 'checked' );
-			customDomainElement.checked ? customDomainElement.click() : '';
-		}
+			e.target.classList.add( 'active' );
+			formElement.querySelector( `#plausible-analytics-content-${ tabName }` ).classList.add( 'plausible-analytics-show' );
+		} );
 	} );
 
+	const customDomainElement = formElement.querySelector( 'input[name="plausible_analytics_settings[custom_domain]"]' );
+	const selfHostedAnalyticsElement = formElement.querySelector( 'input[name="plausible_analytics_settings[is_self_hosted_analytics]"]' );
+
 	saveSettings.addEventListener( 'click', ( e ) => {
 		e.preventDefault();
 
diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php
index 0624b68..5574796 100644
--- a/src/Admin/Settings.php
+++ b/src/Admin/Settings.php
@@ -82,7 +82,7 @@ public function plausible_analytics_settings_page() {
 		<div class="wrap plausible-analytics-wrap">
 			<form id="plausible-analytics-settings-form" class="plausible-analytics-form">
 				<div class="plausible-analytics-admin-field plausible-analytics-admin-menu">
-					<ul>
+					<ul class="plausible-analytics-admin-tabs">
 						<li>
 							<a href="#" class="active" data-tab="general">
 								<?php esc_html_e( 'General', 'plausible-analytics' ); ?>
@@ -95,7 +95,7 @@ public function plausible_analytics_settings_page() {
 						</li>
 					</ul>
 				</div>
-				<div id="plausible-analytics-content-general" class="plausible-analytics-content-general">
+				<div id="plausible-analytics-content-general" class="plausible-analytics-content plausible-analytics-show">
 					<div class="plausible-analytics-admin-field">
 						<div class="plausible-analytics-admin-field-header">
 							<label for="domain-connected">
@@ -163,7 +163,7 @@ public function plausible_analytics_settings_page() {
 					</div>
 				</div>
 
-				<div id="plausible-analytics-content-self-hosted" class="plausible-analytics-content-self-hosted plausible-analytics-hidden">
+				<div id="plausible-analytics-content-self-hosted" class="plausible-analytics-content">
 					<div class="plausible-analytics-admin-field">
 						<div class="plausible-analytics-admin-field-header">
 							<label for="self-hosted-analytics">

From 69147db6e03bf67448fb2ff1e60e2cfdd9bbb24c Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 6 Dec 2020 00:43:42 +0530
Subject: [PATCH 13/25] update settings title and description

---
 src/Admin/Settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php
index 5574796..c2591d4 100644
--- a/src/Admin/Settings.php
+++ b/src/Admin/Settings.php
@@ -167,7 +167,7 @@ public function plausible_analytics_settings_page() {
 					<div class="plausible-analytics-admin-field">
 						<div class="plausible-analytics-admin-field-header">
 							<label for="self-hosted-analytics">
-								<?php esc_html_e( 'Is Self Hosted Analytics?', 'plausible-analytics' ); ?>
+								<?php esc_html_e( 'Self-hosted Plausible?', 'plausible-analytics' ); ?>
 								<span class="plausible-analytics-admin-field-input">
 									<input type="text" name="plausible_analytics_settings[self_hosted_domain]" value="<?php echo $self_hosted_domain; ?>"/>
 								</span>
@@ -178,9 +178,9 @@ public function plausible_analytics_settings_page() {
 							<?php
 							echo sprintf(
 								'%1$s <a href="%2$s" target="_blank">%3$s</a>',
-								esc_html__( 'Enable the self-hosted analytics and enter the domain name you used to host the self-hosted version of Plausible Analytics.', 'plausible-analytics' ),
-								esc_url( 'https://docs.plausible.io/self-hosting/' ),
-								esc_html__( 'See more about self hosting &raquo;', 'plausible-analytics' )
+								esc_html__( 'If you\'re self-hosting Plausible on your own infrastructure, enter the domain name where you installed it to enable the integration with your self-hosted instance. Learn more', 'plausible-analytics' ),
+								esc_url( 'https://plausible.io/self-hosted-web-analytics/' ),
+								esc_html__( 'about Plausible Self-Hosted.', 'plausible-analytics' )
 							);
 
 							?>

From 8bba6c599d02b8651dfeb54b804a6f5f4b3314a5 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 12 Dec 2020 00:19:44 +0530
Subject: [PATCH 14/25] add support for 404 goal tracking snippet

---
 src/Includes/Actions.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Includes/Actions.php b/src/Includes/Actions.php
index dde49b8..0597536 100644
--- a/src/Includes/Actions.php
+++ b/src/Includes/Actions.php
@@ -48,5 +48,13 @@ public function register_assets() {
 		}
 
 		wp_enqueue_script( 'plausible-analytics', Helpers::get_analytics_url(), '', PLAUSIBLE_ANALYTICS_VERSION );
+
+		// Goal tracking inline script (Don't disable this as it is required by 404).
+		wp_add_inline_script( 'plausible-analytics', 'window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }' );
+
+		// Track 404 pages.
+		if ( apply_filters( 'plausible_analytics_enable_404', true ) && is_404() ) {
+			wp_add_inline_script( 'plausible-analytics', 'plausible("404",{ props: { path: document.location.pathname } });' );
+		}
 	}
 }

From 471cc2f8b2dbf31a3d452775f32b892a5cc2318e Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 12 Dec 2020 20:08:01 +0530
Subject: [PATCH 15/25] add support for outbound links

---
 src/Includes/Actions.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Includes/Actions.php b/src/Includes/Actions.php
index 0597536..223aee1 100644
--- a/src/Includes/Actions.php
+++ b/src/Includes/Actions.php
@@ -56,5 +56,10 @@ public function register_assets() {
 		if ( apply_filters( 'plausible_analytics_enable_404', true ) && is_404() ) {
 			wp_add_inline_script( 'plausible-analytics', 'plausible("404",{ props: { path: document.location.pathname } });' );
 		}
+
+		// Track Outbound Links.
+		if ( apply_filters( 'plausible_analytics_enable_outbound_links', true ) ) {
+			wp_add_inline_script( 'plausible-analytics', 'document.addEventListener("click",function(e){for(var t=e.target;t&&(void 0===t.tagName||"a"!=t.tagName.toLowerCase()||!t.href);)t=t.parentNode;t&&t.href&&t.host&&t.host!==location.host&&(plausible("Outbound Link: Click",{props:{referrer:document.location.origin,url:t.href}}),t.target&&!t.target.match(/^_(self|parent|top)$/i)||(setTimeout(function(){location.href=t.href},150),e.preventDefault()))});' );
+		}
 	}
 }

From eba5cf45a64cf361ca7337da7bc1224397d6ff6a Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 12 Dec 2020 23:07:39 +0530
Subject: [PATCH 16/25] update plugin version to 1.1.0

---
 config/constants.php    | 2 +-
 package.json            | 2 +-
 plausible-analytics.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index 0ef37c9..898e2d1 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -6,7 +6,7 @@
 
 // Define plugin version in SemVer format.
 if ( ! defined( 'PLAUSIBLE_ANALYTICS_VERSION' ) ) {
-	define( 'PLAUSIBLE_ANALYTICS_VERSION', '1.0.1' );
+	define( 'PLAUSIBLE_ANALYTICS_VERSION', '1.1.0' );
 }
 
 // Define plugin root File.
diff --git a/package.json b/package.json
index 38cfef8..99cd5da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "plausible-analytics",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "",
     "main": "index.js",
     "scripts": {
diff --git a/plausible-analytics.php b/plausible-analytics.php
index 76dee1d..557b178 100644
--- a/plausible-analytics.php
+++ b/plausible-analytics.php
@@ -5,7 +5,7 @@
  * Description: Simple and privacy-friendly alternative to Google Analytics.
  * Author: PlausibleHQ
  * Author URI: https://plausible.io
- * Version: 1.0.1
+ * Version: 1.1.0
  * Text Domain: plausible-analytics
  * Domain Path: /languages
  *

From 1df273c2875008f6f46cc7b3c45da578f212df1e Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sat, 12 Dec 2020 23:08:05 +0530
Subject: [PATCH 17/25] update readme.txt for 1.1.0

---
 readme.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 175b4c0..c01bdc6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@ Contributors: plausible, mehul0810
 Donate link: https://plausible.io/
 Tags: analytics, google analytics, web analytics, stats, privacy, privacy friendly
 Requires at least: 4.8
-Tested up to: 5.5
+Tested up to: 5.6
 Requires PHP: 5.6
-Stable tag: 1.0.1
+Stable tag: 1.1.0
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT
 
@@ -94,6 +94,12 @@ Please make sure you make a backup of your database before updating any version
 
 == Changelog ==
 
+= 1.1.0 =
+- add support for self-hosted plausible analytics script [#2](https://github.com/plausible/wordpress/issues/2)
+- add support for custom events tracking [#3](https://github.com/plausible/wordpress/issues/3)
+- add support for outbound link click tracking [#4](https://github.com/plausible/wordpress/issues/4)
+- add support for 404 error pages tracking [#6](https://github.com/plausible/wordpress/issues/6)
+
 = 1.0.1 =
 - Fixed the broken link for "Report a bug" button
 - Improved the description of the important settings and linked them to some Plausible docs for better explanation.

From 4a2c3a00d0517e90bcc3e797572a8c31dd5b307c Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:35:06 +0530
Subject: [PATCH 18/25] remove deploy.yml

---
 .github/workflows/deploy.yml | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 9fd6135..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Build & Deploy to WordPress.org
-on:
-  release:
-    types: [published]
-jobs:
-  tag:
-    name: Plausible Analytics
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Build
-        run: |
-          composer install
-          npm install
-          npm run build
-      - name: WordPress Plugin Deploy
-        id: deploy
-        uses: 10up/action-wordpress-plugin-deploy@stable
-        with:
-          generate-zip: true
-        env:
-          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
-          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
-          SLUG: plausible-analytics
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
-          asset_name: ${{ github.event.repository.name }}.zip
-          asset_content_type: application/zip

From 045331c74543bf69137a7c6f32ca53c816f9832a Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:35:21 +0530
Subject: [PATCH 19/25] add prerelease.yml and release.yml

---
 .github/workflows/prerelease.yml | 41 ++++++++++++++++++++++++++++
 .github/workflows/release.yml    | 46 ++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 .github/workflows/prerelease.yml
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
new file mode 100644
index 0000000..d0dcbe6
--- /dev/null
+++ b/.github/workflows/prerelease.yml
@@ -0,0 +1,41 @@
+name: Build Plugin Pre-Release
+
+on:
+  release:
+    types: [ prereleased ]
+
+jobs:
+  build:
+    name:    Build Plugin Artifact
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install composer dependencies
+        uses: php-actions/composer@v2
+        with:
+          dev: no
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: Install npm dependencies
+        run: |
+          npm ci
+          sudo npm run build
+      - name: Generate plugin artifact
+        run: |
+          rsync -rc --exclude-from="$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" release/ --delete --delete-excluded
+          cd "${GITHUB_WORKSPACE}/release" || exit
+          zip -r "${GITHUB_WORKSPACE}/plausible-analytics.zip" .
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{github.workspace}}/plausible-analytics.zip
+          asset_name: ${{ github.event.repository.name }}.zip
+          asset_content_type: application/zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..6527c3b
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,46 @@
+name: Deploy to WordPress.org
+
+on:
+  release:
+    types: [ released ]
+
+jobs:
+  tag:
+    name: New release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install composer dependencies
+        uses: php-actions/composer@v2
+        with:
+          dev: no
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: Install npm dependencies
+        run: |
+          npm ci
+          sudo npm run build
+      - name: WordPress Plugin Deploy
+        id: deploy
+        uses: 10up/action-wordpress-plugin-deploy@stable
+        with:
+          generate-zip: true
+        env:
+          SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+          SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+          SLUG: plausible-analytics
+
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{github.workspace}}/plausible-analytics.zip
+          asset_name: ${{ github.event.repository.name }}.zip
+          asset_content_type: application/zip

From 87f38d230abfbd019bca478aed233d7b93b60087 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:36:39 +0530
Subject: [PATCH 20/25] add .distignore

---
 .distignore | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .distignore

diff --git a/.distignore b/.distignore
new file mode 100644
index 0000000..e2c27f8
--- /dev/null
+++ b/.distignore
@@ -0,0 +1,54 @@
+/.git
+/.wordpress-org
+.gitignore
+.gitattributes
+
+/.idea
+/.github
+/.storybook
+
+/tests
+/node_modules
+/assets/src
+/vendor/bin
+/vendor/composer/installers
+/wp-org-assets
+
+.scrutinizer.yml
+.travis.yml
+.editorconfig
+.babelrc
+.jscrsrc
+.jshintrc
+.eslintignore
+.eslintrc
+.eslintrc.json
+.prettierrc.json
+.prettierignore
+.stylelintrc.json
+.huskyrc.json
+.lintstagedrc.json
+.distignore
+.stylelintignore
+
+sample-data/wordpress.sql
+sample-data/sample-data.numbers
+bower.json
+composer.json
+composer.lock
+package.json
+package-lock.json
+phpunit.xml
+phpunit.xml.dist
+CHANGELOG.md
+README.md
+readme.md
+phpcs.ruleset.xml
+phpcs.xml.dist
+CONTRIBUTING.md
+CODE_OF_CONDUCT.md
+contributing.md
+postcss.config.js
+webpack.config.js
+docker-compose.yml
+wp-textdomain.js

From 3f772f86a35e8d728cb3c001648631d37b78bb65 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:38:07 +0530
Subject: [PATCH 21/25] update composer json and its lock file

---
 composer.json |   6 +-
 composer.lock | 158 +++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 153 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index f7fab3b..2e458ae 100644
--- a/composer.json
+++ b/composer.json
@@ -11,11 +11,11 @@
             "email": "hello@mehulgohil.com"
         }
     ],
-    "require": {},
+    "require": {
+        "composer/installers": "*"
+    },
     "require-dev": {
-        "squizlabs/php_codesniffer": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "*",
-        "phpcompatibility/php-compatibility": "*",
         "phpcompatibility/phpcompatibility-wp": "*",
         "wp-coding-standards/wpcs": "*"
     },
diff --git a/composer.lock b/composer.lock
index 6724b2b..ac4ea84 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,169 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "59442429f0ddf027941c0452178582bf",
-    "packages": [],
+    "content-hash": "65037266568991e74a157b0df55af0fd",
+    "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
+                "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.6.* || 2.0.*@dev",
+                "composer/semver": "1.0.* || 2.0.*@dev",
+                "phpunit/phpunit": "^4.8.36",
+                "sebastian/comparator": "^1.2.4",
+                "symfony/process": "^2.3"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "MantisBT",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Thelia",
+                "Whmcs",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "known",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "sylius",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v1.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-04-07T06:57:05+00:00"
+        }
+    ],
     "packages-dev": [
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.7.0",
+            "version": "v0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "e8d808670b8f882188368faaf1144448c169c0b7"
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7",
-                "reference": "e8d808670b8f882188368faaf1144448c169c0b7",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c",
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c",
                 "shasum": ""
             },
             "require": {
                 "composer-plugin-api": "^1.0 || ^2.0",
                 "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev"
+                "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0"
             },
             "require-dev": {
                 "composer/composer": "*",
@@ -75,7 +217,7 @@
                 "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
                 "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
             },
-            "time": "2020-06-25T14:57:39+00:00"
+            "time": "2020-12-07T18:04:37+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",

From 168d42a3850f87a6a7470fcd2b73837f6bbd3c70 Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:40:17 +0530
Subject: [PATCH 22/25] update package and its lock file

---
 package-lock.json | 1436 +++++++++++++++++++++++++++++----------------
 package.json      |   24 +-
 2 files changed, 952 insertions(+), 508 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86dfd6b..3c01800 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "plausible-analytics",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -14,38 +14,90 @@
             }
         },
         "@babel/compat-data": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-            "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-            "dev": true,
-            "requires": {
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "semver": "^5.5.0"
-            }
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz",
+            "integrity": "sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==",
+            "dev": true
         },
         "@babel/core": {
-            "version": "7.11.6",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
-            "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
+            "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.10.4",
-                "@babel/generator": "^7.11.6",
-                "@babel/helper-module-transforms": "^7.11.0",
-                "@babel/helpers": "^7.10.4",
-                "@babel/parser": "^7.11.5",
-                "@babel/template": "^7.10.4",
-                "@babel/traverse": "^7.11.5",
-                "@babel/types": "^7.11.5",
+                "@babel/generator": "^7.12.10",
+                "@babel/helper-module-transforms": "^7.12.1",
+                "@babel/helpers": "^7.12.5",
+                "@babel/parser": "^7.12.10",
+                "@babel/template": "^7.12.7",
+                "@babel/traverse": "^7.12.10",
+                "@babel/types": "^7.12.10",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.1",
                 "json5": "^2.1.2",
                 "lodash": "^4.17.19",
-                "resolve": "^1.3.2",
                 "semver": "^5.4.1",
                 "source-map": "^0.5.0"
+            },
+            "dependencies": {
+                "@babel/generator": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
+                    "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.12.10",
+                        "jsesc": "^2.5.1",
+                        "source-map": "^0.5.0"
+                    }
+                },
+                "@babel/parser": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
+                    "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+                    "dev": true
+                },
+                "@babel/template": {
+                    "version": "7.12.7",
+                    "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
+                    "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/code-frame": "^7.10.4",
+                        "@babel/parser": "^7.12.7",
+                        "@babel/types": "^7.12.7"
+                    }
+                },
+                "@babel/traverse": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
+                    "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/code-frame": "^7.10.4",
+                        "@babel/generator": "^7.12.10",
+                        "@babel/helper-function-name": "^7.10.4",
+                        "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/parser": "^7.12.10",
+                        "@babel/types": "^7.12.10",
+                        "debug": "^4.1.0",
+                        "globals": "^11.1.0",
+                        "lodash": "^4.17.19"
+                    }
+                },
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/generator": {
@@ -60,12 +112,25 @@
             }
         },
         "@babel/helper-annotate-as-pure": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-            "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz",
+            "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.10"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -89,52 +154,62 @@
             }
         },
         "@babel/helper-builder-react-jsx-experimental": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz",
-            "integrity": "sha512-Vc4aPJnRZKWfzeCBsqTBnzulVNjABVdahSPhtdMD3Vs80ykx4a87jTHtF/VR+alSrDmNvat7l13yrRHauGcHVw==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz",
+            "integrity": "sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ==",
             "dev": true,
             "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-module-imports": "^7.10.4",
-                "@babel/types": "^7.11.5"
+                "@babel/helper-annotate-as-pure": "^7.12.10",
+                "@babel/helper-module-imports": "^7.12.5",
+                "@babel/types": "^7.12.10"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-compilation-targets": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-            "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+            "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.10.4",
-                "browserslist": "^4.12.0",
-                "invariant": "^2.2.4",
-                "levenary": "^1.1.1",
+                "@babel/compat-data": "^7.12.5",
+                "@babel/helper-validator-option": "^7.12.1",
+                "browserslist": "^4.14.5",
                 "semver": "^5.5.0"
             }
         },
         "@babel/helper-create-class-features-plugin": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-            "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
+            "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
-                "@babel/helper-member-expression-to-functions": "^7.10.5",
+                "@babel/helper-member-expression-to-functions": "^7.12.1",
                 "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.12.1",
                 "@babel/helper-split-export-declaration": "^7.10.4"
             }
         },
         "@babel/helper-create-regexp-features-plugin": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-            "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz",
+            "integrity": "sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
-                "@babel/helper-regex": "^7.10.4",
-                "regexpu-core": "^4.7.0"
+                "regexpu-core": "^4.7.1"
             }
         },
         "@babel/helper-define-map": {
@@ -149,12 +224,25 @@
             }
         },
         "@babel/helper-explode-assignable-expression": {
-            "version": "7.11.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-            "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz",
+            "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.1"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-function-name": {
@@ -187,45 +275,133 @@
             }
         },
         "@babel/helper-member-expression-to-functions": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-            "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz",
+            "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.11.0"
+                "@babel/types": "^7.12.7"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-module-imports": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-            "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+            "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.5"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-module-transforms": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-            "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+            "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
-                "@babel/helper-simple-access": "^7.10.4",
+                "@babel/helper-module-imports": "^7.12.1",
+                "@babel/helper-replace-supers": "^7.12.1",
+                "@babel/helper-simple-access": "^7.12.1",
                 "@babel/helper-split-export-declaration": "^7.11.0",
+                "@babel/helper-validator-identifier": "^7.10.4",
                 "@babel/template": "^7.10.4",
-                "@babel/types": "^7.11.0",
+                "@babel/traverse": "^7.12.1",
+                "@babel/types": "^7.12.1",
                 "lodash": "^4.17.19"
+            },
+            "dependencies": {
+                "@babel/generator": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
+                    "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.12.10",
+                        "jsesc": "^2.5.1",
+                        "source-map": "^0.5.0"
+                    }
+                },
+                "@babel/parser": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
+                    "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+                    "dev": true
+                },
+                "@babel/traverse": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
+                    "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/code-frame": "^7.10.4",
+                        "@babel/generator": "^7.12.10",
+                        "@babel/helper-function-name": "^7.10.4",
+                        "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/parser": "^7.12.10",
+                        "@babel/types": "^7.12.10",
+                        "debug": "^4.1.0",
+                        "globals": "^11.1.0",
+                        "lodash": "^4.17.19"
+                    }
+                },
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-optimise-call-expression": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-            "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz",
+            "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.10"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-plugin-utils": {
@@ -234,56 +410,131 @@
             "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
             "dev": true
         },
-        "@babel/helper-regex": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-            "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.17.19"
-            }
-        },
         "@babel/helper-remap-async-to-generator": {
-            "version": "7.11.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-            "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
+            "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-wrap-function": "^7.10.4",
-                "@babel/template": "^7.10.4",
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.1"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-replace-supers": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-            "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+            "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
             "dev": true,
             "requires": {
-                "@babel/helper-member-expression-to-functions": "^7.10.4",
+                "@babel/helper-member-expression-to-functions": "^7.12.1",
                 "@babel/helper-optimise-call-expression": "^7.10.4",
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
+                "@babel/traverse": "^7.12.5",
+                "@babel/types": "^7.12.5"
+            },
+            "dependencies": {
+                "@babel/generator": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
+                    "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.12.10",
+                        "jsesc": "^2.5.1",
+                        "source-map": "^0.5.0"
+                    }
+                },
+                "@babel/parser": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
+                    "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+                    "dev": true
+                },
+                "@babel/traverse": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
+                    "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/code-frame": "^7.10.4",
+                        "@babel/generator": "^7.12.10",
+                        "@babel/helper-function-name": "^7.10.4",
+                        "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/parser": "^7.12.10",
+                        "@babel/types": "^7.12.10",
+                        "debug": "^4.1.0",
+                        "globals": "^11.1.0",
+                        "lodash": "^4.17.19"
+                    }
+                },
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-simple-access": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-            "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+            "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
             "dev": true,
             "requires": {
-                "@babel/template": "^7.10.4",
-                "@babel/types": "^7.10.4"
+                "@babel/types": "^7.12.1"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-skip-transparent-expression-wrappers": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-            "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+            "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.11.0"
+                "@babel/types": "^7.12.1"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/helper-split-export-declaration": {
@@ -301,10 +552,16 @@
             "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
             "dev": true
         },
+        "@babel/helper-validator-option": {
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
+            "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==",
+            "dev": true
+        },
         "@babel/helper-wrap-function": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-            "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+            "version": "7.12.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+            "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
@@ -314,14 +571,61 @@
             }
         },
         "@babel/helpers": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-            "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
+            "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
             "dev": true,
             "requires": {
                 "@babel/template": "^7.10.4",
-                "@babel/traverse": "^7.10.4",
-                "@babel/types": "^7.10.4"
+                "@babel/traverse": "^7.12.5",
+                "@babel/types": "^7.12.5"
+            },
+            "dependencies": {
+                "@babel/generator": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.10.tgz",
+                    "integrity": "sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.12.10",
+                        "jsesc": "^2.5.1",
+                        "source-map": "^0.5.0"
+                    }
+                },
+                "@babel/parser": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.10.tgz",
+                    "integrity": "sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==",
+                    "dev": true
+                },
+                "@babel/traverse": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.10.tgz",
+                    "integrity": "sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/code-frame": "^7.10.4",
+                        "@babel/generator": "^7.12.10",
+                        "@babel/helper-function-name": "^7.10.4",
+                        "@babel/helper-split-export-declaration": "^7.11.0",
+                        "@babel/parser": "^7.12.10",
+                        "@babel/types": "^7.12.10",
+                        "debug": "^4.1.0",
+                        "globals": "^11.1.0",
+                        "lodash": "^4.17.19"
+                    }
+                },
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/highlight": {
@@ -342,30 +646,30 @@
             "dev": true
         },
         "@babel/plugin-proposal-async-generator-functions": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-            "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz",
+            "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4",
+                "@babel/helper-remap-async-to-generator": "^7.12.1",
                 "@babel/plugin-syntax-async-generators": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-class-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-            "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+            "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-create-class-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-dynamic-import": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-            "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
+            "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -373,9 +677,9 @@
             }
         },
         "@babel/plugin-proposal-export-namespace-from": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-            "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz",
+            "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -383,9 +687,9 @@
             }
         },
         "@babel/plugin-proposal-json-strings": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-            "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz",
+            "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -393,9 +697,9 @@
             }
         },
         "@babel/plugin-proposal-logical-assignment-operators": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-            "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz",
+            "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -403,9 +707,9 @@
             }
         },
         "@babel/plugin-proposal-nullish-coalescing-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-            "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz",
+            "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -413,9 +717,9 @@
             }
         },
         "@babel/plugin-proposal-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz",
+            "integrity": "sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -423,20 +727,20 @@
             }
         },
         "@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-            "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
+            "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-                "@babel/plugin-transform-parameters": "^7.10.4"
+                "@babel/plugin-transform-parameters": "^7.12.1"
             }
         },
         "@babel/plugin-proposal-optional-catch-binding": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-            "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
+            "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
@@ -444,33 +748,33 @@
             }
         },
         "@babel/plugin-proposal-optional-chaining": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-            "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz",
+            "integrity": "sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.0"
             }
         },
         "@babel/plugin-proposal-private-methods": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-            "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
+            "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.10.4",
+                "@babel/helper-create-class-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-proposal-unicode-property-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-            "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
+            "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
@@ -484,9 +788,9 @@
             }
         },
         "@babel/plugin-syntax-class-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-            "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz",
+            "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
@@ -520,9 +824,9 @@
             }
         },
         "@babel/plugin-syntax-jsx": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
-            "integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
+            "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
@@ -583,56 +887,56 @@
             }
         },
         "@babel/plugin-syntax-top-level-await": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-            "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz",
+            "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-arrow-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-            "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz",
+            "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-async-to-generator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-            "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+            "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-module-imports": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-remap-async-to-generator": "^7.10.4"
+                "@babel/helper-remap-async-to-generator": "^7.12.1"
             }
         },
         "@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-            "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz",
+            "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-block-scoping": {
-            "version": "7.11.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-            "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz",
+            "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-classes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-            "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz",
+            "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==",
             "dev": true,
             "requires": {
                 "@babel/helper-annotate-as-pure": "^7.10.4",
@@ -640,52 +944,52 @@
                 "@babel/helper-function-name": "^7.10.4",
                 "@babel/helper-optimise-call-expression": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4",
+                "@babel/helper-replace-supers": "^7.12.1",
                 "@babel/helper-split-export-declaration": "^7.10.4",
                 "globals": "^11.1.0"
             }
         },
         "@babel/plugin-transform-computed-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-            "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
+            "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-destructuring": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-            "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz",
+            "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-dotall-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-            "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz",
+            "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-duplicate-keys": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-            "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz",
+            "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-exponentiation-operator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-            "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz",
+            "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==",
             "dev": true,
             "requires": {
                 "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
@@ -693,18 +997,18 @@
             }
         },
         "@babel/plugin-transform-for-of": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-            "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz",
+            "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-function-name": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-            "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz",
+            "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==",
             "dev": true,
             "requires": {
                 "@babel/helper-function-name": "^7.10.4",
@@ -712,228 +1016,225 @@
             }
         },
         "@babel/plugin-transform-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-            "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
+            "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-member-expression-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-            "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz",
+            "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-modules-amd": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-            "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
+            "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-            "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz",
+            "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-simple-access": "^7.10.4",
+                "@babel/helper-simple-access": "^7.12.1",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-systemjs": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-            "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz",
+            "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-hoist-variables": "^7.10.4",
-                "@babel/helper-module-transforms": "^7.10.5",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4",
+                "@babel/helper-validator-identifier": "^7.10.4",
                 "babel-plugin-dynamic-import-node": "^2.3.3"
             }
         },
         "@babel/plugin-transform-modules-umd": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-            "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz",
+            "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-transforms": "^7.10.4",
+                "@babel/helper-module-transforms": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-named-capturing-groups-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-            "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz",
+            "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1"
             }
         },
         "@babel/plugin-transform-new-target": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-            "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
+            "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-object-super": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-            "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz",
+            "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-replace-supers": "^7.10.4"
+                "@babel/helper-replace-supers": "^7.12.1"
             }
         },
         "@babel/plugin-transform-parameters": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-            "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+            "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
             "dev": true,
             "requires": {
-                "@babel/helper-get-function-arity": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-property-literals": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-            "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz",
+            "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-react-jsx": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz",
-            "integrity": "sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz",
+            "integrity": "sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw==",
             "dev": true,
             "requires": {
                 "@babel/helper-builder-react-jsx": "^7.10.4",
-                "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
+                "@babel/helper-builder-react-jsx-experimental": "^7.12.10",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-syntax-jsx": "^7.10.4"
+                "@babel/plugin-syntax-jsx": "^7.12.1"
             }
         },
         "@babel/plugin-transform-regenerator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-            "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+            "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
             "dev": true,
             "requires": {
                 "regenerator-transform": "^0.14.2"
             }
         },
         "@babel/plugin-transform-reserved-words": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-            "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
+            "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-runtime": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz",
-            "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
+            "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/helper-module-imports": "^7.12.5",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "resolve": "^1.8.1",
                 "semver": "^5.5.1"
             }
         },
         "@babel/plugin-transform-shorthand-properties": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-            "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
+            "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-spread": {
-            "version": "7.11.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-            "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz",
+            "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
             }
         },
         "@babel/plugin-transform-sticky-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-            "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+            "version": "7.12.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz",
+            "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==",
             "dev": true,
             "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/helper-regex": "^7.10.4"
+                "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-template-literals": {
-            "version": "7.10.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-            "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz",
+            "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==",
             "dev": true,
             "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.4",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-typeof-symbol": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-            "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz",
+            "integrity": "sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-unicode-escapes": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-            "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz",
+            "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==",
             "dev": true,
             "requires": {
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/plugin-transform-unicode-regex": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-            "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
+            "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==",
             "dev": true,
             "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+                "@babel/helper-create-regexp-features-plugin": "^7.12.1",
                 "@babel/helper-plugin-utils": "^7.10.4"
             }
         },
         "@babel/polyfill": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz",
-            "integrity": "sha512-FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g==",
+            "version": "7.12.1",
+            "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
+            "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
             "dev": true,
             "requires": {
                 "core-js": "^2.6.5",
@@ -941,30 +1242,31 @@
             }
         },
         "@babel/preset-env": {
-            "version": "7.11.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
-            "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
+            "version": "7.12.10",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.10.tgz",
+            "integrity": "sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.11.0",
-                "@babel/helper-compilation-targets": "^7.10.4",
-                "@babel/helper-module-imports": "^7.10.4",
+                "@babel/compat-data": "^7.12.7",
+                "@babel/helper-compilation-targets": "^7.12.5",
+                "@babel/helper-module-imports": "^7.12.5",
                 "@babel/helper-plugin-utils": "^7.10.4",
-                "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-                "@babel/plugin-proposal-class-properties": "^7.10.4",
-                "@babel/plugin-proposal-dynamic-import": "^7.10.4",
-                "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-                "@babel/plugin-proposal-json-strings": "^7.10.4",
-                "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-                "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-                "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-                "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-                "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-                "@babel/plugin-proposal-private-methods": "^7.10.4",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+                "@babel/helper-validator-option": "^7.12.1",
+                "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+                "@babel/plugin-proposal-class-properties": "^7.12.1",
+                "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+                "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+                "@babel/plugin-proposal-json-strings": "^7.12.1",
+                "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+                "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+                "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+                "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+                "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+                "@babel/plugin-proposal-private-methods": "^7.12.1",
+                "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
                 "@babel/plugin-syntax-async-generators": "^7.8.0",
-                "@babel/plugin-syntax-class-properties": "^7.10.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.1",
                 "@babel/plugin-syntax-dynamic-import": "^7.8.0",
                 "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
                 "@babel/plugin-syntax-json-strings": "^7.8.0",
@@ -974,46 +1276,56 @@
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
                 "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-                "@babel/plugin-syntax-top-level-await": "^7.10.4",
-                "@babel/plugin-transform-arrow-functions": "^7.10.4",
-                "@babel/plugin-transform-async-to-generator": "^7.10.4",
-                "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-                "@babel/plugin-transform-block-scoping": "^7.10.4",
-                "@babel/plugin-transform-classes": "^7.10.4",
-                "@babel/plugin-transform-computed-properties": "^7.10.4",
-                "@babel/plugin-transform-destructuring": "^7.10.4",
-                "@babel/plugin-transform-dotall-regex": "^7.10.4",
-                "@babel/plugin-transform-duplicate-keys": "^7.10.4",
-                "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-                "@babel/plugin-transform-for-of": "^7.10.4",
-                "@babel/plugin-transform-function-name": "^7.10.4",
-                "@babel/plugin-transform-literals": "^7.10.4",
-                "@babel/plugin-transform-member-expression-literals": "^7.10.4",
-                "@babel/plugin-transform-modules-amd": "^7.10.4",
-                "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-                "@babel/plugin-transform-modules-systemjs": "^7.10.4",
-                "@babel/plugin-transform-modules-umd": "^7.10.4",
-                "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-                "@babel/plugin-transform-new-target": "^7.10.4",
-                "@babel/plugin-transform-object-super": "^7.10.4",
-                "@babel/plugin-transform-parameters": "^7.10.4",
-                "@babel/plugin-transform-property-literals": "^7.10.4",
-                "@babel/plugin-transform-regenerator": "^7.10.4",
-                "@babel/plugin-transform-reserved-words": "^7.10.4",
-                "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-                "@babel/plugin-transform-spread": "^7.11.0",
-                "@babel/plugin-transform-sticky-regex": "^7.10.4",
-                "@babel/plugin-transform-template-literals": "^7.10.4",
-                "@babel/plugin-transform-typeof-symbol": "^7.10.4",
-                "@babel/plugin-transform-unicode-escapes": "^7.10.4",
-                "@babel/plugin-transform-unicode-regex": "^7.10.4",
+                "@babel/plugin-syntax-top-level-await": "^7.12.1",
+                "@babel/plugin-transform-arrow-functions": "^7.12.1",
+                "@babel/plugin-transform-async-to-generator": "^7.12.1",
+                "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+                "@babel/plugin-transform-block-scoping": "^7.12.1",
+                "@babel/plugin-transform-classes": "^7.12.1",
+                "@babel/plugin-transform-computed-properties": "^7.12.1",
+                "@babel/plugin-transform-destructuring": "^7.12.1",
+                "@babel/plugin-transform-dotall-regex": "^7.12.1",
+                "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+                "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+                "@babel/plugin-transform-for-of": "^7.12.1",
+                "@babel/plugin-transform-function-name": "^7.12.1",
+                "@babel/plugin-transform-literals": "^7.12.1",
+                "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+                "@babel/plugin-transform-modules-amd": "^7.12.1",
+                "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+                "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+                "@babel/plugin-transform-modules-umd": "^7.12.1",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+                "@babel/plugin-transform-new-target": "^7.12.1",
+                "@babel/plugin-transform-object-super": "^7.12.1",
+                "@babel/plugin-transform-parameters": "^7.12.1",
+                "@babel/plugin-transform-property-literals": "^7.12.1",
+                "@babel/plugin-transform-regenerator": "^7.12.1",
+                "@babel/plugin-transform-reserved-words": "^7.12.1",
+                "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+                "@babel/plugin-transform-spread": "^7.12.1",
+                "@babel/plugin-transform-sticky-regex": "^7.12.7",
+                "@babel/plugin-transform-template-literals": "^7.12.1",
+                "@babel/plugin-transform-typeof-symbol": "^7.12.10",
+                "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+                "@babel/plugin-transform-unicode-regex": "^7.12.1",
                 "@babel/preset-modules": "^0.1.3",
-                "@babel/types": "^7.11.5",
-                "browserslist": "^4.12.0",
-                "core-js-compat": "^3.6.2",
-                "invariant": "^2.2.2",
-                "levenary": "^1.1.1",
+                "@babel/types": "^7.12.10",
+                "core-js-compat": "^3.8.0",
                 "semver": "^5.5.0"
+            },
+            "dependencies": {
+                "@babel/types": {
+                    "version": "7.12.10",
+                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.10.tgz",
+                    "integrity": "sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/helper-validator-identifier": "^7.10.4",
+                        "lodash": "^4.17.19",
+                        "to-fast-properties": "^2.0.0"
+                    }
+                }
             }
         },
         "@babel/preset-modules": {
@@ -1030,9 +1342,9 @@
             }
         },
         "@babel/runtime": {
-            "version": "7.11.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-            "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+            "version": "7.12.5",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+            "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
             "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
@@ -1234,12 +1546,6 @@
             "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
             "dev": true
         },
-        "@types/color-name": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-            "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-            "dev": true
-        },
         "@types/glob": {
             "version": "7.1.3",
             "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -1798,31 +2104,34 @@
             "dev": true
         },
         "array-includes": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-            "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz",
+            "integrity": "sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0",
+                "es-abstract": "^1.18.0-next.1",
+                "get-intrinsic": "^1.0.1",
                 "is-string": "^1.0.5"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -1851,31 +2160,33 @@
             "dev": true
         },
         "array.prototype.flatmap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz",
-            "integrity": "sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz",
+            "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0-next.1",
+                "es-abstract": "^1.18.0-next.1",
                 "function-bind": "^1.1.1"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -2044,16 +2355,86 @@
             }
         },
         "babel-loader": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-            "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+            "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": "^2.1.0",
+                "find-cache-dir": "^3.3.1",
                 "loader-utils": "^1.4.0",
-                "mkdirp": "^0.5.3",
-                "pify": "^4.0.1",
+                "make-dir": "^3.1.0",
                 "schema-utils": "^2.6.5"
+            },
+            "dependencies": {
+                "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": "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"
+                    }
+                },
+                "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"
+                    }
+                },
+                "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"
+                    }
+                },
+                "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
+                },
+                "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"
+                    }
+                },
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                }
             }
         },
         "babel-plugin-dynamic-import-node": {
@@ -2744,6 +3125,16 @@
                 }
             }
         },
+        "call-bind": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+            "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.0"
+            }
+        },
         "call-me-maybe": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -3477,15 +3868,52 @@
             "dev": true
         },
         "core-js-compat": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-            "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+            "version": "3.8.1",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz",
+            "integrity": "sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==",
             "dev": true,
             "requires": {
-                "browserslist": "^4.8.5",
+                "browserslist": "^4.15.0",
                 "semver": "7.0.0"
             },
             "dependencies": {
+                "browserslist": {
+                    "version": "4.16.0",
+                    "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz",
+                    "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==",
+                    "dev": true,
+                    "requires": {
+                        "caniuse-lite": "^1.0.30001165",
+                        "colorette": "^1.2.1",
+                        "electron-to-chromium": "^1.3.621",
+                        "escalade": "^3.1.1",
+                        "node-releases": "^1.1.67"
+                    }
+                },
+                "caniuse-lite": {
+                    "version": "1.0.30001165",
+                    "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
+                    "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==",
+                    "dev": true
+                },
+                "electron-to-chromium": {
+                    "version": "1.3.625",
+                    "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.625.tgz",
+                    "integrity": "sha512-CsLk/r0C9dAzVPa9QF74HIXduxaucsaRfqiOYvIv2PRhvyC6EOqc/KbpgToQuDVgPf3sNAFZi3iBu4vpGOwGag==",
+                    "dev": true
+                },
+                "escalade": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+                    "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+                    "dev": true
+                },
+                "node-releases": {
+                    "version": "1.1.67",
+                    "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz",
+                    "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==",
+                    "dev": true
+                },
                 "semver": {
                     "version": "7.0.0",
                     "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
@@ -4654,21 +5082,21 @@
             "dev": true
         },
         "eslint-plugin-react": {
-            "version": "7.21.2",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.2.tgz",
-            "integrity": "sha512-j3XKvrK3rpBzveKFbgAeGsWb9uz6iUOrR0jixRfjwdFeGSRsXvVTFtHDQYCjsd1/6Z/xvb8Vy3LiI5Reo7fDrg==",
+            "version": "7.21.5",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz",
+            "integrity": "sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g==",
             "dev": true,
             "requires": {
                 "array-includes": "^3.1.1",
                 "array.prototype.flatmap": "^1.2.3",
                 "doctrine": "^2.1.0",
                 "has": "^1.0.3",
-                "jsx-ast-utils": "^2.4.1",
+                "jsx-ast-utils": "^2.4.1 || ^3.0.0",
                 "object.entries": "^1.1.2",
                 "object.fromentries": "^2.0.2",
                 "object.values": "^1.1.1",
                 "prop-types": "^15.7.2",
-                "resolve": "^1.17.0",
+                "resolve": "^1.18.1",
                 "string.prototype.matchall": "^4.0.2"
             },
             "dependencies": {
@@ -4680,6 +5108,16 @@
                     "requires": {
                         "esutils": "^2.0.2"
                     }
+                },
+                "resolve": {
+                    "version": "1.19.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+                    "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+                    "dev": true,
+                    "requires": {
+                        "is-core-module": "^2.1.0",
+                        "path-parse": "^1.0.6"
+                    }
                 }
             }
         },
@@ -5468,9 +5906,9 @@
             }
         },
         "gensync": {
-            "version": "1.0.0-beta.1",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-            "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
             "dev": true
         },
         "get-caller-file": {
@@ -5479,6 +5917,17 @@
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true
         },
+        "get-intrinsic": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+            "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1"
+            }
+        },
         "get-own-enumerable-property-symbols": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
@@ -5972,9 +6421,9 @@
             "dev": true
         },
         "husky": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz",
-            "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==",
+            "version": "4.3.5",
+            "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.5.tgz",
+            "integrity": "sha512-E5S/1HMoDDaqsH8kDF5zeKEQbYqe3wL9zJDyqyYqc8I4vHBtAoxkDBGXox0lZ9RI+k5GyB728vZdmnM4bYap+g==",
             "dev": true,
             "requires": {
                 "chalk": "^4.0.0",
@@ -5990,12 +6439,11 @@
             },
             "dependencies": {
                 "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
                     "dev": true,
                     "requires": {
-                        "@types/color-name": "^1.1.1",
                         "color-convert": "^2.0.1"
                     }
                 },
@@ -6054,9 +6502,9 @@
                     "dev": true
                 },
                 "import-fresh": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-                    "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+                    "version": "3.2.2",
+                    "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz",
+                    "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
                     "dev": true,
                     "requires": {
                         "parent-module": "^1.0.0",
@@ -6430,9 +6878,9 @@
             "dev": true
         },
         "ini": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
             "dev": true
         },
         "inquirer": {
@@ -6485,20 +6933,20 @@
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.17.7",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -6521,15 +6969,6 @@
                 "p-is-promise": "^1.1.0"
             }
         },
-        "invariant": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-            "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-            "dev": true,
-            "requires": {
-                "loose-envify": "^1.0.0"
-            }
-        },
         "is-absolute-url": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
@@ -6620,6 +7059,15 @@
                 "rgba-regex": "^1.0.0"
             }
         },
+        "is-core-module": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+            "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+            "dev": true,
+            "requires": {
+                "has": "^1.0.3"
+            }
+        },
         "is-data-descriptor": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -7059,13 +7507,13 @@
             }
         },
         "jsx-ast-utils": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz",
-            "integrity": "sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz",
+            "integrity": "sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==",
             "dev": true,
             "requires": {
                 "array-includes": "^3.1.1",
-                "object.assign": "^4.1.0"
+                "object.assign": "^4.1.1"
             }
         },
         "keyv": {
@@ -7105,15 +7553,6 @@
             "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
             "dev": true
         },
-        "levenary": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-            "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-            "dev": true,
-            "requires": {
-                "leven": "^3.1.0"
-            }
-        },
         "levn": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -7694,9 +8133,9 @@
             "dev": true
         },
         "matched": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/matched/-/matched-5.0.0.tgz",
-            "integrity": "sha512-O0LCuxYYBNBjP2dmAg0i6PME0Mb0dvjulpMC0tTIeMRh6kXYsugOT5GOWpFkSzqjQjgOUs/eiyvpVhXdN2La4g==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/matched/-/matched-5.0.1.tgz",
+            "integrity": "sha512-E1fhSTPRyhAlNaNvGXAgZQlq1hL0bgYMTk/6bktVlIhzUnX/SZs7296ACdVeNJE8xFNGSuvd9IpI7vSnmcqLvw==",
             "dev": true,
             "requires": {
                 "glob": "^7.1.6",
@@ -8386,31 +8825,33 @@
             }
         },
         "object.entries": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-            "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz",
+            "integrity": "sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.5",
+                "es-abstract": "^1.18.0-next.1",
                 "has": "^1.0.3"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -8418,32 +8859,33 @@
             }
         },
         "object.fromentries": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-            "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.3.tgz",
+            "integrity": "sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0-next.1",
-                "function-bind": "^1.1.1",
+                "es-abstract": "^1.18.0-next.1",
                 "has": "^1.0.3"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -10021,9 +10463,9 @@
             }
         },
         "regenerate": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-            "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+            "version": "1.4.2",
+            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
             "dev": true
         },
         "regenerate-unicode-properties": {
@@ -10071,20 +10513,20 @@
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.17.7",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+                    "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -11141,34 +11583,36 @@
             }
         },
         "string.prototype.matchall": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz",
-            "integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz",
+            "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==",
             "dev": true,
             "requires": {
+                "call-bind": "^1.0.0",
                 "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0",
+                "es-abstract": "^1.18.0-next.1",
                 "has-symbols": "^1.0.1",
                 "internal-slot": "^1.0.2",
                 "regexp.prototype.flags": "^1.3.0",
-                "side-channel": "^1.0.2"
+                "side-channel": "^1.0.3"
             },
             "dependencies": {
                 "es-abstract": {
-                    "version": "1.17.6",
-                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-                    "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+                    "version": "1.18.0-next.1",
+                    "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+                    "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
                     "dev": true,
                     "requires": {
                         "es-to-primitive": "^1.2.1",
                         "function-bind": "^1.1.1",
                         "has": "^1.0.3",
                         "has-symbols": "^1.0.1",
-                        "is-callable": "^1.2.0",
-                        "is-regex": "^1.1.0",
-                        "object-inspect": "^1.7.0",
+                        "is-callable": "^1.2.2",
+                        "is-negative-zero": "^2.0.0",
+                        "is-regex": "^1.1.1",
+                        "object-inspect": "^1.8.0",
                         "object-keys": "^1.1.1",
-                        "object.assign": "^4.1.0",
+                        "object.assign": "^4.1.1",
                         "string.prototype.trimend": "^1.0.1",
                         "string.prototype.trimstart": "^1.0.1"
                     }
@@ -11341,13 +11785,13 @@
             }
         },
         "style-loader": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
-            "integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
+            "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
             "dev": true,
             "requires": {
                 "loader-utils": "^2.0.0",
-                "schema-utils": "^2.6.6"
+                "schema-utils": "^2.7.0"
             },
             "dependencies": {
                 "loader-utils": {
@@ -13143,9 +13587,9 @@
             }
         },
         "wp-pot": {
-            "version": "1.9.6",
-            "resolved": "https://registry.npmjs.org/wp-pot/-/wp-pot-1.9.6.tgz",
-            "integrity": "sha512-nNhn4vzJ/hg7j3lbG8NGzFyzDfbsmw1HE2Qoy8qw+esAZwgt6kibkelc/p0FduZd1VziVQ0kT0PM/AoZMLoyig==",
+            "version": "1.9.8",
+            "resolved": "https://registry.npmjs.org/wp-pot/-/wp-pot-1.9.8.tgz",
+            "integrity": "sha512-F861Rx872AW57paoX9Pi8yQA9GW4grw/g7Koe//LSL2G1W0z3T+M/xMSFd2e//vWv2DAsoeiIkNpztpWhLxkTg==",
             "dev": true,
             "requires": {
                 "matched": "^5.0.0",
@@ -13154,9 +13598,9 @@
             },
             "dependencies": {
                 "php-parser": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.0.1.tgz",
-                    "integrity": "sha512-m6CBPHOoMkzEHoXG0rhEg/VegSNemUNQepHnYtrRgTAh8rsqoO65KqQ32KJ5xe2iplhO0jdwd1UJ9Ea0yHsgYQ==",
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.0.2.tgz",
+                    "integrity": "sha512-a7y1+odEGsceLDLpu7oNyspZ0pK8FMWJOoim4/yd82AtnEZNLdCLZ67arnOQZ9K0lHJiSp4/7lVUpGELVxE14w==",
                     "dev": true
                 }
             }
diff --git a/package.json b/package.json
index 99cd5da..c1fc152 100644
--- a/package.json
+++ b/package.json
@@ -28,17 +28,17 @@
     },
     "homepage": "https://github.com/mehul0810/plausible-analytics-wp#readme",
     "devDependencies": {
-        "@babel/core": "^7.4.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@babel/plugin-transform-react-jsx": "^7.2.0",
-        "@babel/plugin-transform-runtime": "^7.4.0",
-        "@babel/polyfill": "^7.4.0",
-        "@babel/preset-env": "^7.4.2",
-        "@babel/runtime": "^7.4.2",
+        "@babel/core": "^7.12.10",
+        "@babel/plugin-syntax-jsx": "^7.12.1",
+        "@babel/plugin-transform-react-jsx": "^7.12.10",
+        "@babel/plugin-transform-runtime": "^7.12.10",
+        "@babel/polyfill": "^7.12.1",
+        "@babel/preset-env": "^7.12.10",
+        "@babel/runtime": "^7.12.5",
         "@prettier/plugin-php": "^0.12.0",
         "autoprefixer": "^9.5.0",
         "babel-eslint": "^10.0.3",
-        "babel-loader": "^8.0.5",
+        "babel-loader": "^8.2.2",
         "clean-webpack-plugin": "^1.0.0",
         "copy-webpack-plugin": "^4.6.0",
         "cross-env": "^5.2.0",
@@ -47,10 +47,10 @@
         "cssnano-preset-advanced": "^4.0.6",
         "eslint": "^5.15.3",
         "eslint-config-wordpress": "^2.0.0",
-        "eslint-plugin-react": "^7.12.3",
+        "eslint-plugin-react": "^7.21.5",
         "expose-loader": "^0.7.5",
         "file-loader": "^3.0.1",
-        "husky": "^4.0.7",
+        "husky": "^4.3.5",
         "imagemin-webpack-plugin": "^2.4.0",
         "lint-staged": "^9.5.0",
         "mini-css-extract-plugin": "^0.5.0",
@@ -59,7 +59,7 @@
         "prettier": "^1.19.1",
         "sass-loader": "^7.1.0",
         "script-loader": "^0.7.2",
-        "style-loader": "^1.1.2",
+        "style-loader": "^1.3.0",
         "stylelint": "^11.1.1",
         "stylelint-config-prettier": "^8.0.0",
         "stylelint-config-wordpress": "^13.1.0",
@@ -69,7 +69,7 @@
         "webpack": "^4.28.4",
         "webpack-cli": "^3.3.0",
         "webpack-rtl-plugin": "^2.0.0",
-        "wp-pot": "^1.7.0",
+        "wp-pot": "^1.9.8",
         "wp-textdomain": "^1.0.1"
     },
     "dependencies": {}

From fa566ab6acae23d3b4d15f50f7d10b885da263dd Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:40:29 +0530
Subject: [PATCH 23/25] update language pot file for 1.1.0

---
 languages/plausible-analytics.pot | 58 +++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/languages/plausible-analytics.pot b/languages/plausible-analytics.pot
index d993176..d7c1f76 100644
--- a/languages/plausible-analytics.pot
+++ b/languages/plausible-analytics.pot
@@ -28,7 +28,7 @@ msgstr ""
 msgid "Thanks :)"
 msgstr ""
 
-#: src/Admin/Filters.php:71, src/Admin/Settings.php:70
+#: src/Admin/Filters.php:71, src/Admin/Settings.php:71
 msgid "Settings"
 msgstr ""
 
@@ -36,74 +36,94 @@ msgstr ""
 msgid "Support"
 msgstr ""
 
-#: src/Admin/Settings.php:44, src/Admin/Settings.php:45, src/Admin/Settings.php:67
+#: src/Admin/Settings.php:44, src/Admin/Settings.php:45, src/Admin/Settings.php:68
 msgid "Plausible Analytics"
 msgstr ""
 
-#: src/Admin/Settings.php:74
+#: src/Admin/Settings.php:75
 msgid "Report a bug"
 msgstr ""
 
-#: src/Admin/Settings.php:77
+#: src/Admin/Settings.php:78
 msgid "Documentation"
 msgstr ""
 
-#: src/Admin/Settings.php:86
-msgid "Domain Name"
+#: src/Admin/Settings.php:88
+msgid "General"
 msgstr ""
 
 #: src/Admin/Settings.php:93
+msgid "Self Hosted"
+msgstr ""
+
+#: src/Admin/Settings.php:102
+msgid "Domain Name"
+msgstr ""
+
+#: src/Admin/Settings.php:109
 msgid "Open Analytics"
 msgstr ""
 
-#: src/Admin/Settings.php:101
+#: src/Admin/Settings.php:117
 msgid "We have fetched the domain name for which Plausible Analytics will be used. We assume that you have already setup the domain on our website."
 msgstr ""
 
-#: src/Admin/Settings.php:103
+#: src/Admin/Settings.php:119
 msgid "Follow these instructions"
 msgstr ""
 
-#: src/Admin/Settings.php:104
+#: src/Admin/Settings.php:120
 msgid "to add your site to Plausible."
 msgstr ""
 
-#: src/Admin/Settings.php:112
+#: src/Admin/Settings.php:128
 msgid "Custom Domain"
 msgstr ""
 
-#: src/Admin/Settings.php:124
+#: src/Admin/Settings.php:140
 msgid "Enable the custom domain functionality in your Plausible account."
 msgstr ""
 
-#: src/Admin/Settings.php:126
+#: src/Admin/Settings.php:142
 msgid "See how &raquo;"
 msgstr ""
 
-#: src/Admin/Settings.php:127
+#: src/Admin/Settings.php:143
 msgid "Enable this setting and configure it to link with Plausible Analytics on your custom domain."
 msgstr ""
 
-#: src/Admin/Settings.php:128
+#: src/Admin/Settings.php:144
 msgid "For example,"
 msgstr ""
 
-#: src/Admin/Settings.php:130
+#: src/Admin/Settings.php:146
 msgid "or"
 msgstr ""
 
-#: src/Admin/Settings.php:140
+#: src/Admin/Settings.php:156
 msgid "Track analytics for administrator"
 msgstr ""
 
-#: src/Admin/Settings.php:145
+#: src/Admin/Settings.php:161
 msgid "By default, we won't be tracking analytics for administrator. If you want to track analytics for administrator then please enable this setting."
 msgstr ""
 
-#: src/Admin/Settings.php:153, src/Admin/Settings.php:156
+#: src/Admin/Settings.php:170
+msgid "Self-hosted Plausible?"
+msgstr ""
+
+#: src/Admin/Settings.php:181
+msgid "If you're self-hosting Plausible on your own infrastructure, enter the domain name where you installed it to enable the integration with your self-hosted instance. Learn more"
+msgstr ""
+
+#: src/Admin/Settings.php:183
+msgid "about Plausible Self-Hosted."
+msgstr ""
+
+#: src/Admin/Settings.php:195, src/Admin/Settings.php:198
 msgid "Save Changes"
 msgstr ""
 
-#: src/Admin/Settings.php:154
+#: src/Admin/Settings.php:196
 msgid "Saved!"
 msgstr ""

From b2c599c6ed33153a1306bef1a1e1863ff82361ab Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:45:53 +0530
Subject: [PATCH 24/25] change in asset name for prerelease

---
 .github/workflows/prerelease.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index d0dcbe6..428d98e 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: ${{github.workspace}}/plausible-analytics.zip
-          asset_name: ${{ github.event.repository.name }}.zip
+          asset_name: plausible-analytics.zip
           asset_content_type: application/zip

From 288eae5d51ad1f5cfd1ec297a830f7a17f995dbe Mon Sep 17 00:00:00 2001
From: Mehul Gohil <mehul.gohil0810@gmail.com>
Date: Sun, 13 Dec 2020 01:48:55 +0530
Subject: [PATCH 25/25] improve release.yml same as prerelease.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6527c3b..7f7c209 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,5 +42,5 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: ${{github.workspace}}/plausible-analytics.zip
-          asset_name: ${{ github.event.repository.name }}.zip
+          asset_name: plausible-analytics.zip
           asset_content_type: application/zip