From f4a33e09f4f04a002c8346560b3197255750b321 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 14:50:21 +0200
Subject: [PATCH 01/24] Add skip-link to FSE themes

---
 lib/class-wp-theme-json.php         | 33 ++++++++++++-
 lib/full-site-editing/templates.php | 76 +++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index 956b04984dd8cb..ae8a39f0d5519f 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -166,6 +166,9 @@ class WP_Theme_JSON {
 			),
 			'custom'     => null,
 		),
+		'skipLink'        => array(
+			'target' => null,
+		),
 	);
 
 	/**
@@ -404,7 +407,6 @@ public function __construct( $theme_json = array() ) {
 				unset( $this->theme_json[ $subtree ] );
 			}
 		}
-
 	}
 
 	/**
@@ -1068,6 +1070,35 @@ public function get_custom_templates() {
 		}
 	}
 
+	/**
+	 * Return the skip-link selectors of the current theme.
+	 *
+	 * @return array
+	 */
+	public function get_skip_link_selectors() {
+		if ( isset( $this->theme_json['skipLink']['auto'] ) && false === $this->theme_json['skipLink']['auto'] ) {
+			return;
+		}
+
+		$fallbacks = array(
+			'#skip-link-target',
+			'main',
+			'.wp-block-post-title',
+			'.wp-block-query-loop',
+			'.wp-block-post-content',
+			'.entry-content',
+			'h1',
+			'h2',
+		);
+
+		$selectors = array();
+		if ( isset( $this->theme_json['skipLink']['target'] ) ) {
+			$selectors = (array) $this->theme_json['skipLink']['target'];
+		}
+
+		return array_unique( array_merge( $selectors, $fallbacks ) );
+	}
+
 	/**
 	 * Returns the stylesheet that results of processing
 	 * the theme.json structure this object represents.
diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 6362d7716c3c1c..628627c250ee2b 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -192,3 +192,79 @@ function set_unique_slug_on_create_template( $post_id ) {
 	}
 }
 add_action( 'save_post_wp_template', 'set_unique_slug_on_create_template' );
+
+/**
+ * Inject the skip-link.
+ */
+function gutenberg_inject_skip_link() {
+	global $template_html;
+
+	// Get the selectors.
+	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
+
+	// Early exit if we don't have anything to check.
+	if ( ! $template_html ) {
+		return;
+	}
+
+	foreach ( $selectors as $selector ) {
+		if ( 0 === strpos( $selector, '#' ) ) {
+			$selector_no_hash = str_replace( '#', '', $selector );
+			if ( strpos( $template_html, 'id="' . $selector_no_hash . '"' ) || strpos( $template_html, "id='$selector_no_hash'" ) ) {
+				echo '<a class="skip-link screen-reader-text" href="' . $selector . '">' . esc_html__( 'Skip to content', 'gutenberg' ) . '</a>';
+				return;
+			}
+		}
+	}
+
+	// If we got this far, an element with the appropriate target ID was not located.
+	// Add a script to auto-generate the target and link based on the content we have.
+	add_action(
+		'wp_footer',
+		function() use ( $selectors ) {
+			?>
+			<script>
+			( function() {
+				var searchEl = [ '<?php echo implode( "','", $selectors ); ?>' ], contentEl, contentElID, parentEl, skipLink, i;
+
+				// Find the content element.
+				for ( i = 0; i < searchEl.length; i++ ) {
+					if ( ! contentEl ) {
+						contentEl = document.querySelector( searchEl[ i ] );
+					}
+				}
+
+				// Early exit if no content element was found.
+				if ( ! contentEl ) {
+					return;
+				}
+
+				// Get the ID of the content element.
+				contentElID = contentEl.id;
+				if ( ! contentElID ) {
+					contentElID = 'auto-skip-link-target';
+					contentEl.id = contentElID;
+				}
+
+				// Get the parent element. This is where we'll inject the skip-link.
+				parentEl = document.querySelector( '.wp-site-blocks' );
+				if ( ! parentEl ) {
+					parentEl = document.body;
+				}
+
+				// Create the skip link.
+				skipLink = document.createElement( 'a' );
+				skipLink.classList.add( 'skip-link' );
+				skipLink.classList.add( 'screen-reader-text' );
+				skipLink.href = '#' + contentElID;
+				skipLink.innerHTML = '<?php esc_html_e( 'Skip to content', 'gutenberg' ); ?>';
+
+				// Inject the skip link.
+				parentEl.insertAdjacentElement( 'afterbegin', skipLink );
+			}() );
+			</script>
+			<?php
+		}
+	);
+}
+add_action( 'wp_body_open', 'gutenberg_inject_skip_link' );

From f7f16b5b4c8ca58fe7a5c110779dd3de4fcae3d1 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 15:07:24 +0200
Subject: [PATCH 02/24] Add check for null selectors

---
 lib/full-site-editing/templates.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 628627c250ee2b..17f77d9a9c4ea3 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -202,8 +202,8 @@ function gutenberg_inject_skip_link() {
 	// Get the selectors.
 	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
 
-	// Early exit if we don't have anything to check.
-	if ( ! $template_html ) {
+	// Sanity check.
+	if ( ! $selectors || ! $template_html ) {
 		return;
 	}
 

From b2f8cddca1a513cc5b15420ccfdc07d7f0764a6c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 15:39:09 +0200
Subject: [PATCH 03/24] Allow opt-in to auto-css for the skip-link

---
 lib/class-wp-theme-json.php         | 12 ++++++++++++
 lib/full-site-editing/templates.php |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index ae8a39f0d5519f..b3639fabb256bb 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -168,6 +168,8 @@ class WP_Theme_JSON {
 		),
 		'skipLink'        => array(
 			'target' => null,
+			'auto'   => null,
+			'css'    => null,
 		),
 	);
 
@@ -1099,6 +1101,16 @@ public function get_skip_link_selectors() {
 		return array_unique( array_merge( $selectors, $fallbacks ) );
 	}
 
+	/**
+	 * Whether the skip-link styles should be automatically added or not.
+	 *
+	 * @return string
+	 */
+	public function should_add_skip_link_styles() {
+		return isset( $this->theme_json['skipLink']['css'] ) && $this->theme_json['skipLink']['css'];
+	}
+
+
 	/**
 	 * Returns the stylesheet that results of processing
 	 * the theme.json structure this object represents.
diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 17f77d9a9c4ea3..a692374f7225d7 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -199,6 +199,14 @@ function set_unique_slug_on_create_template( $post_id ) {
 function gutenberg_inject_skip_link() {
 	global $template_html;
 
+	// Add the skip-link styles if needed.
+	if ( WP_Theme_JSON_Resolver::get_theme_data()->should_add_skip_link_styles() ) {
+		echo '<style id="skip-link-styles">';
+		echo '.skip-link.screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute !important;width:1px;word-wrap:normal !important;}';
+		echo '.skip-link.screen-reader-text:focus{background-color:#eee;clip:auto !important;clip-path:none;color:#444;display:block;font-size:1em;height:auto;left:5px;line-height:normal;padding:15px 23px 14px;text-decoration:none;top:5px;width:auto;z-index:100000;}';
+		echo '</style>';
+	}
+
 	// Get the selectors.
 	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
 

From 22c03e115584d6f817ecffef1152d4ae5dd92988 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 15:44:15 +0200
Subject: [PATCH 04/24] Escape things where needed

---
 lib/full-site-editing/templates.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index a692374f7225d7..5b90c3c71bf90b 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -219,7 +219,7 @@ function gutenberg_inject_skip_link() {
 		if ( 0 === strpos( $selector, '#' ) ) {
 			$selector_no_hash = str_replace( '#', '', $selector );
 			if ( strpos( $template_html, 'id="' . $selector_no_hash . '"' ) || strpos( $template_html, "id='$selector_no_hash'" ) ) {
-				echo '<a class="skip-link screen-reader-text" href="' . $selector . '">' . esc_html__( 'Skip to content', 'gutenberg' ) . '</a>';
+				echo '<a class="skip-link screen-reader-text" href="' . esc_attr( $selector ) . '">' . esc_html__( 'Skip to content', 'gutenberg' ) . '</a>';
 				return;
 			}
 		}
@@ -233,7 +233,7 @@ function() use ( $selectors ) {
 			?>
 			<script>
 			( function() {
-				var searchEl = [ '<?php echo implode( "','", $selectors ); ?>' ], contentEl, contentElID, parentEl, skipLink, i;
+				var searchEl = [ '<?php echo esc_attr( implode( "','", $selectors ) ); ?>' ], contentEl, contentElID, parentEl, skipLink, i;
 
 				// Find the content element.
 				for ( i = 0; i < searchEl.length; i++ ) {

From c8591294f7c9b232938da39a8e133cafaa7bbf99 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 16:13:47 +0200
Subject: [PATCH 05/24] Add inline comment

---
 lib/full-site-editing/templates.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 5b90c3c71bf90b..b44b2250a8ce62 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -215,6 +215,7 @@ function gutenberg_inject_skip_link() {
 		return;
 	}
 
+	// Try to find the selector in $template_html and print the skip-link.
 	foreach ( $selectors as $selector ) {
 		if ( 0 === strpos( $selector, '#' ) ) {
 			$selector_no_hash = str_replace( '#', '', $selector );

From 199651bb334a1584108e2d12a8f0378dd264b931 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 11 Feb 2021 16:19:49 +0200
Subject: [PATCH 06/24] This MUST NOT be escaped

---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index b44b2250a8ce62..7bd98cc674521c 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -234,7 +234,7 @@ function() use ( $selectors ) {
 			?>
 			<script>
 			( function() {
-				var searchEl = [ '<?php echo esc_attr( implode( "','", $selectors ) ); ?>' ], contentEl, contentElID, parentEl, skipLink, i;
+				var searchEl = [ '<?php echo implode( "','", $selectors ); // phpcs:ignore WordPress.Security.EscapeOutput ?>' ], contentEl, contentElID, parentEl, skipLink, i;
 
 				// Find the content element.
 				for ( i = 0; i < searchEl.length; i++ ) {

From f16dad423b8286d15919759061a2d6f9d9fc80b9 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 09:25:13 +0200
Subject: [PATCH 07/24] Use wp_json_encode

---
 lib/full-site-editing/templates.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 7bd98cc674521c..b7103d0dddf2dc 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -234,7 +234,12 @@ function() use ( $selectors ) {
 			?>
 			<script>
 			( function() {
-				var searchEl = [ '<?php echo implode( "','", $selectors ); // phpcs:ignore WordPress.Security.EscapeOutput ?>' ], contentEl, contentElID, parentEl, skipLink, i;
+				var searchEl = <?php echo wp_json_encode( array_values( $selectors ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
+					contentEl,
+					contentElID,
+					parentEl,
+					skipLink,
+					i;
 
 				// Find the content element.
 				for ( i = 0; i < searchEl.length; i++ ) {

From 540a5cd108ec0ee9c62afeb7aac8a288527f3b71 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 09:35:54 +0200
Subject: [PATCH 08/24] Don't use an anonymous function

---
 lib/full-site-editing/templates.php | 99 +++++++++++++++--------------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index b7103d0dddf2dc..ce5080ab19d45b 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -228,57 +228,64 @@ function gutenberg_inject_skip_link() {
 
 	// If we got this far, an element with the appropriate target ID was not located.
 	// Add a script to auto-generate the target and link based on the content we have.
-	add_action(
-		'wp_footer',
-		function() use ( $selectors ) {
-			?>
-			<script>
-			( function() {
-				var searchEl = <?php echo wp_json_encode( array_values( $selectors ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
-					contentEl,
-					contentElID,
-					parentEl,
-					skipLink,
-					i;
+	add_action( 'wp_footer', 'gutenberg_the_skip_link_script' );
+}
+add_action( 'wp_body_open', 'gutenberg_inject_skip_link' );
 
-				// Find the content element.
-				for ( i = 0; i < searchEl.length; i++ ) {
-					if ( ! contentEl ) {
-						contentEl = document.querySelector( searchEl[ i ] );
-					}
-				}
+/**
+ * Print the skip-link script.
+ *
+ * @return void
+ */
+function gutenberg_the_skip_link_script() {
 
-				// Early exit if no content element was found.
-				if ( ! contentEl ) {
-					return;
-				}
+	// Get the selectors.
+	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
+	?>
+	<script>
+	( function() {
+		var searchEl = <?php echo wp_json_encode( array_values( $selectors ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
+			contentEl,
+			contentElID,
+			parentEl,
+			skipLink,
+			i;
 
-				// Get the ID of the content element.
-				contentElID = contentEl.id;
-				if ( ! contentElID ) {
-					contentElID = 'auto-skip-link-target';
-					contentEl.id = contentElID;
-				}
+		// Find the content element.
+		for ( i = 0; i < searchEl.length; i++ ) {
+			if ( ! contentEl ) {
+				contentEl = document.querySelector( searchEl[ i ] );
+			}
+		}
 
-				// Get the parent element. This is where we'll inject the skip-link.
-				parentEl = document.querySelector( '.wp-site-blocks' );
-				if ( ! parentEl ) {
-					parentEl = document.body;
-				}
+		// Early exit if no content element was found.
+		if ( ! contentEl ) {
+			return;
+		}
 
-				// Create the skip link.
-				skipLink = document.createElement( 'a' );
-				skipLink.classList.add( 'skip-link' );
-				skipLink.classList.add( 'screen-reader-text' );
-				skipLink.href = '#' + contentElID;
-				skipLink.innerHTML = '<?php esc_html_e( 'Skip to content', 'gutenberg' ); ?>';
+		// Get the ID of the content element.
+		contentElID = contentEl.id;
+		if ( ! contentElID ) {
+			contentElID = 'auto-skip-link-target';
+			contentEl.id = contentElID;
+		}
 
-				// Inject the skip link.
-				parentEl.insertAdjacentElement( 'afterbegin', skipLink );
-			}() );
-			</script>
-			<?php
+		// Get the parent element. This is where we'll inject the skip-link.
+		parentEl = document.querySelector( '.wp-site-blocks' );
+		if ( ! parentEl ) {
+			parentEl = document.body;
 		}
-	);
+
+		// Create the skip link.
+		skipLink = document.createElement( 'a' );
+		skipLink.classList.add( 'skip-link' );
+		skipLink.classList.add( 'screen-reader-text' );
+		skipLink.href = '#' + contentElID;
+		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content', 'gutenberg' ); ?>';
+
+		// Inject the skip link.
+		parentEl.insertAdjacentElement( 'afterbegin', skipLink );
+	}() );
+	</script>
+	<?php
 }
-add_action( 'wp_body_open', 'gutenberg_inject_skip_link' );

From f113ed4e4f21f0cbbe4a68bb902a25659ef2ca84 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 11:12:45 +0200
Subject: [PATCH 09/24] Allow multiple skip-links

---
 lib/class-wp-theme-json.php         |  42 +++++++---
 lib/full-site-editing/templates.php | 121 ++++++++++++++++------------
 2 files changed, 100 insertions(+), 63 deletions(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index b3639fabb256bb..15dde55ca2353b 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -166,8 +166,8 @@ class WP_Theme_JSON {
 			),
 			'custom'     => null,
 		),
-		'skipLink'        => array(
-			'target' => null,
+		'skipLinks'       => array(
+			'links'  => null,
 			'auto'   => null,
 			'css'    => null,
 		),
@@ -1073,16 +1073,13 @@ public function get_custom_templates() {
 	}
 
 	/**
-	 * Return the skip-link selectors of the current theme.
+	 * Return an array of skip-links.
 	 *
 	 * @return array
 	 */
-	public function get_skip_link_selectors() {
-		if ( isset( $this->theme_json['skipLink']['auto'] ) && false === $this->theme_json['skipLink']['auto'] ) {
-			return;
-		}
+	public function get_skip_links() {
 
-		$fallbacks = array(
+		$fallback_elements = array(
 			'#skip-link-target',
 			'main',
 			'.wp-block-post-title',
@@ -1093,12 +1090,33 @@ public function get_skip_link_selectors() {
 			'h2',
 		);
 
-		$selectors = array();
-		if ( isset( $this->theme_json['skipLink']['target'] ) ) {
-			$selectors = (array) $this->theme_json['skipLink']['target'];
+		// If we don't have "skipLinks" defined return the defaults.
+		if ( ! isset( $this->theme_json['skipLinks'] ) ) {
+			return array(
+				array(
+					'target'       => $fallback_elements,
+					'label'        => __( 'Skip to content', 'gutenberg' ),
+					'useFallbacks' => false,
+				),
+			);
 		}
 
-		return array_unique( array_merge( $selectors, $fallbacks ) );
+		if ( isset( $this->theme_json['skipLinks']['auto'] ) && false === $this->theme_json['skipLinks']['auto'] ) {
+			return;
+		}
+
+		$links = array();
+		foreach ( $this->theme_json['skipLinks']['links'] as $link ) {
+			$selectors = isset( $link['target'] ) ? (array) $link['target'] : array();
+			if ( ! isset( $link['useFallbacks'] ) || $link['useFallbacks'] ) {
+				$selectors = array_unique( array_merge( $selectors, $fallback_elements ) );
+			}
+			$links[] = array(
+				'target' => array_values( $selectors ), // Use array_values to ensure there are no skipped keys in the array.
+				'label'  => isset( $link['label'] ) ? $link['label'] : __( 'Skip to content', 'gutenberg' ),
+			);
+		}
+		return $links;
 	}
 
 	/**
diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index ce5080ab19d45b..7debb43e899bae 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -197,7 +197,9 @@ function set_unique_slug_on_create_template( $post_id ) {
  * Inject the skip-link.
  */
 function gutenberg_inject_skip_link() {
-	global $template_html;
+	global $template_html, $skip_links_via_script;
+
+	$skip_links_via_script = array();
 
 	// Add the skip-link styles if needed.
 	if ( WP_Theme_JSON_Resolver::get_theme_data()->should_add_skip_link_styles() ) {
@@ -207,28 +209,40 @@ function gutenberg_inject_skip_link() {
 		echo '</style>';
 	}
 
-	// Get the selectors.
-	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
+	// Get the array of skip-links.
+	$links = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_links();
 
 	// Sanity check.
-	if ( ! $selectors || ! $template_html ) {
+	if ( empty( $links ) || ! $template_html ) {
 		return;
 	}
 
-	// Try to find the selector in $template_html and print the skip-link.
-	foreach ( $selectors as $selector ) {
-		if ( 0 === strpos( $selector, '#' ) ) {
-			$selector_no_hash = str_replace( '#', '', $selector );
-			if ( strpos( $template_html, 'id="' . $selector_no_hash . '"' ) || strpos( $template_html, "id='$selector_no_hash'" ) ) {
-				echo '<a class="skip-link screen-reader-text" href="' . esc_attr( $selector ) . '">' . esc_html__( 'Skip to content', 'gutenberg' ) . '</a>';
-				return;
+	// Loop links.
+	foreach ( $links as $link ) {
+		$element_found = false;
+		// Try to find the selector in $template_html and print the skip-link.
+		foreach ( $link['target'] as $selector ) {
+			if ( 0 === strpos( $selector, '#' ) ) {
+				$selector_no_hash = str_replace( '#', '', $selector );
+				if ( strpos( $template_html, 'id="' . $selector_no_hash . '"' ) || strpos( $template_html, "id='$selector_no_hash'" ) ) {
+					echo '<a id="wp--skip-link--' . esc_attr( $selector_no_hash ) . '" class="skip-link screen-reader-text" href="' . esc_attr( $selector ) . '">' . esc_html( $link['label'] ) . '</a>';
+					$element_found = true;
+					break;
+				}
 			}
 		}
+
+		if ( ! $element_found ) {
+			// Add the skip-link to the $skip_links_via_script global.
+			$skip_links_via_script[] = $link;
+		}
 	}
 
-	// If we got this far, an element with the appropriate target ID was not located.
-	// Add a script to auto-generate the target and link based on the content we have.
-	add_action( 'wp_footer', 'gutenberg_the_skip_link_script' );
+	if ( ! empty( $skip_links_via_script ) ) {
+		// An element with the appropriate target ID was not located.
+		// Add a script to auto-generate the target and link based on the content we have.
+		add_action( 'wp_footer', 'gutenberg_the_skip_link_script' );
+	}
 }
 add_action( 'wp_body_open', 'gutenberg_inject_skip_link' );
 
@@ -239,52 +253,57 @@ function gutenberg_inject_skip_link() {
  */
 function gutenberg_the_skip_link_script() {
 
-	// Get the selectors.
-	$selectors = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_link_selectors();
+	// Get the links.
+	global $skip_links_via_script;
+
+	// Sanity check.
+	if ( empty( $skip_links_via_script ) ) {
+		return;
+	}
 	?>
 	<script>
 	( function() {
-		var searchEl = <?php echo wp_json_encode( array_values( $selectors ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
-			contentEl,
-			contentElID,
-			parentEl,
-			skipLink,
-			i;
+		var links = <?php echo wp_json_encode( array_reverse( $skip_links_via_script ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
+			parentEl = document.querySelector( '.wp-site-blocks' ) || document.body,
+			generateLink = function( selectors, label, parent ) {
+				var contentEl, contentElID, skipLink, i;
 
-		// Find the content element.
-		for ( i = 0; i < searchEl.length; i++ ) {
-			if ( ! contentEl ) {
-				contentEl = document.querySelector( searchEl[ i ] );
-			}
-		}
+				// Find the content element.
+				for ( i = 0; i < selectors.length; i++ ) {
+					if ( ! contentEl ) {
+						contentEl = document.querySelector( selectors[ i ] );
+					}
+				}
 
-		// Early exit if no content element was found.
-		if ( ! contentEl ) {
-			return;
-		}
+				// Early exit if no content element was found.
+				if ( ! contentEl ) {
+					return;
+				}
 
-		// Get the ID of the content element.
-		contentElID = contentEl.id;
-		if ( ! contentElID ) {
-			contentElID = 'auto-skip-link-target';
-			contentEl.id = contentElID;
-		}
+				// Get the ID of the content element.
+				contentElID = contentEl.id;
+				if ( ! contentElID ) {
+					contentElID = 'auto-skip-link-target';
+					contentEl.id = contentElID;
+				}
 
-		// Get the parent element. This is where we'll inject the skip-link.
-		parentEl = document.querySelector( '.wp-site-blocks' );
-		if ( ! parentEl ) {
-			parentEl = document.body;
-		}
+				// Create the skip link.
+				skipLink = document.createElement( 'a' );
+				skipLink.classList.add( 'skip-link' );
+				skipLink.classList.add( 'screen-reader-text' );
+				skipLink.href = '#' + contentElID;
+				skipLink.innerHTML = label;
+				skipLink.id = 'wp--skip-link--' + contentElID;
+
+				// Inject the skip link.
+				parent.insertAdjacentElement( 'afterbegin', skipLink );
+			},
+			i;
 
-		// Create the skip link.
-		skipLink = document.createElement( 'a' );
-		skipLink.classList.add( 'skip-link' );
-		skipLink.classList.add( 'screen-reader-text' );
-		skipLink.href = '#' + contentElID;
-		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content', 'gutenberg' ); ?>';
+		for ( i = 0; i < links.length; i++ ) {
+			generateLink( links[ i ]['target'], links[ i ]['label'], parentEl );
+		}
 
-		// Inject the skip link.
-		parentEl.insertAdjacentElement( 'afterbegin', skipLink );
 	}() );
 	</script>
 	<?php

From 8d244311c76d5eb9b891494f72241a6e21f378f6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 11:13:32 +0200
Subject: [PATCH 10/24] Update lib/class-wp-theme-json.php

Co-authored-by: Timothy Jacobs <timothy@ironbounddesigns.com>
---
 lib/class-wp-theme-json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index b3639fabb256bb..996588ff9954de 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -1107,7 +1107,7 @@ public function get_skip_link_selectors() {
 	 * @return string
 	 */
 	public function should_add_skip_link_styles() {
-		return isset( $this->theme_json['skipLink']['css'] ) && $this->theme_json['skipLink']['css'];
+		return ! empty( $this->theme_json['skipLink']['css'] );
 	}
 
 

From 37ca703278803163e164e37556018876f3fb9bc7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 11:15:43 +0200
Subject: [PATCH 11/24] fix should_add_skip_link_styles check after the
 refactor

---
 lib/class-wp-theme-json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index d89ec6fcb5f3f9..e4952ad44c5845 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -1125,7 +1125,7 @@ public function get_skip_links() {
 	 * @return string
 	 */
 	public function should_add_skip_link_styles() {
-		return ! empty( $this->theme_json['skipLink']['css'] );
+		return ! empty( $this->theme_json['skipLinks']['css'] );
 	}
 
 

From e3594547406137dd062984887985d678044e6857 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 16:09:42 +0200
Subject: [PATCH 12/24] make css opt-out

---
 lib/class-wp-theme-json.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index 3a4d69f1951bb6..b1da05c0147763 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -1138,10 +1138,9 @@ public function get_skip_links() {
 	 * @return string
 	 */
 	public function should_add_skip_link_styles() {
-		return ! empty( $this->theme_json['skipLinks']['css'] );
+		return ! isset( $this->theme_json['skipLinks'] ) || ! empty( $this->theme_json['skipLinks']['css'] );
 	}
 
-
 	/**
 	 * Returns the stylesheet that results of processing
 	 * the theme.json structure this object represents.

From 05607a7d21a18daf22afb8b50f8a37964e5d0288 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Feb 2021 16:26:56 +0200
Subject: [PATCH 13/24] classList.add can add multiple classes at once

---
 lib/full-site-editing/templates.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 7debb43e899bae..f83728c0ff2ee5 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -289,8 +289,7 @@ function gutenberg_the_skip_link_script() {
 
 				// Create the skip link.
 				skipLink = document.createElement( 'a' );
-				skipLink.classList.add( 'skip-link' );
-				skipLink.classList.add( 'screen-reader-text' );
+				skipLink.classList.add( 'skip-link', 'screen-reader-text' );
 				skipLink.href = '#' + contentElID;
 				skipLink.innerHTML = label;
 				skipLink.id = 'wp--skip-link--' + contentElID;

From 56d0a5a0d0b1af4827e2ff01a07e80c1e46effe8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 12 Mar 2021 10:59:59 +0200
Subject: [PATCH 14/24] Add docs

---
 docs/how-to-guides/themes/theme-json.md | 36 ++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/docs/how-to-guides/themes/theme-json.md b/docs/how-to-guides/themes/theme-json.md
index 74831234b7f547..09c8112a114480 100644
--- a/docs/how-to-guides/themes/theme-json.md
+++ b/docs/how-to-guides/themes/theme-json.md
@@ -477,7 +477,9 @@ These are the current typography properties supported by blocks:
 
 There's a growing need to add more theme metadata to the theme.json. This section lists those other fields:
 
-**customTemplates**: within this field themes can list the custom templates present in the `block-templates` folder, the keys should match the custom template name. For example, for a custom template named `my-custom-template.html`, the `theme.json` can declare what post types can use it and what's the title to show the user:
+#### `customTemplates`: 
+
+within this field themes can list the custom templates present in the `block-templates` folder, the keys should match the custom template name. For example, for a custom template named `my-custom-template.html`, the `theme.json` can declare what post types can use it and what's the title to show the user:
 
 ```json
 {
@@ -490,6 +492,38 @@ There's a growing need to add more theme metadata to the theme.json. This sectio
 }
 ```
 
+#### `skipLinks`
+
+Within this field, themes can change the behavior of the automatic skip-link generation, or opt-out.
+
+```json
+{
+	"skipLinks": {
+		"auto": true,
+		"css": true,
+		"links": [
+			{
+				"target": "#skip-link-target",
+				"label": "Skip to Content"
+			},
+			{
+				"target": "#main-navigation",
+				"label": "Skip to Navigation",
+				"useFallbacks": false
+			}
+		]
+	}
+}
+```
+
+Arguments:
+* `auto`: (bool) Whether skip-links will be auto-generated or not. Defaults to `true`. To opt-out of the automatic skip-links, set to `false`.
+* `css:` (bool) Whether CSS for the skip-link should be automatically added or not. Defaults to `true`. To opt-out and manually handle CSS for skip-links, set to `false`.
+* `links`: (array) Can be used to define a custom skip-link (or multiple skip-links if needed). Each "link" can have the following:
+  * `target`: (string|array) The selector of the element that should be used as the target.
+  * `label`: (string) The skip-link's label. If omitted defaults to `Skip to content`.
+  * `useFallbacks`: (bool) Defaults to `true`. If a `target` is not defined, or the `target` element is not located, then the skip-link target will fallback to the 1st instance of these elements: `#skip-link-target, main, .wp-block-post-title, .wp-block-query-loop, .wp-block-post-content, .entry-content, h1, h2`. If set to false, then the fallbacks won't be added. Use in case of multiple skip-links.
+
 ## Frequently Asked Questions
 
 ### The naming schema of CSS Custom Properties

From b5214e87ca8dadecdf52dcfed53ceabeadb1b8cd Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 12:58:46 +0300
Subject: [PATCH 15/24] fix merge conflicts

---
 docs/how-to-guides/themes/theme-json.md |   44 -
 package-lock.json                       | 3094 -----------------------
 2 files changed, 3138 deletions(-)

diff --git a/docs/how-to-guides/themes/theme-json.md b/docs/how-to-guides/themes/theme-json.md
index d9d8ab5a8fe229..000cd2f9681694 100644
--- a/docs/how-to-guides/themes/theme-json.md
+++ b/docs/how-to-guides/themes/theme-json.md
@@ -468,50 +468,6 @@ There's a growing need to add more theme metadata to the theme.json. This sectio
 
 Currently block variations exist for "header" and "footer" values of the area term, any other values and template parts not defined in the json will default to the general template part block.  Variations will be denoted by specific icons within the editor's interface, will default to the corresponding semantic HTML element for the wrapper (this can also be overridden by the `tagName` attribute set on the template part block), and will contextualize the template part allowing more custom flows in future editor improvements.
 
-#### Spacing Properties
-
-| Block | Padding |
-| --- | --- |
-| Cover | Yes |
-| Group | Yes |
-
-#### Typography Properties
-
-These are the current typography properties supported by blocks:
-
-| Block | Font Family | Font Size | Font Style | Font Weight | Line Height | Text Decoration | Text Transform |
-| --- | --- | --- | --- | --- | --- | --- | --- |
-| Global | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
-| Code | - | Yes | - | - | - | - | - |
-| Heading [1] | - | Yes | - | - | Yes | - | - |
-| List | - | Yes | - | - | - | - | - |
-| Navigation | Yes | Yes | Yes | Yes | - | Yes | Yes |
-| Paragraph | - | Yes | - | - | Yes | - | - |
-| Post Author | - | Yes | - | - | Yes | - | - |
-| Post Comments | - | Yes | - | - | Yes | - | - |
-| Post Comments Count | - | Yes | - | - | Yes | - | - |
-| Post Comments Form | - | Yes | - | - | Yes | - | - |
-| Post Date | - | Yes | - | - | Yes | - | - |
-| Post Excerpt | - | Yes | - | - | Yes | - | - |
-| Post Hierarchical Terms | - | Yes | - | - | Yes | - | - |
-| Post Tags | - | Yes | - | - | Yes | - | - |
-| Post Title | Yes | Yes | - | - | Yes | - | - |
-| Preformatted | - | Yes | - | - | - | - | - |
-| Site Tagline | Yes | Yes | - | - | Yes | - | - |
-| Site Title | Yes | Yes | - | - | Yes | - | Yes |
-| Verse | Yes | Yes | - | - | - | - | - |
-
-[1] The heading block represents 6 distinct HTML elements: H1-H6. It comes with selectors to target each individual element (ex: core/heading/h1 for H1, etc).
-
-
-### Other theme metadata
-
-There's a growing need to add more theme metadata to the theme.json. This section lists those other fields:
-
-#### `customTemplates`: 
-
-within this field themes can list the custom templates present in the `block-templates` folder, the keys should match the custom template name. For example, for a custom template named `my-custom-template.html`, the `theme.json` can declare what post types can use it and what's the title to show the user:
-
 ```json
 {
 	"templateParts": [
diff --git a/package-lock.json b/package-lock.json
index 2dd8468220e084..f871a20ecdd7e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42506,3100 +42506,6 @@
 			"integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
 			"dev": true
 		},
-		"npm": {
-			"version": "6.14.12",
-			"resolved": "https://registry.npmjs.org/npm/-/npm-6.14.12.tgz",
-			"integrity": "sha512-La0TNNm1TLYaSeOyit+p3xGTRYYRsHae6/RG69MVXurZsWna9jccPP7FOi/u7V9WdiCV5OOojrfMD+WstO5MZQ==",
-			"requires": {
-				"JSONStream": "^1.3.5",
-				"abbrev": "~1.1.1",
-				"ansicolors": "~0.3.2",
-				"ansistyles": "~0.1.3",
-				"aproba": "^2.0.0",
-				"archy": "~1.0.0",
-				"bin-links": "^1.1.8",
-				"bluebird": "^3.5.5",
-				"byte-size": "^5.0.1",
-				"cacache": "^12.0.3",
-				"call-limit": "^1.1.1",
-				"chownr": "^1.1.4",
-				"ci-info": "^2.0.0",
-				"cli-columns": "^3.1.2",
-				"cli-table3": "^0.5.1",
-				"cmd-shim": "^3.0.3",
-				"columnify": "~1.5.4",
-				"config-chain": "^1.1.12",
-				"debuglog": "*",
-				"detect-indent": "~5.0.0",
-				"detect-newline": "^2.1.0",
-				"dezalgo": "~1.0.3",
-				"editor": "~1.0.0",
-				"figgy-pudding": "^3.5.1",
-				"find-npm-prefix": "^1.0.2",
-				"fs-vacuum": "~1.2.10",
-				"fs-write-stream-atomic": "~1.0.10",
-				"gentle-fs": "^2.3.1",
-				"glob": "^7.1.6",
-				"graceful-fs": "^4.2.4",
-				"has-unicode": "~2.0.1",
-				"hosted-git-info": "^2.8.8",
-				"iferr": "^1.0.2",
-				"imurmurhash": "*",
-				"infer-owner": "^1.0.4",
-				"inflight": "~1.0.6",
-				"inherits": "^2.0.4",
-				"ini": "^1.3.8",
-				"init-package-json": "^1.10.3",
-				"is-cidr": "^3.0.0",
-				"json-parse-better-errors": "^1.0.2",
-				"lazy-property": "~1.0.0",
-				"libcipm": "^4.0.8",
-				"libnpm": "^3.0.1",
-				"libnpmaccess": "^3.0.2",
-				"libnpmhook": "^5.0.3",
-				"libnpmorg": "^1.0.1",
-				"libnpmsearch": "^2.0.2",
-				"libnpmteam": "^1.0.2",
-				"libnpx": "^10.2.4",
-				"lock-verify": "^2.1.0",
-				"lockfile": "^1.0.4",
-				"lodash._baseindexof": "*",
-				"lodash._baseuniq": "~4.6.0",
-				"lodash._bindcallback": "*",
-				"lodash._cacheindexof": "*",
-				"lodash._createcache": "*",
-				"lodash._getnative": "*",
-				"lodash.clonedeep": "~4.5.0",
-				"lodash.restparam": "*",
-				"lodash.union": "~4.6.0",
-				"lodash.uniq": "~4.5.0",
-				"lodash.without": "~4.4.0",
-				"lru-cache": "^5.1.1",
-				"meant": "^1.0.2",
-				"mississippi": "^3.0.0",
-				"mkdirp": "^0.5.5",
-				"move-concurrently": "^1.0.1",
-				"node-gyp": "^5.1.0",
-				"nopt": "^4.0.3",
-				"normalize-package-data": "^2.5.0",
-				"npm-audit-report": "^1.3.3",
-				"npm-cache-filename": "~1.0.2",
-				"npm-install-checks": "^3.0.2",
-				"npm-lifecycle": "^3.1.5",
-				"npm-package-arg": "^6.1.1",
-				"npm-packlist": "^1.4.8",
-				"npm-pick-manifest": "^3.0.2",
-				"npm-profile": "^4.0.4",
-				"npm-registry-fetch": "^4.0.7",
-				"npm-user-validate": "^1.0.1",
-				"npmlog": "~4.1.2",
-				"once": "~1.4.0",
-				"opener": "^1.5.2",
-				"osenv": "^0.1.5",
-				"pacote": "^9.5.12",
-				"path-is-inside": "~1.0.2",
-				"promise-inflight": "~1.0.1",
-				"qrcode-terminal": "^0.12.0",
-				"query-string": "^6.8.2",
-				"qw": "~1.0.1",
-				"read": "~1.0.7",
-				"read-cmd-shim": "^1.0.5",
-				"read-installed": "~4.0.3",
-				"read-package-json": "^2.1.1",
-				"read-package-tree": "^5.3.1",
-				"readable-stream": "^3.6.0",
-				"readdir-scoped-modules": "^1.1.0",
-				"request": "^2.88.0",
-				"retry": "^0.12.0",
-				"rimraf": "^2.7.1",
-				"safe-buffer": "^5.1.2",
-				"semver": "^5.7.1",
-				"sha": "^3.0.0",
-				"slide": "~1.1.6",
-				"sorted-object": "~2.0.1",
-				"sorted-union-stream": "~2.1.3",
-				"ssri": "^6.0.1",
-				"stringify-package": "^1.0.1",
-				"tar": "^4.4.13",
-				"text-table": "~0.2.0",
-				"tiny-relative-date": "^1.3.0",
-				"uid-number": "0.0.6",
-				"umask": "~1.1.0",
-				"unique-filename": "^1.1.1",
-				"unpipe": "~1.0.0",
-				"update-notifier": "^2.5.0",
-				"uuid": "^3.3.3",
-				"validate-npm-package-license": "^3.0.4",
-				"validate-npm-package-name": "~3.0.0",
-				"which": "^1.3.1",
-				"worker-farm": "^1.7.0",
-				"write-file-atomic": "^2.4.3"
-			},
-			"dependencies": {
-				"JSONStream": {
-					"version": "1.3.5",
-					"bundled": true,
-					"requires": {
-						"jsonparse": "^1.2.0",
-						"through": ">=2.2.7 <3"
-					}
-				},
-				"abbrev": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"agent-base": {
-					"version": "4.3.0",
-					"bundled": true,
-					"requires": {
-						"es6-promisify": "^5.0.0"
-					}
-				},
-				"agentkeepalive": {
-					"version": "3.5.2",
-					"bundled": true,
-					"requires": {
-						"humanize-ms": "^1.2.1"
-					}
-				},
-				"ansi-align": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"string-width": "^2.0.0"
-					}
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"ansi-styles": {
-					"version": "3.2.1",
-					"bundled": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"ansicolors": {
-					"version": "0.3.2",
-					"bundled": true
-				},
-				"ansistyles": {
-					"version": "0.1.3",
-					"bundled": true
-				},
-				"aproba": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"archy": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"are-we-there-yet": {
-					"version": "1.1.4",
-					"bundled": true,
-					"requires": {
-						"delegates": "^1.0.0",
-						"readable-stream": "^2.0.6"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"asap": {
-					"version": "2.0.6",
-					"bundled": true
-				},
-				"asn1": {
-					"version": "0.2.4",
-					"bundled": true,
-					"requires": {
-						"safer-buffer": "~2.1.0"
-					}
-				},
-				"assert-plus": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"asynckit": {
-					"version": "0.4.0",
-					"bundled": true
-				},
-				"aws-sign2": {
-					"version": "0.7.0",
-					"bundled": true
-				},
-				"aws4": {
-					"version": "1.8.0",
-					"bundled": true
-				},
-				"balanced-match": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"bcrypt-pbkdf": {
-					"version": "1.0.2",
-					"bundled": true,
-					"optional": true,
-					"requires": {
-						"tweetnacl": "^0.14.3"
-					}
-				},
-				"bin-links": {
-					"version": "1.1.8",
-					"bundled": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cmd-shim": "^3.0.0",
-						"gentle-fs": "^2.3.0",
-						"graceful-fs": "^4.1.15",
-						"npm-normalize-package-bin": "^1.0.0",
-						"write-file-atomic": "^2.3.0"
-					}
-				},
-				"bluebird": {
-					"version": "3.5.5",
-					"bundled": true
-				},
-				"boxen": {
-					"version": "1.3.0",
-					"bundled": true,
-					"requires": {
-						"ansi-align": "^2.0.0",
-						"camelcase": "^4.0.0",
-						"chalk": "^2.0.1",
-						"cli-boxes": "^1.0.0",
-						"string-width": "^2.0.0",
-						"term-size": "^1.2.0",
-						"widest-line": "^2.0.0"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.11",
-					"bundled": true,
-					"requires": {
-						"balanced-match": "^1.0.0",
-						"concat-map": "0.0.1"
-					}
-				},
-				"buffer-from": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"builtins": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"byline": {
-					"version": "5.0.0",
-					"bundled": true
-				},
-				"byte-size": {
-					"version": "5.0.1",
-					"bundled": true
-				},
-				"cacache": {
-					"version": "12.0.3",
-					"bundled": true,
-					"requires": {
-						"bluebird": "^3.5.5",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.4",
-						"graceful-fs": "^4.1.15",
-						"infer-owner": "^1.0.3",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.3",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					}
-				},
-				"call-limit": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"camelcase": {
-					"version": "4.1.0",
-					"bundled": true
-				},
-				"capture-stack-trace": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"caseless": {
-					"version": "0.12.0",
-					"bundled": true
-				},
-				"chalk": {
-					"version": "2.4.1",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"chownr": {
-					"version": "1.1.4",
-					"bundled": true
-				},
-				"ci-info": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"cidr-regex": {
-					"version": "2.0.10",
-					"bundled": true,
-					"requires": {
-						"ip-regex": "^2.1.0"
-					}
-				},
-				"cli-boxes": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"cli-columns": {
-					"version": "3.1.2",
-					"bundled": true,
-					"requires": {
-						"string-width": "^2.0.0",
-						"strip-ansi": "^3.0.1"
-					}
-				},
-				"cli-table3": {
-					"version": "0.5.1",
-					"bundled": true,
-					"requires": {
-						"colors": "^1.1.2",
-						"object-assign": "^4.1.0",
-						"string-width": "^2.1.1"
-					}
-				},
-				"cliui": {
-					"version": "5.0.0",
-					"bundled": true,
-					"requires": {
-						"string-width": "^3.1.0",
-						"strip-ansi": "^5.2.0",
-						"wrap-ansi": "^5.1.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.0",
-							"bundled": true
-						},
-						"is-fullwidth-code-point": {
-							"version": "2.0.0",
-							"bundled": true
-						},
-						"string-width": {
-							"version": "3.1.0",
-							"bundled": true,
-							"requires": {
-								"emoji-regex": "^7.0.1",
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^5.1.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"bundled": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"clone": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"cmd-shim": {
-					"version": "3.0.3",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"mkdirp": "~0.5.0"
-					}
-				},
-				"code-point-at": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"color-convert": {
-					"version": "1.9.1",
-					"bundled": true,
-					"requires": {
-						"color-name": "^1.1.1"
-					}
-				},
-				"color-name": {
-					"version": "1.1.3",
-					"bundled": true
-				},
-				"colors": {
-					"version": "1.3.3",
-					"bundled": true,
-					"optional": true
-				},
-				"columnify": {
-					"version": "1.5.4",
-					"bundled": true,
-					"requires": {
-						"strip-ansi": "^3.0.0",
-						"wcwidth": "^1.0.0"
-					}
-				},
-				"combined-stream": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"delayed-stream": "~1.0.0"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"bundled": true
-				},
-				"concat-stream": {
-					"version": "1.6.2",
-					"bundled": true,
-					"requires": {
-						"buffer-from": "^1.0.0",
-						"inherits": "^2.0.3",
-						"readable-stream": "^2.2.2",
-						"typedarray": "^0.0.6"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"config-chain": {
-					"version": "1.1.12",
-					"bundled": true,
-					"requires": {
-						"ini": "^1.3.4",
-						"proto-list": "~1.2.1"
-					}
-				},
-				"configstore": {
-					"version": "3.1.5",
-					"bundled": true,
-					"requires": {
-						"dot-prop": "^4.2.1",
-						"graceful-fs": "^4.1.2",
-						"make-dir": "^1.0.0",
-						"unique-string": "^1.0.0",
-						"write-file-atomic": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
-				},
-				"console-control-strings": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"copy-concurrently": {
-					"version": "1.0.5",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"fs-write-stream-atomic": "^1.0.8",
-						"iferr": "^0.1.5",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.0"
-					},
-					"dependencies": {
-						"aproba": {
-							"version": "1.2.0",
-							"bundled": true
-						},
-						"iferr": {
-							"version": "0.1.5",
-							"bundled": true
-						}
-					}
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"create-error-class": {
-					"version": "3.0.2",
-					"bundled": true,
-					"requires": {
-						"capture-stack-trace": "^1.0.0"
-					}
-				},
-				"cross-spawn": {
-					"version": "5.1.0",
-					"bundled": true,
-					"requires": {
-						"lru-cache": "^4.0.1",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					},
-					"dependencies": {
-						"lru-cache": {
-							"version": "4.1.5",
-							"bundled": true,
-							"requires": {
-								"pseudomap": "^1.0.2",
-								"yallist": "^2.1.2"
-							}
-						},
-						"yallist": {
-							"version": "2.1.2",
-							"bundled": true
-						}
-					}
-				},
-				"crypto-random-string": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"cyclist": {
-					"version": "0.2.2",
-					"bundled": true
-				},
-				"dashdash": {
-					"version": "1.14.1",
-					"bundled": true,
-					"requires": {
-						"assert-plus": "^1.0.0"
-					}
-				},
-				"debug": {
-					"version": "3.1.0",
-					"bundled": true,
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"bundled": true
-						}
-					}
-				},
-				"debuglog": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"decamelize": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"decode-uri-component": {
-					"version": "0.2.0",
-					"bundled": true
-				},
-				"deep-extend": {
-					"version": "0.6.0",
-					"bundled": true
-				},
-				"defaults": {
-					"version": "1.0.3",
-					"bundled": true,
-					"requires": {
-						"clone": "^1.0.2"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.3",
-					"bundled": true,
-					"requires": {
-						"object-keys": "^1.0.12"
-					}
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"delegates": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"detect-indent": {
-					"version": "5.0.0",
-					"bundled": true
-				},
-				"detect-newline": {
-					"version": "2.1.0",
-					"bundled": true
-				},
-				"dezalgo": {
-					"version": "1.0.3",
-					"bundled": true,
-					"requires": {
-						"asap": "^2.0.0",
-						"wrappy": "1"
-					}
-				},
-				"dot-prop": {
-					"version": "4.2.1",
-					"bundled": true,
-					"requires": {
-						"is-obj": "^1.0.0"
-					}
-				},
-				"dotenv": {
-					"version": "5.0.1",
-					"bundled": true
-				},
-				"duplexer3": {
-					"version": "0.1.4",
-					"bundled": true
-				},
-				"duplexify": {
-					"version": "3.6.0",
-					"bundled": true,
-					"requires": {
-						"end-of-stream": "^1.0.0",
-						"inherits": "^2.0.1",
-						"readable-stream": "^2.0.0",
-						"stream-shift": "^1.0.0"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"ecc-jsbn": {
-					"version": "0.1.2",
-					"bundled": true,
-					"optional": true,
-					"requires": {
-						"jsbn": "~0.1.0",
-						"safer-buffer": "^2.1.0"
-					}
-				},
-				"editor": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"emoji-regex": {
-					"version": "7.0.3",
-					"bundled": true
-				},
-				"encoding": {
-					"version": "0.1.12",
-					"bundled": true,
-					"requires": {
-						"iconv-lite": "~0.4.13"
-					}
-				},
-				"end-of-stream": {
-					"version": "1.4.1",
-					"bundled": true,
-					"requires": {
-						"once": "^1.4.0"
-					}
-				},
-				"env-paths": {
-					"version": "2.2.0",
-					"bundled": true
-				},
-				"err-code": {
-					"version": "1.1.2",
-					"bundled": true
-				},
-				"errno": {
-					"version": "0.1.7",
-					"bundled": true,
-					"requires": {
-						"prr": "~1.0.1"
-					}
-				},
-				"es-abstract": {
-					"version": "1.12.0",
-					"bundled": true,
-					"requires": {
-						"es-to-primitive": "^1.1.1",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.1",
-						"is-callable": "^1.1.3",
-						"is-regex": "^1.0.4"
-					}
-				},
-				"es-to-primitive": {
-					"version": "1.2.0",
-					"bundled": true,
-					"requires": {
-						"is-callable": "^1.1.4",
-						"is-date-object": "^1.0.1",
-						"is-symbol": "^1.0.2"
-					}
-				},
-				"es6-promise": {
-					"version": "4.2.8",
-					"bundled": true
-				},
-				"es6-promisify": {
-					"version": "5.0.0",
-					"bundled": true,
-					"requires": {
-						"es6-promise": "^4.0.3"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "1.0.5",
-					"bundled": true
-				},
-				"execa": {
-					"version": "0.7.0",
-					"bundled": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					},
-					"dependencies": {
-						"get-stream": {
-							"version": "3.0.0",
-							"bundled": true
-						}
-					}
-				},
-				"extend": {
-					"version": "3.0.2",
-					"bundled": true
-				},
-				"extsprintf": {
-					"version": "1.3.0",
-					"bundled": true
-				},
-				"fast-json-stable-stringify": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"figgy-pudding": {
-					"version": "3.5.1",
-					"bundled": true
-				},
-				"find-npm-prefix": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"flush-write-stream": {
-					"version": "1.0.3",
-					"bundled": true,
-					"requires": {
-						"inherits": "^2.0.1",
-						"readable-stream": "^2.0.4"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"forever-agent": {
-					"version": "0.6.1",
-					"bundled": true
-				},
-				"form-data": {
-					"version": "2.3.2",
-					"bundled": true,
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "1.0.6",
-						"mime-types": "^2.1.12"
-					}
-				},
-				"from2": {
-					"version": "2.3.0",
-					"bundled": true,
-					"requires": {
-						"inherits": "^2.0.1",
-						"readable-stream": "^2.0.0"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"fs-minipass": {
-					"version": "1.2.7",
-					"bundled": true,
-					"requires": {
-						"minipass": "^2.6.0"
-					},
-					"dependencies": {
-						"minipass": {
-							"version": "2.9.0",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "^5.1.2",
-								"yallist": "^3.0.0"
-							}
-						}
-					}
-				},
-				"fs-vacuum": {
-					"version": "1.2.10",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"path-is-inside": "^1.0.1",
-						"rimraf": "^2.5.2"
-					}
-				},
-				"fs-write-stream-atomic": {
-					"version": "1.0.10",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"iferr": "^0.1.5",
-						"imurmurhash": "^0.1.4",
-						"readable-stream": "1 || 2"
-					},
-					"dependencies": {
-						"iferr": {
-							"version": "0.1.5",
-							"bundled": true
-						},
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"fs.realpath": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"function-bind": {
-					"version": "1.1.1",
-					"bundled": true
-				},
-				"gauge": {
-					"version": "2.7.4",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.0.3",
-						"console-control-strings": "^1.0.0",
-						"has-unicode": "^2.0.0",
-						"object-assign": "^4.1.0",
-						"signal-exit": "^3.0.0",
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wide-align": "^1.1.0"
-					},
-					"dependencies": {
-						"aproba": {
-							"version": "1.2.0",
-							"bundled": true
-						},
-						"string-width": {
-							"version": "1.0.2",
-							"bundled": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
-					}
-				},
-				"genfun": {
-					"version": "5.0.0",
-					"bundled": true
-				},
-				"gentle-fs": {
-					"version": "2.3.1",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.1.2",
-						"chownr": "^1.1.2",
-						"cmd-shim": "^3.0.3",
-						"fs-vacuum": "^1.2.10",
-						"graceful-fs": "^4.1.11",
-						"iferr": "^0.1.5",
-						"infer-owner": "^1.0.4",
-						"mkdirp": "^0.5.1",
-						"path-is-inside": "^1.0.2",
-						"read-cmd-shim": "^1.0.1",
-						"slide": "^1.1.6"
-					},
-					"dependencies": {
-						"aproba": {
-							"version": "1.2.0",
-							"bundled": true
-						},
-						"iferr": {
-							"version": "0.1.5",
-							"bundled": true
-						}
-					}
-				},
-				"get-caller-file": {
-					"version": "2.0.5",
-					"bundled": true
-				},
-				"get-stream": {
-					"version": "4.1.0",
-					"bundled": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
-				"getpass": {
-					"version": "0.1.7",
-					"bundled": true,
-					"requires": {
-						"assert-plus": "^1.0.0"
-					}
-				},
-				"glob": {
-					"version": "7.1.6",
-					"bundled": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.0.4",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				},
-				"global-dirs": {
-					"version": "0.1.1",
-					"bundled": true,
-					"requires": {
-						"ini": "^1.3.4"
-					}
-				},
-				"got": {
-					"version": "6.7.1",
-					"bundled": true,
-					"requires": {
-						"create-error-class": "^3.0.0",
-						"duplexer3": "^0.1.4",
-						"get-stream": "^3.0.0",
-						"is-redirect": "^1.0.0",
-						"is-retry-allowed": "^1.0.0",
-						"is-stream": "^1.0.0",
-						"lowercase-keys": "^1.0.0",
-						"safe-buffer": "^5.0.1",
-						"timed-out": "^4.0.0",
-						"unzip-response": "^2.0.1",
-						"url-parse-lax": "^1.0.0"
-					},
-					"dependencies": {
-						"get-stream": {
-							"version": "3.0.0",
-							"bundled": true
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.4",
-					"bundled": true
-				},
-				"har-schema": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"har-validator": {
-					"version": "5.1.5",
-					"bundled": true,
-					"requires": {
-						"ajv": "^6.12.3",
-						"har-schema": "^2.0.0"
-					},
-					"dependencies": {
-						"ajv": {
-							"version": "6.12.6",
-							"bundled": true,
-							"requires": {
-								"fast-deep-equal": "^3.1.1",
-								"fast-json-stable-stringify": "^2.0.0",
-								"json-schema-traverse": "^0.4.1",
-								"uri-js": "^4.2.2"
-							}
-						},
-						"fast-deep-equal": {
-							"version": "3.1.3",
-							"bundled": true
-						},
-						"json-schema-traverse": {
-							"version": "0.4.1",
-							"bundled": true
-						}
-					}
-				},
-				"has": {
-					"version": "1.0.3",
-					"bundled": true,
-					"requires": {
-						"function-bind": "^1.1.1"
-					}
-				},
-				"has-flag": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"has-symbols": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"has-unicode": {
-					"version": "2.0.1",
-					"bundled": true
-				},
-				"hosted-git-info": {
-					"version": "2.8.8",
-					"bundled": true
-				},
-				"http-cache-semantics": {
-					"version": "3.8.1",
-					"bundled": true
-				},
-				"http-proxy-agent": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"agent-base": "4",
-						"debug": "3.1.0"
-					}
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"bundled": true,
-					"requires": {
-						"assert-plus": "^1.0.0",
-						"jsprim": "^1.2.2",
-						"sshpk": "^1.7.0"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "2.2.4",
-					"bundled": true,
-					"requires": {
-						"agent-base": "^4.3.0",
-						"debug": "^3.1.0"
-					}
-				},
-				"humanize-ms": {
-					"version": "1.2.1",
-					"bundled": true,
-					"requires": {
-						"ms": "^2.0.0"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.23",
-					"bundled": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"iferr": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"ignore-walk": {
-					"version": "3.0.3",
-					"bundled": true,
-					"requires": {
-						"minimatch": "^3.0.4"
-					}
-				},
-				"import-lazy": {
-					"version": "2.1.0",
-					"bundled": true
-				},
-				"imurmurhash": {
-					"version": "0.1.4",
-					"bundled": true
-				},
-				"infer-owner": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"bundled": true,
-					"requires": {
-						"once": "^1.3.0",
-						"wrappy": "1"
-					}
-				},
-				"inherits": {
-					"version": "2.0.4",
-					"bundled": true
-				},
-				"ini": {
-					"version": "1.3.8",
-					"bundled": true
-				},
-				"init-package-json": {
-					"version": "1.10.3",
-					"bundled": true,
-					"requires": {
-						"glob": "^7.1.1",
-						"npm-package-arg": "^4.0.0 || ^5.0.0 || ^6.0.0",
-						"promzard": "^0.3.0",
-						"read": "~1.0.1",
-						"read-package-json": "1 || 2",
-						"semver": "2.x || 3.x || 4 || 5",
-						"validate-npm-package-license": "^3.0.1",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"ip": {
-					"version": "1.1.5",
-					"bundled": true
-				},
-				"ip-regex": {
-					"version": "2.1.0",
-					"bundled": true
-				},
-				"is-callable": {
-					"version": "1.1.4",
-					"bundled": true
-				},
-				"is-ci": {
-					"version": "1.2.1",
-					"bundled": true,
-					"requires": {
-						"ci-info": "^1.5.0"
-					},
-					"dependencies": {
-						"ci-info": {
-							"version": "1.6.0",
-							"bundled": true
-						}
-					}
-				},
-				"is-cidr": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"cidr-regex": "^2.0.10"
-					}
-				},
-				"is-date-object": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"bundled": true,
-					"requires": {
-						"number-is-nan": "^1.0.0"
-					}
-				},
-				"is-installed-globally": {
-					"version": "0.1.0",
-					"bundled": true,
-					"requires": {
-						"global-dirs": "^0.1.0",
-						"is-path-inside": "^1.0.0"
-					}
-				},
-				"is-npm": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"is-obj": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"is-path-inside": {
-					"version": "1.0.1",
-					"bundled": true,
-					"requires": {
-						"path-is-inside": "^1.0.1"
-					}
-				},
-				"is-redirect": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"is-regex": {
-					"version": "1.0.4",
-					"bundled": true,
-					"requires": {
-						"has": "^1.0.1"
-					}
-				},
-				"is-retry-allowed": {
-					"version": "1.2.0",
-					"bundled": true
-				},
-				"is-stream": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"is-symbol": {
-					"version": "1.0.2",
-					"bundled": true,
-					"requires": {
-						"has-symbols": "^1.0.0"
-					}
-				},
-				"is-typedarray": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"isexe": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"isstream": {
-					"version": "0.1.2",
-					"bundled": true
-				},
-				"jsbn": {
-					"version": "0.1.1",
-					"bundled": true,
-					"optional": true
-				},
-				"json-parse-better-errors": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"json-schema": {
-					"version": "0.2.3",
-					"bundled": true
-				},
-				"json-stringify-safe": {
-					"version": "5.0.1",
-					"bundled": true
-				},
-				"jsonparse": {
-					"version": "1.3.1",
-					"bundled": true
-				},
-				"jsprim": {
-					"version": "1.4.1",
-					"bundled": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"extsprintf": "1.3.0",
-						"json-schema": "0.2.3",
-						"verror": "1.10.0"
-					}
-				},
-				"latest-version": {
-					"version": "3.1.0",
-					"bundled": true,
-					"requires": {
-						"package-json": "^4.0.0"
-					}
-				},
-				"lazy-property": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"libcipm": {
-					"version": "4.0.8",
-					"bundled": true,
-					"requires": {
-						"bin-links": "^1.1.2",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.5.1",
-						"find-npm-prefix": "^1.0.2",
-						"graceful-fs": "^4.1.11",
-						"ini": "^1.3.5",
-						"lock-verify": "^2.1.0",
-						"mkdirp": "^0.5.1",
-						"npm-lifecycle": "^3.0.0",
-						"npm-logical-tree": "^1.2.1",
-						"npm-package-arg": "^6.1.0",
-						"pacote": "^9.1.0",
-						"read-package-json": "^2.0.13",
-						"rimraf": "^2.6.2",
-						"worker-farm": "^1.6.0"
-					}
-				},
-				"libnpm": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"bin-links": "^1.1.2",
-						"bluebird": "^3.5.3",
-						"find-npm-prefix": "^1.0.2",
-						"libnpmaccess": "^3.0.2",
-						"libnpmconfig": "^1.2.1",
-						"libnpmhook": "^5.0.3",
-						"libnpmorg": "^1.0.1",
-						"libnpmpublish": "^1.1.2",
-						"libnpmsearch": "^2.0.2",
-						"libnpmteam": "^1.0.2",
-						"lock-verify": "^2.0.2",
-						"npm-lifecycle": "^3.0.0",
-						"npm-logical-tree": "^1.2.1",
-						"npm-package-arg": "^6.1.0",
-						"npm-profile": "^4.0.2",
-						"npm-registry-fetch": "^4.0.0",
-						"npmlog": "^4.1.2",
-						"pacote": "^9.5.3",
-						"read-package-json": "^2.0.13",
-						"stringify-package": "^1.0.0"
-					}
-				},
-				"libnpmaccess": {
-					"version": "3.0.2",
-					"bundled": true,
-					"requires": {
-						"aproba": "^2.0.0",
-						"get-stream": "^4.0.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"libnpmconfig": {
-					"version": "1.2.1",
-					"bundled": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"find-up": "^3.0.0",
-						"ini": "^1.3.5"
-					},
-					"dependencies": {
-						"find-up": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"locate-path": "^3.0.0"
-							}
-						},
-						"locate-path": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"p-locate": "^3.0.0",
-								"path-exists": "^3.0.0"
-							}
-						},
-						"p-limit": {
-							"version": "2.2.0",
-							"bundled": true,
-							"requires": {
-								"p-try": "^2.0.0"
-							}
-						},
-						"p-locate": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"p-limit": "^2.0.0"
-							}
-						},
-						"p-try": {
-							"version": "2.2.0",
-							"bundled": true
-						}
-					}
-				},
-				"libnpmhook": {
-					"version": "5.0.3",
-					"bundled": true,
-					"requires": {
-						"aproba": "^2.0.0",
-						"figgy-pudding": "^3.4.1",
-						"get-stream": "^4.0.0",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"libnpmorg": {
-					"version": "1.0.1",
-					"bundled": true,
-					"requires": {
-						"aproba": "^2.0.0",
-						"figgy-pudding": "^3.4.1",
-						"get-stream": "^4.0.0",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"libnpmpublish": {
-					"version": "1.1.2",
-					"bundled": true,
-					"requires": {
-						"aproba": "^2.0.0",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.0.0",
-						"lodash.clonedeep": "^4.5.0",
-						"normalize-package-data": "^2.4.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-registry-fetch": "^4.0.0",
-						"semver": "^5.5.1",
-						"ssri": "^6.0.1"
-					}
-				},
-				"libnpmsearch": {
-					"version": "2.0.2",
-					"bundled": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.0.0",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"libnpmteam": {
-					"version": "1.0.2",
-					"bundled": true,
-					"requires": {
-						"aproba": "^2.0.0",
-						"figgy-pudding": "^3.4.1",
-						"get-stream": "^4.0.0",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"libnpx": {
-					"version": "10.2.4",
-					"bundled": true,
-					"requires": {
-						"dotenv": "^5.0.1",
-						"npm-package-arg": "^6.0.0",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.0",
-						"update-notifier": "^2.3.0",
-						"which": "^1.3.0",
-						"y18n": "^4.0.0",
-						"yargs": "^14.2.3"
-					}
-				},
-				"lock-verify": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"npm-package-arg": "^6.1.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"lockfile": {
-					"version": "1.0.4",
-					"bundled": true,
-					"requires": {
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"lodash._baseindexof": {
-					"version": "3.1.0",
-					"bundled": true
-				},
-				"lodash._baseuniq": {
-					"version": "4.6.0",
-					"bundled": true,
-					"requires": {
-						"lodash._createset": "~4.0.0",
-						"lodash._root": "~3.0.0"
-					}
-				},
-				"lodash._bindcallback": {
-					"version": "3.0.1",
-					"bundled": true
-				},
-				"lodash._cacheindexof": {
-					"version": "3.0.2",
-					"bundled": true
-				},
-				"lodash._createcache": {
-					"version": "3.1.2",
-					"bundled": true,
-					"requires": {
-						"lodash._getnative": "^3.0.0"
-					}
-				},
-				"lodash._createset": {
-					"version": "4.0.3",
-					"bundled": true
-				},
-				"lodash._getnative": {
-					"version": "3.9.1",
-					"bundled": true
-				},
-				"lodash._root": {
-					"version": "3.0.1",
-					"bundled": true
-				},
-				"lodash.clonedeep": {
-					"version": "4.5.0",
-					"bundled": true
-				},
-				"lodash.restparam": {
-					"version": "3.6.1",
-					"bundled": true
-				},
-				"lodash.union": {
-					"version": "4.6.0",
-					"bundled": true
-				},
-				"lodash.uniq": {
-					"version": "4.5.0",
-					"bundled": true
-				},
-				"lodash.without": {
-					"version": "4.4.0",
-					"bundled": true
-				},
-				"lowercase-keys": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"lru-cache": {
-					"version": "5.1.1",
-					"bundled": true,
-					"requires": {
-						"yallist": "^3.0.2"
-					}
-				},
-				"make-dir": {
-					"version": "1.3.0",
-					"bundled": true,
-					"requires": {
-						"pify": "^3.0.0"
-					}
-				},
-				"make-fetch-happen": {
-					"version": "5.0.2",
-					"bundled": true,
-					"requires": {
-						"agentkeepalive": "^3.4.1",
-						"cacache": "^12.0.0",
-						"http-cache-semantics": "^3.8.1",
-						"http-proxy-agent": "^2.1.0",
-						"https-proxy-agent": "^2.2.3",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"node-fetch-npm": "^2.0.2",
-						"promise-retry": "^1.1.1",
-						"socks-proxy-agent": "^4.0.0",
-						"ssri": "^6.0.0"
-					}
-				},
-				"meant": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"mime-db": {
-					"version": "1.35.0",
-					"bundled": true
-				},
-				"mime-types": {
-					"version": "2.1.19",
-					"bundled": true,
-					"requires": {
-						"mime-db": "~1.35.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "1.2.5",
-					"bundled": true
-				},
-				"minizlib": {
-					"version": "1.3.3",
-					"bundled": true,
-					"requires": {
-						"minipass": "^2.9.0"
-					},
-					"dependencies": {
-						"minipass": {
-							"version": "2.9.0",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "^5.1.2",
-								"yallist": "^3.0.0"
-							}
-						}
-					}
-				},
-				"mississippi": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"concat-stream": "^1.5.0",
-						"duplexify": "^3.4.2",
-						"end-of-stream": "^1.1.0",
-						"flush-write-stream": "^1.0.0",
-						"from2": "^2.1.0",
-						"parallel-transform": "^1.1.0",
-						"pump": "^3.0.0",
-						"pumpify": "^1.3.3",
-						"stream-each": "^1.1.0",
-						"through2": "^2.0.0"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.5",
-					"bundled": true,
-					"requires": {
-						"minimist": "^1.2.5"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.5",
-							"bundled": true
-						}
-					}
-				},
-				"move-concurrently": {
-					"version": "1.0.1",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.1.1",
-						"copy-concurrently": "^1.0.0",
-						"fs-write-stream-atomic": "^1.0.8",
-						"mkdirp": "^0.5.1",
-						"rimraf": "^2.5.4",
-						"run-queue": "^1.0.3"
-					},
-					"dependencies": {
-						"aproba": {
-							"version": "1.2.0",
-							"bundled": true
-						}
-					}
-				},
-				"ms": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"mute-stream": {
-					"version": "0.0.7",
-					"bundled": true
-				},
-				"node-fetch-npm": {
-					"version": "2.0.2",
-					"bundled": true,
-					"requires": {
-						"encoding": "^0.1.11",
-						"json-parse-better-errors": "^1.0.0",
-						"safe-buffer": "^5.1.1"
-					}
-				},
-				"node-gyp": {
-					"version": "5.1.0",
-					"bundled": true,
-					"requires": {
-						"env-paths": "^2.2.0",
-						"glob": "^7.1.4",
-						"graceful-fs": "^4.2.2",
-						"mkdirp": "^0.5.1",
-						"nopt": "^4.0.1",
-						"npmlog": "^4.1.2",
-						"request": "^2.88.0",
-						"rimraf": "^2.6.3",
-						"semver": "^5.7.1",
-						"tar": "^4.4.12",
-						"which": "^1.3.1"
-					}
-				},
-				"nopt": {
-					"version": "4.0.3",
-					"bundled": true,
-					"requires": {
-						"abbrev": "1",
-						"osenv": "^0.1.4"
-					}
-				},
-				"normalize-package-data": {
-					"version": "2.5.0",
-					"bundled": true,
-					"requires": {
-						"hosted-git-info": "^2.1.4",
-						"resolve": "^1.10.0",
-						"semver": "2 || 3 || 4 || 5",
-						"validate-npm-package-license": "^3.0.1"
-					},
-					"dependencies": {
-						"resolve": {
-							"version": "1.10.0",
-							"bundled": true,
-							"requires": {
-								"path-parse": "^1.0.6"
-							}
-						}
-					}
-				},
-				"npm-audit-report": {
-					"version": "1.3.3",
-					"bundled": true,
-					"requires": {
-						"cli-table3": "^0.5.0",
-						"console-control-strings": "^1.1.0"
-					}
-				},
-				"npm-bundled": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"npm-normalize-package-bin": "^1.0.1"
-					}
-				},
-				"npm-cache-filename": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"npm-install-checks": {
-					"version": "3.0.2",
-					"bundled": true,
-					"requires": {
-						"semver": "^2.3.0 || 3.x || 4 || 5"
-					}
-				},
-				"npm-lifecycle": {
-					"version": "3.1.5",
-					"bundled": true,
-					"requires": {
-						"byline": "^5.0.0",
-						"graceful-fs": "^4.1.15",
-						"node-gyp": "^5.0.2",
-						"resolve-from": "^4.0.0",
-						"slide": "^1.1.6",
-						"uid-number": "0.0.6",
-						"umask": "^1.1.0",
-						"which": "^1.3.1"
-					}
-				},
-				"npm-logical-tree": {
-					"version": "1.2.1",
-					"bundled": true
-				},
-				"npm-normalize-package-bin": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"npm-package-arg": {
-					"version": "6.1.1",
-					"bundled": true,
-					"requires": {
-						"hosted-git-info": "^2.7.1",
-						"osenv": "^0.1.5",
-						"semver": "^5.6.0",
-						"validate-npm-package-name": "^3.0.0"
-					}
-				},
-				"npm-packlist": {
-					"version": "1.4.8",
-					"bundled": true,
-					"requires": {
-						"ignore-walk": "^3.0.1",
-						"npm-bundled": "^1.0.1",
-						"npm-normalize-package-bin": "^1.0.1"
-					}
-				},
-				"npm-pick-manifest": {
-					"version": "3.0.2",
-					"bundled": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1",
-						"npm-package-arg": "^6.0.0",
-						"semver": "^5.4.1"
-					}
-				},
-				"npm-profile": {
-					"version": "4.0.4",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.1.2 || 2",
-						"figgy-pudding": "^3.4.1",
-						"npm-registry-fetch": "^4.0.0"
-					}
-				},
-				"npm-registry-fetch": {
-					"version": "4.0.7",
-					"bundled": true,
-					"requires": {
-						"JSONStream": "^1.3.4",
-						"bluebird": "^3.5.1",
-						"figgy-pudding": "^3.4.1",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^5.0.0",
-						"npm-package-arg": "^6.1.0",
-						"safe-buffer": "^5.2.0"
-					},
-					"dependencies": {
-						"safe-buffer": {
-							"version": "5.2.1",
-							"bundled": true
-						}
-					}
-				},
-				"npm-run-path": {
-					"version": "2.0.2",
-					"bundled": true,
-					"requires": {
-						"path-key": "^2.0.0"
-					}
-				},
-				"npm-user-validate": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"npmlog": {
-					"version": "4.1.2",
-					"bundled": true,
-					"requires": {
-						"are-we-there-yet": "~1.1.2",
-						"console-control-strings": "~1.1.0",
-						"gauge": "~2.7.3",
-						"set-blocking": "~2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"oauth-sign": {
-					"version": "0.9.0",
-					"bundled": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"bundled": true
-				},
-				"object-keys": {
-					"version": "1.0.12",
-					"bundled": true
-				},
-				"object.getownpropertydescriptors": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"define-properties": "^1.1.2",
-						"es-abstract": "^1.5.1"
-					}
-				},
-				"once": {
-					"version": "1.4.0",
-					"bundled": true,
-					"requires": {
-						"wrappy": "1"
-					}
-				},
-				"opener": {
-					"version": "1.5.2",
-					"bundled": true
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"osenv": {
-					"version": "0.1.5",
-					"bundled": true,
-					"requires": {
-						"os-homedir": "^1.0.0",
-						"os-tmpdir": "^1.0.0"
-					}
-				},
-				"p-finally": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"package-json": {
-					"version": "4.0.1",
-					"bundled": true,
-					"requires": {
-						"got": "^6.7.1",
-						"registry-auth-token": "^3.0.1",
-						"registry-url": "^3.0.3",
-						"semver": "^5.1.0"
-					}
-				},
-				"pacote": {
-					"version": "9.5.12",
-					"bundled": true,
-					"requires": {
-						"bluebird": "^3.5.3",
-						"cacache": "^12.0.2",
-						"chownr": "^1.1.2",
-						"figgy-pudding": "^3.5.1",
-						"get-stream": "^4.1.0",
-						"glob": "^7.1.3",
-						"infer-owner": "^1.0.4",
-						"lru-cache": "^5.1.1",
-						"make-fetch-happen": "^5.0.0",
-						"minimatch": "^3.0.4",
-						"minipass": "^2.3.5",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"normalize-package-data": "^2.4.0",
-						"npm-normalize-package-bin": "^1.0.0",
-						"npm-package-arg": "^6.1.0",
-						"npm-packlist": "^1.1.12",
-						"npm-pick-manifest": "^3.0.0",
-						"npm-registry-fetch": "^4.0.0",
-						"osenv": "^0.1.5",
-						"promise-inflight": "^1.0.1",
-						"promise-retry": "^1.1.1",
-						"protoduck": "^5.0.1",
-						"rimraf": "^2.6.2",
-						"safe-buffer": "^5.1.2",
-						"semver": "^5.6.0",
-						"ssri": "^6.0.1",
-						"tar": "^4.4.10",
-						"unique-filename": "^1.1.1",
-						"which": "^1.3.1"
-					},
-					"dependencies": {
-						"minipass": {
-							"version": "2.9.0",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "^5.1.2",
-								"yallist": "^3.0.0"
-							}
-						}
-					}
-				},
-				"parallel-transform": {
-					"version": "1.1.0",
-					"bundled": true,
-					"requires": {
-						"cyclist": "~0.2.2",
-						"inherits": "^2.0.3",
-						"readable-stream": "^2.1.5"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"path-exists": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"path-is-inside": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"path-key": {
-					"version": "2.0.1",
-					"bundled": true
-				},
-				"path-parse": {
-					"version": "1.0.6",
-					"bundled": true
-				},
-				"performance-now": {
-					"version": "2.1.0",
-					"bundled": true
-				},
-				"pify": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"prepend-http": {
-					"version": "1.0.4",
-					"bundled": true
-				},
-				"process-nextick-args": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"promise-inflight": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"promise-retry": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"err-code": "^1.0.0",
-						"retry": "^0.10.0"
-					},
-					"dependencies": {
-						"retry": {
-							"version": "0.10.1",
-							"bundled": true
-						}
-					}
-				},
-				"promzard": {
-					"version": "0.3.0",
-					"bundled": true,
-					"requires": {
-						"read": "1"
-					}
-				},
-				"proto-list": {
-					"version": "1.2.4",
-					"bundled": true
-				},
-				"protoduck": {
-					"version": "5.0.1",
-					"bundled": true,
-					"requires": {
-						"genfun": "^5.0.0"
-					}
-				},
-				"prr": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"pseudomap": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"psl": {
-					"version": "1.1.29",
-					"bundled": true
-				},
-				"pump": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
-				"pumpify": {
-					"version": "1.5.1",
-					"bundled": true,
-					"requires": {
-						"duplexify": "^3.6.0",
-						"inherits": "^2.0.3",
-						"pump": "^2.0.0"
-					},
-					"dependencies": {
-						"pump": {
-							"version": "2.0.1",
-							"bundled": true,
-							"requires": {
-								"end-of-stream": "^1.1.0",
-								"once": "^1.3.1"
-							}
-						}
-					}
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"bundled": true
-				},
-				"qrcode-terminal": {
-					"version": "0.12.0",
-					"bundled": true
-				},
-				"qs": {
-					"version": "6.5.2",
-					"bundled": true
-				},
-				"query-string": {
-					"version": "6.8.2",
-					"bundled": true,
-					"requires": {
-						"decode-uri-component": "^0.2.0",
-						"split-on-first": "^1.0.0",
-						"strict-uri-encode": "^2.0.0"
-					}
-				},
-				"qw": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"rc": {
-					"version": "1.2.8",
-					"bundled": true,
-					"requires": {
-						"deep-extend": "^0.6.0",
-						"ini": "~1.3.0",
-						"minimist": "^1.2.0",
-						"strip-json-comments": "~2.0.1"
-					}
-				},
-				"read": {
-					"version": "1.0.7",
-					"bundled": true,
-					"requires": {
-						"mute-stream": "~0.0.4"
-					}
-				},
-				"read-cmd-shim": {
-					"version": "1.0.5",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.2"
-					}
-				},
-				"read-installed": {
-					"version": "4.0.3",
-					"bundled": true,
-					"requires": {
-						"debuglog": "^1.0.1",
-						"graceful-fs": "^4.1.2",
-						"read-package-json": "^2.0.0",
-						"readdir-scoped-modules": "^1.0.0",
-						"semver": "2 || 3 || 4 || 5",
-						"slide": "~1.1.3",
-						"util-extend": "^1.0.1"
-					}
-				},
-				"read-package-json": {
-					"version": "2.1.1",
-					"bundled": true,
-					"requires": {
-						"glob": "^7.1.1",
-						"graceful-fs": "^4.1.2",
-						"json-parse-better-errors": "^1.0.1",
-						"normalize-package-data": "^2.0.0",
-						"npm-normalize-package-bin": "^1.0.0"
-					}
-				},
-				"read-package-tree": {
-					"version": "5.3.1",
-					"bundled": true,
-					"requires": {
-						"read-package-json": "^2.0.0",
-						"readdir-scoped-modules": "^1.0.0",
-						"util-promisify": "^2.1.0"
-					}
-				},
-				"readable-stream": {
-					"version": "3.6.0",
-					"bundled": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				},
-				"readdir-scoped-modules": {
-					"version": "1.1.0",
-					"bundled": true,
-					"requires": {
-						"debuglog": "^1.0.1",
-						"dezalgo": "^1.0.0",
-						"graceful-fs": "^4.1.2",
-						"once": "^1.3.0"
-					}
-				},
-				"registry-auth-token": {
-					"version": "3.4.0",
-					"bundled": true,
-					"requires": {
-						"rc": "^1.1.6",
-						"safe-buffer": "^5.0.1"
-					}
-				},
-				"registry-url": {
-					"version": "3.1.0",
-					"bundled": true,
-					"requires": {
-						"rc": "^1.0.1"
-					}
-				},
-				"request": {
-					"version": "2.88.0",
-					"bundled": true,
-					"requires": {
-						"aws-sign2": "~0.7.0",
-						"aws4": "^1.8.0",
-						"caseless": "~0.12.0",
-						"combined-stream": "~1.0.6",
-						"extend": "~3.0.2",
-						"forever-agent": "~0.6.1",
-						"form-data": "~2.3.2",
-						"har-validator": "~5.1.0",
-						"http-signature": "~1.2.0",
-						"is-typedarray": "~1.0.0",
-						"isstream": "~0.1.2",
-						"json-stringify-safe": "~5.0.1",
-						"mime-types": "~2.1.19",
-						"oauth-sign": "~0.9.0",
-						"performance-now": "^2.1.0",
-						"qs": "~6.5.2",
-						"safe-buffer": "^5.1.2",
-						"tough-cookie": "~2.4.3",
-						"tunnel-agent": "^0.6.0",
-						"uuid": "^3.3.2"
-					}
-				},
-				"require-directory": {
-					"version": "2.1.1",
-					"bundled": true
-				},
-				"require-main-filename": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"resolve-from": {
-					"version": "4.0.0",
-					"bundled": true
-				},
-				"retry": {
-					"version": "0.12.0",
-					"bundled": true
-				},
-				"rimraf": {
-					"version": "2.7.1",
-					"bundled": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"run-queue": {
-					"version": "1.0.3",
-					"bundled": true,
-					"requires": {
-						"aproba": "^1.1.1"
-					},
-					"dependencies": {
-						"aproba": {
-							"version": "1.2.0",
-							"bundled": true
-						}
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"bundled": true
-				},
-				"safer-buffer": {
-					"version": "2.1.2",
-					"bundled": true
-				},
-				"semver": {
-					"version": "5.7.1",
-					"bundled": true
-				},
-				"semver-diff": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"semver": "^5.0.3"
-					}
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"sha": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.2"
-					}
-				},
-				"shebang-command": {
-					"version": "1.2.0",
-					"bundled": true,
-					"requires": {
-						"shebang-regex": "^1.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"bundled": true
-				},
-				"slide": {
-					"version": "1.1.6",
-					"bundled": true
-				},
-				"smart-buffer": {
-					"version": "4.1.0",
-					"bundled": true
-				},
-				"socks": {
-					"version": "2.3.3",
-					"bundled": true,
-					"requires": {
-						"ip": "1.1.5",
-						"smart-buffer": "^4.1.0"
-					}
-				},
-				"socks-proxy-agent": {
-					"version": "4.0.2",
-					"bundled": true,
-					"requires": {
-						"agent-base": "~4.2.1",
-						"socks": "~2.3.2"
-					},
-					"dependencies": {
-						"agent-base": {
-							"version": "4.2.1",
-							"bundled": true,
-							"requires": {
-								"es6-promisify": "^5.0.0"
-							}
-						}
-					}
-				},
-				"sorted-object": {
-					"version": "2.0.1",
-					"bundled": true
-				},
-				"sorted-union-stream": {
-					"version": "2.1.3",
-					"bundled": true,
-					"requires": {
-						"from2": "^1.3.0",
-						"stream-iterate": "^1.1.0"
-					},
-					"dependencies": {
-						"from2": {
-							"version": "1.3.0",
-							"bundled": true,
-							"requires": {
-								"inherits": "~2.0.1",
-								"readable-stream": "~1.1.10"
-							}
-						},
-						"isarray": {
-							"version": "0.0.1",
-							"bundled": true
-						},
-						"readable-stream": {
-							"version": "1.1.14",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.1",
-								"isarray": "0.0.1",
-								"string_decoder": "~0.10.x"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"bundled": true
-						}
-					}
-				},
-				"spdx-correct": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"spdx-expression-parse": "^3.0.0",
-						"spdx-license-ids": "^3.0.0"
-					}
-				},
-				"spdx-exceptions": {
-					"version": "2.1.0",
-					"bundled": true
-				},
-				"spdx-expression-parse": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"spdx-exceptions": "^2.1.0",
-						"spdx-license-ids": "^3.0.0"
-					}
-				},
-				"spdx-license-ids": {
-					"version": "3.0.5",
-					"bundled": true
-				},
-				"split-on-first": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"sshpk": {
-					"version": "1.14.2",
-					"bundled": true,
-					"requires": {
-						"asn1": "~0.2.3",
-						"assert-plus": "^1.0.0",
-						"bcrypt-pbkdf": "^1.0.0",
-						"dashdash": "^1.12.0",
-						"ecc-jsbn": "~0.1.1",
-						"getpass": "^0.1.1",
-						"jsbn": "~0.1.0",
-						"safer-buffer": "^2.0.2",
-						"tweetnacl": "~0.14.0"
-					}
-				},
-				"ssri": {
-					"version": "6.0.1",
-					"bundled": true,
-					"requires": {
-						"figgy-pudding": "^3.5.1"
-					}
-				},
-				"stream-each": {
-					"version": "1.2.2",
-					"bundled": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"stream-shift": "^1.0.0"
-					}
-				},
-				"stream-iterate": {
-					"version": "1.2.0",
-					"bundled": true,
-					"requires": {
-						"readable-stream": "^2.1.5",
-						"stream-shift": "^1.0.0"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"stream-shift": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"strict-uri-encode": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"bundled": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "3.0.0",
-							"bundled": true
-						},
-						"is-fullwidth-code-point": {
-							"version": "2.0.0",
-							"bundled": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"bundled": true,
-							"requires": {
-								"ansi-regex": "^3.0.0"
-							}
-						}
-					}
-				},
-				"string_decoder": {
-					"version": "1.3.0",
-					"bundled": true,
-					"requires": {
-						"safe-buffer": "~5.2.0"
-					},
-					"dependencies": {
-						"safe-buffer": {
-							"version": "5.2.0",
-							"bundled": true
-						}
-					}
-				},
-				"stringify-package": {
-					"version": "1.0.1",
-					"bundled": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"strip-eof": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"bundled": true
-				},
-				"supports-color": {
-					"version": "5.4.0",
-					"bundled": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"tar": {
-					"version": "4.4.13",
-					"bundled": true,
-					"requires": {
-						"chownr": "^1.1.1",
-						"fs-minipass": "^1.2.5",
-						"minipass": "^2.8.6",
-						"minizlib": "^1.2.1",
-						"mkdirp": "^0.5.0",
-						"safe-buffer": "^5.1.2",
-						"yallist": "^3.0.3"
-					},
-					"dependencies": {
-						"minipass": {
-							"version": "2.9.0",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "^5.1.2",
-								"yallist": "^3.0.0"
-							}
-						}
-					}
-				},
-				"term-size": {
-					"version": "1.2.0",
-					"bundled": true,
-					"requires": {
-						"execa": "^0.7.0"
-					}
-				},
-				"text-table": {
-					"version": "0.2.0",
-					"bundled": true
-				},
-				"through": {
-					"version": "2.3.8",
-					"bundled": true
-				},
-				"through2": {
-					"version": "2.0.3",
-					"bundled": true,
-					"requires": {
-						"readable-stream": "^2.1.5",
-						"xtend": "~4.0.1"
-					},
-					"dependencies": {
-						"readable-stream": {
-							"version": "2.3.6",
-							"bundled": true,
-							"requires": {
-								"core-util-is": "~1.0.0",
-								"inherits": "~2.0.3",
-								"isarray": "~1.0.0",
-								"process-nextick-args": "~2.0.0",
-								"safe-buffer": "~5.1.1",
-								"string_decoder": "~1.1.1",
-								"util-deprecate": "~1.0.1"
-							}
-						},
-						"string_decoder": {
-							"version": "1.1.1",
-							"bundled": true,
-							"requires": {
-								"safe-buffer": "~5.1.0"
-							}
-						}
-					}
-				},
-				"timed-out": {
-					"version": "4.0.1",
-					"bundled": true
-				},
-				"tiny-relative-date": {
-					"version": "1.3.0",
-					"bundled": true
-				},
-				"tough-cookie": {
-					"version": "2.4.3",
-					"bundled": true,
-					"requires": {
-						"psl": "^1.1.24",
-						"punycode": "^1.4.1"
-					}
-				},
-				"tunnel-agent": {
-					"version": "0.6.0",
-					"bundled": true,
-					"requires": {
-						"safe-buffer": "^5.0.1"
-					}
-				},
-				"tweetnacl": {
-					"version": "0.14.5",
-					"bundled": true,
-					"optional": true
-				},
-				"typedarray": {
-					"version": "0.0.6",
-					"bundled": true
-				},
-				"uid-number": {
-					"version": "0.0.6",
-					"bundled": true
-				},
-				"umask": {
-					"version": "1.1.0",
-					"bundled": true
-				},
-				"unique-filename": {
-					"version": "1.1.1",
-					"bundled": true,
-					"requires": {
-						"unique-slug": "^2.0.0"
-					}
-				},
-				"unique-slug": {
-					"version": "2.0.0",
-					"bundled": true,
-					"requires": {
-						"imurmurhash": "^0.1.4"
-					}
-				},
-				"unique-string": {
-					"version": "1.0.0",
-					"bundled": true,
-					"requires": {
-						"crypto-random-string": "^1.0.0"
-					}
-				},
-				"unpipe": {
-					"version": "1.0.0",
-					"bundled": true
-				},
-				"unzip-response": {
-					"version": "2.0.1",
-					"bundled": true
-				},
-				"update-notifier": {
-					"version": "2.5.0",
-					"bundled": true,
-					"requires": {
-						"boxen": "^1.2.1",
-						"chalk": "^2.0.1",
-						"configstore": "^3.0.0",
-						"import-lazy": "^2.1.0",
-						"is-ci": "^1.0.10",
-						"is-installed-globally": "^0.1.0",
-						"is-npm": "^1.0.0",
-						"latest-version": "^3.0.0",
-						"semver-diff": "^2.0.0",
-						"xdg-basedir": "^3.0.0"
-					}
-				},
-				"uri-js": {
-					"version": "4.4.0",
-					"bundled": true,
-					"requires": {
-						"punycode": "^2.1.0"
-					},
-					"dependencies": {
-						"punycode": {
-							"version": "2.1.1",
-							"bundled": true
-						}
-					}
-				},
-				"url-parse-lax": {
-					"version": "1.0.0",
-					"bundled": true,
-					"requires": {
-						"prepend-http": "^1.0.1"
-					}
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"util-extend": {
-					"version": "1.0.3",
-					"bundled": true
-				},
-				"util-promisify": {
-					"version": "2.1.0",
-					"bundled": true,
-					"requires": {
-						"object.getownpropertydescriptors": "^2.0.3"
-					}
-				},
-				"uuid": {
-					"version": "3.3.3",
-					"bundled": true
-				},
-				"validate-npm-package-license": {
-					"version": "3.0.4",
-					"bundled": true,
-					"requires": {
-						"spdx-correct": "^3.0.0",
-						"spdx-expression-parse": "^3.0.0"
-					}
-				},
-				"validate-npm-package-name": {
-					"version": "3.0.0",
-					"bundled": true,
-					"requires": {
-						"builtins": "^1.0.3"
-					}
-				},
-				"verror": {
-					"version": "1.10.0",
-					"bundled": true,
-					"requires": {
-						"assert-plus": "^1.0.0",
-						"core-util-is": "1.0.2",
-						"extsprintf": "^1.2.0"
-					}
-				},
-				"wcwidth": {
-					"version": "1.0.1",
-					"bundled": true,
-					"requires": {
-						"defaults": "^1.0.3"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"bundled": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"which-module": {
-					"version": "2.0.0",
-					"bundled": true
-				},
-				"wide-align": {
-					"version": "1.1.2",
-					"bundled": true,
-					"requires": {
-						"string-width": "^1.0.2"
-					},
-					"dependencies": {
-						"string-width": {
-							"version": "1.0.2",
-							"bundled": true,
-							"requires": {
-								"code-point-at": "^1.0.0",
-								"is-fullwidth-code-point": "^1.0.0",
-								"strip-ansi": "^3.0.0"
-							}
-						}
-					}
-				},
-				"widest-line": {
-					"version": "2.0.1",
-					"bundled": true,
-					"requires": {
-						"string-width": "^2.1.1"
-					}
-				},
-				"worker-farm": {
-					"version": "1.7.0",
-					"bundled": true,
-					"requires": {
-						"errno": "~0.1.7"
-					}
-				},
-				"wrap-ansi": {
-					"version": "5.1.0",
-					"bundled": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.0",
-							"bundled": true
-						},
-						"is-fullwidth-code-point": {
-							"version": "2.0.0",
-							"bundled": true
-						},
-						"string-width": {
-							"version": "3.1.0",
-							"bundled": true,
-							"requires": {
-								"emoji-regex": "^7.0.1",
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^5.1.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"bundled": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"bundled": true
-				},
-				"write-file-atomic": {
-					"version": "2.4.3",
-					"bundled": true,
-					"requires": {
-						"graceful-fs": "^4.1.11",
-						"imurmurhash": "^0.1.4",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"xdg-basedir": {
-					"version": "3.0.0",
-					"bundled": true
-				},
-				"xtend": {
-					"version": "4.0.1",
-					"bundled": true
-				},
-				"y18n": {
-					"version": "4.0.1",
-					"bundled": true
-				},
-				"yallist": {
-					"version": "3.0.3",
-					"bundled": true
-				},
-				"yargs": {
-					"version": "14.2.3",
-					"bundled": true,
-					"requires": {
-						"cliui": "^5.0.0",
-						"decamelize": "^1.2.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^3.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^15.0.1"
-					},
-					"dependencies": {
-						"ansi-regex": {
-							"version": "4.1.0",
-							"bundled": true
-						},
-						"find-up": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"locate-path": "^3.0.0"
-							}
-						},
-						"is-fullwidth-code-point": {
-							"version": "2.0.0",
-							"bundled": true
-						},
-						"locate-path": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"p-locate": "^3.0.0",
-								"path-exists": "^3.0.0"
-							}
-						},
-						"p-limit": {
-							"version": "2.3.0",
-							"bundled": true,
-							"requires": {
-								"p-try": "^2.0.0"
-							}
-						},
-						"p-locate": {
-							"version": "3.0.0",
-							"bundled": true,
-							"requires": {
-								"p-limit": "^2.0.0"
-							}
-						},
-						"p-try": {
-							"version": "2.2.0",
-							"bundled": true
-						},
-						"string-width": {
-							"version": "3.1.0",
-							"bundled": true,
-							"requires": {
-								"emoji-regex": "^7.0.1",
-								"is-fullwidth-code-point": "^2.0.0",
-								"strip-ansi": "^5.1.0"
-							}
-						},
-						"strip-ansi": {
-							"version": "5.2.0",
-							"bundled": true,
-							"requires": {
-								"ansi-regex": "^4.1.0"
-							}
-						}
-					}
-				},
-				"yargs-parser": {
-					"version": "15.0.1",
-					"bundled": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					},
-					"dependencies": {
-						"camelcase": {
-							"version": "5.3.1",
-							"bundled": true
-						}
-					}
-				}
-			}
-		},
 		"npm-bundled": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",

From 8d0f990772258be7fee4ce623591a8484b8a9d26 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 13:31:07 +0300
Subject: [PATCH 16/24] attempt to simplify previous implementation

---
 lib/class-wp-theme-json.php         |  61 -----------
 lib/full-site-editing/templates.php | 164 ++++++++++++----------------
 2 files changed, 70 insertions(+), 155 deletions(-)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index e6b5af744c6221..a88caa25d898b5 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -149,11 +149,6 @@ class WP_Theme_JSON {
 			'custom'     => null,
 			'layout'     => null,
 		),
-		'skipLinks'       => array(
-			'links'  => null,
-			'auto'   => null,
-			'css'    => null,
-		),
 	);
 
 	/**
@@ -984,62 +979,6 @@ public function get_template_parts() {
 		return $template_parts;
 	}
 
-	/**
-	 * Return an array of skip-links.
-	 *
-	 * @return array
-	 */
-	public function get_skip_links() {
-
-		$fallback_elements = array(
-			'#skip-link-target',
-			'main',
-			'.wp-block-post-title',
-			'.wp-block-query-loop',
-			'.wp-block-post-content',
-			'.entry-content',
-			'h1',
-			'h2',
-		);
-
-		// If we don't have "skipLinks" defined return the defaults.
-		if ( ! isset( $this->theme_json['skipLinks'] ) ) {
-			return array(
-				array(
-					'target'       => $fallback_elements,
-					'label'        => __( 'Skip to content', 'gutenberg' ),
-					'useFallbacks' => false,
-				),
-			);
-		}
-
-		if ( isset( $this->theme_json['skipLinks']['auto'] ) && false === $this->theme_json['skipLinks']['auto'] ) {
-			return;
-		}
-
-		$links = array();
-		foreach ( $this->theme_json['skipLinks']['links'] as $link ) {
-			$selectors = isset( $link['target'] ) ? (array) $link['target'] : array();
-			if ( ! isset( $link['useFallbacks'] ) || $link['useFallbacks'] ) {
-				$selectors = array_unique( array_merge( $selectors, $fallback_elements ) );
-			}
-			$links[] = array(
-				'target' => array_values( $selectors ), // Use array_values to ensure there are no skipped keys in the array.
-				'label'  => isset( $link['label'] ) ? $link['label'] : __( 'Skip to content', 'gutenberg' ),
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Whether the skip-link styles should be automatically added or not.
-	 *
-	 * @return string
-	 */
-	public function should_add_skip_link_styles() {
-		return ! isset( $this->theme_json['skipLinks'] ) || ! empty( $this->theme_json['skipLinks']['css'] );
-	}
-
 	/**
 	 * Returns the stylesheet that results of processing
 	 * the theme.json structure this object represents.
diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index f83728c0ff2ee5..5f150775a1e9c7 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -194,116 +194,92 @@ function set_unique_slug_on_create_template( $post_id ) {
 add_action( 'save_post_wp_template', 'set_unique_slug_on_create_template' );
 
 /**
- * Inject the skip-link.
+ * Print the skip-link script & styles.
+ *
+ * @return void
  */
-function gutenberg_inject_skip_link() {
-	global $template_html, $skip_links_via_script;
-
-	$skip_links_via_script = array();
-
-	// Add the skip-link styles if needed.
-	if ( WP_Theme_JSON_Resolver::get_theme_data()->should_add_skip_link_styles() ) {
-		echo '<style id="skip-link-styles">';
-		echo '.skip-link.screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute !important;width:1px;word-wrap:normal !important;}';
-		echo '.skip-link.screen-reader-text:focus{background-color:#eee;clip:auto !important;clip-path:none;color:#444;display:block;font-size:1em;height:auto;left:5px;line-height:normal;padding:15px 23px 14px;text-decoration:none;top:5px;width:auto;z-index:100000;}';
-		echo '</style>';
-	}
-
-	// Get the array of skip-links.
-	$links = WP_Theme_JSON_Resolver::get_theme_data()->get_skip_links();
+function gutenberg_the_skip_link() {
 
-	// Sanity check.
-	if ( empty( $links ) || ! $template_html ) {
+	// Early exit if not an FSE theme.
+	if ( ! gutenberg_is_fse_theme() ) {
 		return;
 	}
+	?>
 
-	// Loop links.
-	foreach ( $links as $link ) {
-		$element_found = false;
-		// Try to find the selector in $template_html and print the skip-link.
-		foreach ( $link['target'] as $selector ) {
-			if ( 0 === strpos( $selector, '#' ) ) {
-				$selector_no_hash = str_replace( '#', '', $selector );
-				if ( strpos( $template_html, 'id="' . $selector_no_hash . '"' ) || strpos( $template_html, "id='$selector_no_hash'" ) ) {
-					echo '<a id="wp--skip-link--' . esc_attr( $selector_no_hash ) . '" class="skip-link screen-reader-text" href="' . esc_attr( $selector ) . '">' . esc_html( $link['label'] ) . '</a>';
-					$element_found = true;
-					break;
-				}
-			}
+	<?php
+	/**
+	 * Print the skip-link styles.
+	 */
+	?>
+	<style id="skip-link-styles">
+		.skip-link.screen-reader-text {
+			border: 0;
+			clip: rect(1px,1px,1px,1px);
+			clip-path: inset(50%);
+			height: 1px;
+			margin: -1px;
+			overflow: hidden;
+			padding: 0;
+			position: absolute !important;
+			width: 1px;
+			word-wrap: normal !important;
 		}
 
-		if ( ! $element_found ) {
-			// Add the skip-link to the $skip_links_via_script global.
-			$skip_links_via_script[] = $link;
+		.skip-link.screen-reader-text:focus {
+			background-color: #eee;
+			clip: auto !important;
+			clip-path: none;
+			color: #444;
+			display: block;
+			font-size: 1em;
+			height: auto;
+			left: 5px;
+			line-height: normal;
+			padding: 15px 23px 14px;
+			text-decoration: none;
+			top: 5px;
+			width: auto;
+			z-index: 100000;
 		}
-	}
-
-	if ( ! empty( $skip_links_via_script ) ) {
-		// An element with the appropriate target ID was not located.
-		// Add a script to auto-generate the target and link based on the content we have.
-		add_action( 'wp_footer', 'gutenberg_the_skip_link_script' );
-	}
-}
-add_action( 'wp_body_open', 'gutenberg_inject_skip_link' );
-
-/**
- * Print the skip-link script.
- *
- * @return void
- */
-function gutenberg_the_skip_link_script() {
-
-	// Get the links.
-	global $skip_links_via_script;
-
-	// Sanity check.
-	if ( empty( $skip_links_via_script ) ) {
-		return;
-	}
+	</style>
+	<?php
+	/**
+	 * Print the skip-link script.
+	 */
 	?>
 	<script>
 	( function() {
-		var links = <?php echo wp_json_encode( array_reverse( $skip_links_via_script ) ); // phpcs:ignore WordPress.Security.EscapeOutput ?>,
-			parentEl = document.querySelector( '.wp-site-blocks' ) || document.body,
-			generateLink = function( selectors, label, parent ) {
-				var contentEl, contentElID, skipLink, i;
-
-				// Find the content element.
-				for ( i = 0; i < selectors.length; i++ ) {
-					if ( ! contentEl ) {
-						contentEl = document.querySelector( selectors[ i ] );
-					}
-				}
-
-				// Early exit if no content element was found.
-				if ( ! contentEl ) {
-					return;
-				}
-
-				// Get the ID of the content element.
-				contentElID = contentEl.id;
-				if ( ! contentElID ) {
-					contentElID = 'auto-skip-link-target';
-					contentEl.id = contentElID;
-				}
-
-				// Create the skip link.
-				skipLink = document.createElement( 'a' );
-				skipLink.classList.add( 'skip-link', 'screen-reader-text' );
-				skipLink.href = '#' + contentElID;
-				skipLink.innerHTML = label;
-				skipLink.id = 'wp--skip-link--' + contentElID;
+		var skipLinkTarget = document.querySelector( 'main' ),
+			parentEl,
+			skipLinkTargetID,
+			skipLink;
+
+		// Early exit if a skip-link target can't be located.
+		if ( ! skipLinkTarget ) {
+			return;
+		}
 
-				// Inject the skip link.
-				parent.insertAdjacentElement( 'afterbegin', skipLink );
-			},
-			i;
+		// Get the site wrapper.
+		// The skip-link will be injected in the beginning of it.
+		parentEl = document.querySelector( '.wp-site-blocks' ) || document.body,
 
-		for ( i = 0; i < links.length; i++ ) {
-			generateLink( links[ i ]['target'], links[ i ]['label'], parentEl );
+		// Get the skip-link target's ID, and generate one if it doesn't exist.
+		skipLinkTargetID = skipLinkTarget.id;
+		if ( ! skipLinkTargetID ) {
+			skipLinkTargetID = 'wp--skip-link--target';
+			skipLinkTarget.id = skipLinkTargetID;
 		}
 
+		// Create the skip link.
+		skipLink = document.createElement( 'a' );
+		skipLink.classList.add( 'skip-link', 'screen-reader-text' );
+		skipLink.href = '#' + skipLinkTargetID;
+		skipLink.innerHTML = label;
+
+		// Inject the skip link.
+		parentEl.insertAdjacentElement( 'afterbegin', skipLink );
 	}() );
 	</script>
 	<?php
 }
+add_action( 'wp_footer', 'gutenberg_the_skip_link' );

From 9c8be3d7e089f711c956c2c9eac36053e7bcabe6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 13:32:33 +0300
Subject: [PATCH 17/24] more merge-conflicts

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fbdda75925e2ce..d51d6d58864bb9 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,7 @@
 		"@wordpress/url": "file:packages/url",
 		"@wordpress/viewport": "file:packages/viewport",
 		"@wordpress/warning": "file:packages/warning",
-		"@wordpress/wordcount": "file:packages/wordcount",
-		"npm": "6.14.12"
+		"@wordpress/wordcount": "file:packages/wordcount"
 	},
 	"devDependencies": {
 		"@actions/core": "1.2.6",

From 15a8543adadf3859afe7b0163b169d0e93e3679e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 13:45:52 +0300
Subject: [PATCH 18/24] No docs tweaks needed

---
 docs/how-to-guides/themes/theme-json.md | 32 -------------------------
 1 file changed, 32 deletions(-)

diff --git a/docs/how-to-guides/themes/theme-json.md b/docs/how-to-guides/themes/theme-json.md
index 000cd2f9681694..39d61730386f9e 100644
--- a/docs/how-to-guides/themes/theme-json.md
+++ b/docs/how-to-guides/themes/theme-json.md
@@ -479,38 +479,6 @@ Currently block variations exist for "header" and "footer" values of the area te
 }
 ```
 
-#### `skipLinks`
-
-Within this field, themes can change the behavior of the automatic skip-link generation, or opt-out.
-
-```json
-{
-	"skipLinks": {
-		"auto": true,
-		"css": true,
-		"links": [
-			{
-				"target": "#skip-link-target",
-				"label": "Skip to Content"
-			},
-			{
-				"target": "#main-navigation",
-				"label": "Skip to Navigation",
-				"useFallbacks": false
-			}
-		]
-	}
-}
-```
-
-Arguments:
-* `auto`: (bool) Whether skip-links will be auto-generated or not. Defaults to `true`. To opt-out of the automatic skip-links, set to `false`.
-* `css:` (bool) Whether CSS for the skip-link should be automatically added or not. Defaults to `true`. To opt-out and manually handle CSS for skip-links, set to `false`.
-* `links`: (array) Can be used to define a custom skip-link (or multiple skip-links if needed). Each "link" can have the following:
-  * `target`: (string|array) The selector of the element that should be used as the target.
-  * `label`: (string) The skip-link's label. If omitted defaults to `Skip to content`.
-  * `useFallbacks`: (bool) Defaults to `true`. If a `target` is not defined, or the `target` element is not located, then the skip-link target will fallback to the 1st instance of these elements: `#skip-link-target, main, .wp-block-post-title, .wp-block-query-loop, .wp-block-post-content, .entry-content, h1, h2`. If set to false, then the fallbacks won't be added. Use in case of multiple skip-links.
-
 ## Frequently Asked Questions
 
 ### The naming schema of CSS Custom Properties

From 39f867a5c4ac8b2a995caa7495c8071ddd671ada Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 13:46:06 +0300
Subject: [PATCH 19/24] fix link label

---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 5f150775a1e9c7..d746f994bd730c 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -274,7 +274,7 @@ function gutenberg_the_skip_link() {
 		skipLink = document.createElement( 'a' );
 		skipLink.classList.add( 'skip-link', 'screen-reader-text' );
 		skipLink.href = '#' + skipLinkTargetID;
-		skipLink.innerHTML = label;
+		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content' ); ?>';
 
 		// Inject the skip link.
 		parentEl.insertAdjacentElement( 'afterbegin', skipLink );

From dcbb027c91a3c43478253440abdc9106cd82dc40 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 29 Mar 2021 13:49:04 +0300
Subject: [PATCH 20/24] This file is irrelevant to this PR

---
 lib/class-wp-theme-json.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index a88caa25d898b5..35da7df75b79a4 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -363,6 +363,7 @@ public function __construct( $theme_json = array() ) {
 				unset( $this->theme_json[ $subtree ] );
 			}
 		}
+
 	}
 
 	/**

From 368b96cd1444b3ee08d47c073e9407f22438f2ad Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 1 Apr 2021 16:21:33 +0300
Subject: [PATCH 21/24] add missing textdomain

---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index d746f994bd730c..e4a42475ee2bc6 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -274,7 +274,7 @@ function gutenberg_the_skip_link() {
 		skipLink = document.createElement( 'a' );
 		skipLink.classList.add( 'skip-link', 'screen-reader-text' );
 		skipLink.href = '#' + skipLinkTargetID;
-		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content' ); ?>';
+		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content', 'gutenberg' ); ?>';
 
 		// Inject the skip link.
 		parentEl.insertAdjacentElement( 'afterbegin', skipLink );

From a6947c4993ca2655c8cf19312eb1a586b9cd55fb Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Apr 2021 11:06:37 +0300
Subject: [PATCH 22/24] Update list of elements to check for

---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 4b04376ea39b25..c3044c4edca20a 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -249,7 +249,7 @@ function gutenberg_the_skip_link() {
 	?>
 	<script>
 	( function() {
-		var skipLinkTarget = document.querySelector( 'main' ),
+		var skipLinkTarget = document.querySelector( 'main, .wp-block-post-title, .wp-block-query-loop, .wp-block-post-content, .entry-content' ),
 			parentEl,
 			skipLinkTargetID,
 			skipLink;

From da262fc1f3d2aab835aa965d85e7f42c3107fb10 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Apr 2021 11:06:55 +0300
Subject: [PATCH 23/24] Use gutenberg_supports_block_templates()

---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index c3044c4edca20a..d0a7f28130caf5 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -201,7 +201,7 @@ function set_unique_slug_on_create_template( $post_id ) {
 function gutenberg_the_skip_link() {
 
 	// Early exit if not an FSE theme.
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_supports_block_templates() ) {
 		return;
 	}
 	?>

From dfe3818a7af06628a03e7ace947c10b3c5b4d5e8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Apr 2021 11:06:37 +0300
Subject: [PATCH 24/24] Revert "Update list of elements to check for"

This reverts commit a6947c4993ca2655c8cf19312eb1a586b9cd55fb.
---
 lib/full-site-editing/templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index d0a7f28130caf5..fd571fbef14f63 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -249,7 +249,7 @@ function gutenberg_the_skip_link() {
 	?>
 	<script>
 	( function() {
-		var skipLinkTarget = document.querySelector( 'main, .wp-block-post-title, .wp-block-query-loop, .wp-block-post-content, .entry-content' ),
+		var skipLinkTarget = document.querySelector( 'main' ),
 			parentEl,
 			skipLinkTargetID,
 			skipLink;