From b2ad2a3650ca351d09ac418641797099f7a57b7c Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Mon, 25 Jul 2022 07:32:48 +0100
Subject: [PATCH 1/7] Exclude new directories from bundle

---
 gulpfile.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gulpfile.js b/gulpfile.js
index 5602a86..b183f39 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -50,6 +50,11 @@ const SVN_SOURCE_FILES = [
 	'!tsconfig.json',
 	'!search-regex.js.LICENSE.txt',
 	'!jsconfig.json',
+	'!api-footer.md',
+	'!api-header.md',
+	'!*.zip',
+	'!src',
+	'!src/**'
 ];
 
 function downloadLocale( locale, wpName, type ) {

From 73c5d50618c29c6dd243f34a2d0829a8e61f77c7 Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:04:24 +0100
Subject: [PATCH 2/7] =?UTF-8?q?Don=E2=80=99t=20add=20an=20ID=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/result/context-type/index.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/component/result/context-type/index.js b/src/component/result/context-type/index.js
index 4444db9..31d3f82 100644
--- a/src/component/result/context-type/index.js
+++ b/src/component/result/context-type/index.js
@@ -17,15 +17,6 @@ import HighlightMatches from '../../highlight-matches';
 const MAX_CONTEXT_LENGTH = 500;
 
 function getValue( label, value ) {
-	if ( parseInt( value, 10 ) > 0 ) {
-		return sprintf(
-			__( '%(label)s (ID %(id)d)', 'search-regex' ), {
-				label,
-				id: parseInt( value, 10 ),
-			}
-		);
-	}
-
 	return label;
 }
 

From 3c4b0dedc7388cc5fc45e30f5354f2e6d781a8c7 Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:05:38 +0100
Subject: [PATCH 3/7] Improve linting

---
 includes/action/class-action.php              |  6 +++---
 includes/api/class-route.php                  | 16 ++++++++--------
 includes/api/route/route-preset.php           |  8 ++++----
 includes/api/route/route-source.php           |  8 ++++----
 includes/filter/class-search-filter.php       | 10 +++++-----
 includes/filter/filter-keyvalue.php           |  4 ++--
 includes/filter/filter-string.php             |  3 ++-
 includes/modifier/class-modifier.php          |  2 +-
 includes/search-regex-admin.php               |  2 +-
 includes/search-regex-cli.php                 |  3 ---
 includes/search/class-match-column.php        |  6 +++---
 includes/search/class-search.php              |  2 +-
 includes/source/plugin/source-redirection.php |  2 ++
 includes/sql/where/class-where.php            |  2 +-
 includes/sql/where/where-date.php             |  4 ++--
 includes/sql/where/where-in.php               |  4 ++--
 includes/sql/where/where-integer.php          |  4 ++--
 includes/sql/where/where-null.php             |  2 +-
 includes/sql/where/where-string.php           |  8 ++++----
 19 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/includes/action/class-action.php b/includes/action/class-action.php
index 5140f2b..0d1f64f 100644
--- a/includes/action/class-action.php
+++ b/includes/action/class-action.php
@@ -78,9 +78,9 @@ abstract public function to_json();
 	/**
 	 * Perform the action
 	 *
-	 * @param integer             $row_id Row ID.
-	 * @param array               $row Data for row.
-	 * @param Source\Source       $source Source.
+	 * @param integer              $row_id Row ID.
+	 * @param array                $row Data for row.
+	 * @param Source\Source        $source Source.
 	 * @param array<Search\Column> $columns Contexts.
 	 * @return array<Search\Column>|\WP_Error
 	 */
diff --git a/includes/api/class-route.php b/includes/api/class-route.php
index 1c341fa..7a412a2 100644
--- a/includes/api/class-route.php
+++ b/includes/api/class-route.php
@@ -305,9 +305,9 @@ public function validate_search_flags( $value, \WP_REST_Request $request, $param
 	/**
 	 * Validate that the view columns are valid
 	 *
-	 * @param Array|String    $value The value to validate.
+	 * @param Array|String     $value The value to validate.
 	 * @param \WP_REST_Request $request The request.
-	 * @param Array           $param The array of parameters.
+	 * @param Array            $param The array of parameters.
 	 * @return \WP_Error|Bool true or false
 	 */
 	public function validate_view( $value, \WP_REST_Request $request, $param ) {
@@ -328,9 +328,9 @@ public function validate_view( $value, \WP_REST_Request $request, $param ) {
 	/**
 	 * Validate that the view columns are valid
 	 *
-	 * @param Array|String    $value The value to validate.
+	 * @param Array|String     $value The value to validate.
 	 * @param \WP_REST_Request $request The request.
-	 * @param Array           $param The array of parameters.
+	 * @param Array            $param The array of parameters.
 	 * @return \WP_Error|Bool true or false
 	 */
 	public function validate_action( $value, \WP_REST_Request $request, $param ) {
@@ -344,9 +344,9 @@ public function validate_action( $value, \WP_REST_Request $request, $param ) {
 	/**
 	 * Validate that the source is valid
 	 *
-	 * @param Array|String    $value The value to validate.
+	 * @param Array|String     $value The value to validate.
 	 * @param \WP_REST_Request $request The request.
-	 * @param Array           $param The array of parameters.
+	 * @param Array            $param The array of parameters.
 	 * @return Bool|WP_Error true or false
 	 */
 	public function validate_source( $value, \WP_REST_Request $request, $param ) {
@@ -373,9 +373,9 @@ public function validate_source( $value, \WP_REST_Request $request, $param ) {
 	/**
 	 * Validate supplied filters
 	 *
-	 * @param string|array    $value Value.
+	 * @param string|array     $value Value.
 	 * @param \WP_REST_Request $request Request.
-	 * @param array           $param Params.
+	 * @param array            $param Params.
 	 * @return boolean
 	 */
 	public function validate_filters( $value, \WP_REST_Request $request, $param ) {
diff --git a/includes/api/route/route-preset.php b/includes/api/route/route-preset.php
index 5dd18c4..7587b03 100644
--- a/includes/api/route/route-preset.php
+++ b/includes/api/route/route-preset.php
@@ -324,9 +324,9 @@ public function route_list( \WP_REST_Request $request ) {
 	/**
 	 * Validate that the locked params are valid
 	 *
-	 * @param Array|String    $value The value to validate.
+	 * @param Array|String     $value The value to validate.
 	 * @param \WP_REST_Request $request The request.
-	 * @param Array           $param The array of parameters.
+	 * @param Array            $param The array of parameters.
 	 * @return \WP_Error|Bool true or false
 	 */
 	public function validate_locked( $value, \WP_REST_Request $request, $param ) {
@@ -348,9 +348,9 @@ public function validate_locked( $value, \WP_REST_Request $request, $param ) {
 	/**
 	 * Validate that the tag params are valid
 	 *
-	 * @param Array|String    $value The value to validate.
+	 * @param Array|String     $value The value to validate.
 	 * @param \WP_REST_Request $request The request.
-	 * @param Array           $param The array of parameters.
+	 * @param Array            $param The array of parameters.
 	 * @return \WP_Error|Bool true or false
 	 */
 	public function validate_tags( $value, \WP_REST_Request $request, $param ) {
diff --git a/includes/api/route/route-source.php b/includes/api/route/route-source.php
index 480840d..36ef623 100644
--- a/includes/api/route/route-source.php
+++ b/includes/api/route/route-source.php
@@ -168,9 +168,9 @@ public function __construct( $namespace ) {
 	/**
 	 * Sanitize the source so it's a single source in an array, suitable for use with the search functions
 	 *
-	 * @param string|array    $value Source name.
+	 * @param string|array     $value Source name.
 	 * @param \WP_REST_Request $request Request object.
-	 * @param string          $param Param name.
+	 * @param string           $param Param name.
 	 * @return string[]
 	 */
 	public function sanitize_row_source( $value, \WP_REST_Request $request, $param ) {
@@ -184,9 +184,9 @@ public function sanitize_row_source( $value, \WP_REST_Request $request, $param )
 	/**
 	 * Validate the replacement.
 	 *
-	 * @param string|array    $value Source name.
+	 * @param string|array     $value Source name.
 	 * @param \WP_REST_Request $request Request object.
-	 * @param string          $param Param name.
+	 * @param string           $param Param name.
 	 * @return true|WP_Error
 	 */
 	public function validate_replacement( $value, \WP_REST_Request $request, $param ) {
diff --git a/includes/filter/class-search-filter.php b/includes/filter/class-search-filter.php
index d7da641..fcc4b3c 100644
--- a/includes/filter/class-search-filter.php
+++ b/includes/filter/class-search-filter.php
@@ -79,7 +79,7 @@ public function add_item( Type\Filter_Type $item ) {
 	/**
 	 * Create a Filter object
 	 *
-	 * @param array  $json JSON data.
+	 * @param array         $json JSON data.
 	 * @param Schema\Schema $schema Schema for filter.
 	 * @return list<Filter>
 	 */
@@ -177,9 +177,9 @@ public function get_columns() {
 	 * Get array of Search\Column objects that match this filter.
 	 *
 	 * @param array<Search\Column> $existing Existing array.
-	 * @param Source\Source       $source Source.
-	 * @param array               $row Raw data from the row.
-	 * @param Action\Action       $action Action.
+	 * @param Source\Source        $source Source.
+	 * @param array                $row Raw data from the row.
+	 * @param Action\Action        $action Action.
 	 * @return array<Search\Column>
 	 */
 	public function get_matching_filter( array $existing, Source\Source $source, array $row, Action\Action $action ) {
@@ -243,7 +243,7 @@ public function get_query( Source\Source $source ) {
 	 * Get an array of filters as SQL. Each filter is ANDed with the next
 	 *
 	 * @param array<Filter> $filters Filters.
-	 * @param Source\Source        $source Source.
+	 * @param Source\Source $source Source.
 	 * @return Sql\Query
 	 */
 	public static function get_as_query( array $filters, Source\Source $source ) {
diff --git a/includes/filter/filter-keyvalue.php b/includes/filter/filter-keyvalue.php
index 6820615..6a037d6 100644
--- a/includes/filter/filter-keyvalue.php
+++ b/includes/filter/filter-keyvalue.php
@@ -260,7 +260,7 @@ public function get_column_data( $column, $value, Source\Source $source, Action\
 	 * Get contexts for a value
 	 *
 	 * @param Source\Source $source Source.
-	 * @param Action        $action Action.
+	 * @param Action\Action $action Action.
 	 * @param string        $column Column.
 	 * @param string        $label Label.
 	 * @return array
@@ -282,7 +282,7 @@ private function get_value_context( Source\Source $source, Action\Action $action
 	 * Get context for a keyvalue match
 	 *
 	 * @param Source\Source $source Source.
-	 * @param Action\Action        $action Action.
+	 * @param Action\Action $action Action.
 	 * @param string        $logic Logic.
 	 * @param string        $match_value Value.
 	 * @param Search\Flags  $flags Flags.
diff --git a/includes/filter/filter-string.php b/includes/filter/filter-string.php
index 4050bb9..03cd66e 100644
--- a/includes/filter/filter-string.php
+++ b/includes/filter/filter-string.php
@@ -97,11 +97,12 @@ public function get_column_data( $column, $value, Source\Source $source, Action\
 	 * Match this filter against a string
 	 *
 	 * @param Source\Source $source Source.
-	 * @param Action        $action Action.
+	 * @param Action\Action $action Action.
 	 * @param string        $logic Logic.
 	 * @param string        $original_value Original value.
 	 * @param string        $row_value Current value.
 	 * @param Search\Flags  $flags Flags.
+	 * @param array         $replacements Replacement array.
 	 * @return list<Context\Context>
 	 */
 	public function get_match( Source\Source $source, Action\Action $action, $logic, $original_value, $row_value, Search\Flags $flags, $replacements = [] ) {
diff --git a/includes/modifier/class-modifier.php b/includes/modifier/class-modifier.php
index e236bb5..7de75d5 100644
--- a/includes/modifier/class-modifier.php
+++ b/includes/modifier/class-modifier.php
@@ -166,7 +166,7 @@ public function to_json() {
 	 * @param integer       $row_id Row ID.
 	 * @param string        $row_value Row value.
 	 * @param Source\Source $source Source.
-	 * @param Search\Column  $column Column.
+	 * @param Search\Column $column Column.
 	 * @param array         $raw Raw database data.
 	 * @param boolean       $save_mode Is the save mode enabled.
 	 * @return Search\Column
diff --git a/includes/search-regex-admin.php b/includes/search-regex-admin.php
index ad5312b..f69e661 100644
--- a/includes/search-regex-admin.php
+++ b/includes/search-regex-admin.php
@@ -44,7 +44,7 @@ public function __construct() {
 		register_uninstall_hook( SEARCHREGEX_FILE, [ '\SearchRegex\Admin\Admin', 'plugin_uninstall' ] );
 	}
 
-	/**
+	/*
 	 * Massage the Search Regex WP translations.
 	 */
 	public function load_script_translation_file( $file, $handle, $domain ) {
diff --git a/includes/search-regex-cli.php b/includes/search-regex-cli.php
index 06d9180..3346e9a 100644
--- a/includes/search-regex-cli.php
+++ b/includes/search-regex-cli.php
@@ -1,6 +1,3 @@
 <?php
 
 namespace SearchRegex\Cli;
-
-if ( defined( 'WP_CLI' ) && WP_CLI ) {
-}
diff --git a/includes/search/class-match-column.php b/includes/search/class-match-column.php
index c3c83fa..d94205f 100644
--- a/includes/search/class-match-column.php
+++ b/includes/search/class-match-column.php
@@ -55,10 +55,10 @@ class Column {
 	/**
 	 * Create a Match Column, which contains an array of Context\Type\Text items for a particular database column.
 	 *
-	 * @param string               $column_id Column ID.
-	 * @param string               $column_label Descriptive column label, shown to the user.
+	 * @param string                 $column_id Column ID.
+	 * @param string                 $column_label Descriptive column label, shown to the user.
 	 * @param array<Context\Context> $contexts Contexts.
-	 * @param array                $raw Raw data.
+	 * @param array                  $raw Raw data.
 	 */
 	public function __construct( $column_id, $column_label, array $contexts, array $raw ) {
 		$this->match_count = 0;
diff --git a/includes/search/class-search.php b/includes/search/class-search.php
index bdc999e..45334d4 100644
--- a/includes/search/class-search.php
+++ b/includes/search/class-search.php
@@ -184,7 +184,7 @@ public function get_search_data( $absolute_offset, $limit, Totals $totals ) {
 	 * Convert database rows into Result objects
 	 *
 	 * @internal
-	 * @param array  $source_results Array of row data.
+	 * @param array         $source_results Array of row data.
 	 * @param Action\Action $action Action\Action object.
 	 * @return Result[]|\WP_Error Array of results
 	 */
diff --git a/includes/source/plugin/source-redirection.php b/includes/source/plugin/source-redirection.php
index faa2704..bb0cf25 100644
--- a/includes/source/plugin/source-redirection.php
+++ b/includes/source/plugin/source-redirection.php
@@ -2,6 +2,8 @@
 
 namespace SearchRegex\Source\Plugin;
 
+// phpcs:disable
+
 use SearchRegex\Source;
 use SearchRegex\Search;
 use SearchRegex\Sql;
diff --git a/includes/sql/where/class-where.php b/includes/sql/where/class-where.php
index 0bcb569..824c098 100644
--- a/includes/sql/where/class-where.php
+++ b/includes/sql/where/class-where.php
@@ -43,7 +43,7 @@ class Where {
 	/**
 	 * Constructor
 	 *
-	 * @param Sql\Select\Select           $column Column.
+	 * @param Sql\Select\Select    $column Column.
 	 * @param string               $logic Logic.
 	 * @param string|integer|array $value Value.
 	 */
diff --git a/includes/sql/where/where-date.php b/includes/sql/where/where-date.php
index 3b64048..7641973 100644
--- a/includes/sql/where/where-date.php
+++ b/includes/sql/where/where-date.php
@@ -12,8 +12,8 @@ class Where_Date extends Where {
 	 * Constructor
 	 *
 	 * @param Sql\Select\Select $column Column.
-	 * @param string     $logic Logic.
-	 * @param integer    $value Value.
+	 * @param string            $logic Logic.
+	 * @param integer           $value Value.
 	 */
 	public function __construct( Sql\Select\Select $column, $logic, $value ) {
 		$map = [
diff --git a/includes/sql/where/where-in.php b/includes/sql/where/where-in.php
index 4bb3e3c..eb530b8 100644
--- a/includes/sql/where/where-in.php
+++ b/includes/sql/where/where-in.php
@@ -12,8 +12,8 @@ class Where_In extends Where {
 	 * Constructor
 	 *
 	 * @param Sql\Select\Select $column Column.
-	 * @param string     $logic Logic.
-	 * @param array      $value Value.
+	 * @param string            $logic Logic.
+	 * @param array             $value Value.
 	 */
 	public function __construct( Sql\Select\Select $column, $logic, $value ) {
 		$logic_sql = 'IN';
diff --git a/includes/sql/where/where-integer.php b/includes/sql/where/where-integer.php
index 2521d28..15df6ab 100644
--- a/includes/sql/where/where-integer.php
+++ b/includes/sql/where/where-integer.php
@@ -12,8 +12,8 @@ class Where_Integer extends Where {
 	 * Constructor
 	 *
 	 * @param Sql\Select\Select $column Column.
-	 * @param string     $logic Logic.
-	 * @param integer    $value Value.
+	 * @param string            $logic Logic.
+	 * @param integer           $value Value.
 	 */
 	public function __construct( Sql\Select\Select $column, $logic, $value ) {
 		$map = [
diff --git a/includes/sql/where/where-null.php b/includes/sql/where/where-null.php
index 76c99b8..937f46f 100644
--- a/includes/sql/where/where-null.php
+++ b/includes/sql/where/where-null.php
@@ -12,7 +12,7 @@ class Where_Null extends Where {
 	 * Constructor
 	 *
 	 * @param Sql\Select\Select $column Column.
-	 * @param string     $logic Logic.
+	 * @param string            $logic Logic.
 	 */
 	public function __construct( Sql\Select\Select $column, $logic ) {
 		$logic_sql = 'IS';
diff --git a/includes/sql/where/where-string.php b/includes/sql/where/where-string.php
index c107181..21269ce 100644
--- a/includes/sql/where/where-string.php
+++ b/includes/sql/where/where-string.php
@@ -28,10 +28,10 @@ class Where_String extends Where {
 	/**
 	 * Constructor
 	 *
-	 * @param Sql\Select\Select   $column Column.
-	 * @param string       $logic Logic.
-	 * @param string       $value Value.
-	 * @param Search\Flags $flags Search flags.
+	 * @param Sql\Select\Select $column Column.
+	 * @param string            $logic  Logic.
+	 * @param string            $value  Value.
+	 * @param Search\Flags      $flags  Search flags.
 	 */
 	public function __construct( Sql\Select\Select $column, $logic, $value, Search\Flags $flags = null ) {
 		if ( $flags === null ) {

From d1ba4a68972cd74f4222b52c8ae217d33377624d Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:05:57 +0100
Subject: [PATCH 4/7] Fix global search on options with no filters

It was adding global filters for other columns
---
 includes/filter/class-global-filter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/filter/class-global-filter.php b/includes/filter/class-global-filter.php
index f3b84f8..b66cd83 100644
--- a/includes/filter/class-global-filter.php
+++ b/includes/filter/class-global-filter.php
@@ -77,7 +77,9 @@ public function get_items( Source\Source $source ) {
 			$items[] = new Type\Filter_String( $filter, $column );
 		}
 
-		return array_merge( $items, $this->items );
+		return array_merge( $items, array_filter( $this->items, function( $item ) use ( $source ) {
+			return $item->get_schema()->get_type() === $source->get_type();
+		} ) );
 	}
 
 	public function has_column( $column, Schema\Column $schema ) {

From b256aab4926fe6db2d9f1abea4c20aece13440be Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:06:08 +0100
Subject: [PATCH 5/7] Fix PHP 7.2 compat

---
 includes/modifier/modifier-member.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/includes/modifier/modifier-member.php b/includes/modifier/modifier-member.php
index 82663b3..71b2672 100644
--- a/includes/modifier/modifier-member.php
+++ b/includes/modifier/modifier-member.php
@@ -147,15 +147,13 @@ function( $context ) {
 		}
 
 		// Replace existing contexts with the new ones
-		/** @psalm-suppress all */
 		$contexts = array_merge(
 			$this->get_contexts( $source, $same, '\SearchRegex\Context\Type\Value' ),
 			$this->get_contexts( $source, $add, '\SearchRegex\Context\Type\Add' ),
 			$this->get_contexts( $source, $delete, '\SearchRegex\Context\Type\Delete' ),
-			$updated,
+			$updated
 		);
 
-		/** @psalm-suppress ArgumentTypeCoercion */
 		$column->set_contexts( $contexts );
 		return $column;
 	}

From df2a8aa3d07f1d4d0a0bd180208e8c02eb61a41c Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:06:26 +0100
Subject: [PATCH 6/7] Update composer packages

---
 composer.json            |   6 +-
 composer.lock            | 195 ++++++++++++++++++++++++++-------------
 package.json             |   4 +-
 phpcs.xml.dist           |   2 +-
 src/wp-plugin-components |   2 +-
 5 files changed, 138 insertions(+), 71 deletions(-)

diff --git a/composer.json b/composer.json
index 13d051d..faeca2c 100644
--- a/composer.json
+++ b/composer.json
@@ -7,12 +7,14 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
 		"sirbrillig/phpcs-variable-analysis": "^2.11",
 		"sirbrillig/phpcs-no-get-current-user": "^1.1",
-		"phpunit/phpunit": "^9.5"
+		"phpunit/phpunit": "^9.5",
+		"phpcompatibility/php-compatibility": "*"
 	},
 	"scripts": {
 		"pot": "wp i18n make-pot . languages/search-regex.pot --ignore-domain --exclude=build/search-regex-strings.php",
 		"json": "wp i18n make-json languages --purge",
-		"test": "./vendor/bin/phpunit"
+		"test": "./vendor/bin/phpunit",
+		"lint": "./vendor/bin/phpcs -s"
 	},
 	"config": {
 		"allow-plugins": {
diff --git a/composer.lock b/composer.lock
index 639f4d6..1db06fc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "92f437a1b17de0c56009c4acd718a076",
+    "content-hash": "ff8a961f06d738b35ea3ee8f53ef7a0f",
     "packages": [],
     "packages-dev": [
         {
@@ -175,16 +175,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
-                "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c",
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c",
                 "shasum": ""
             },
             "require": {
@@ -231,7 +231,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.3.2"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.3"
             },
             "funding": [
                 {
@@ -247,20 +247,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:56:16+00:00"
+            "time": "2022-07-20T07:14:26+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "2.3.9",
+            "version": "2.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "015f524c9969255a29cdea8890cbd4fec240ee47"
+                "reference": "ebac357c0a41359f3981098729042ed6dedc97ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/015f524c9969255a29cdea8890cbd4fec240ee47",
-                "reference": "015f524c9969255a29cdea8890cbd4fec240ee47",
+                "url": "https://api.github.com/repos/composer/composer/zipball/ebac357c0a41359f3981098729042ed6dedc97ba",
+                "reference": "ebac357c0a41359f3981098729042ed6dedc97ba",
                 "shasum": ""
             },
             "require": {
@@ -341,7 +341,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.3.9"
+                "source": "https://github.com/composer/composer/tree/2.3.10"
             },
             "funding": [
                 {
@@ -357,7 +357,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-05T14:52:11+00:00"
+            "time": "2022-07-13T13:48:23+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -1840,6 +1840,68 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
+            "time": "2019-12-27T09:44:58+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
@@ -3846,27 +3908,27 @@
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
-            "version": "v2.11.3",
+            "version": "v2.11.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git",
-                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8"
+                "reference": "e9c99cda31b21ccb4da4c2124b57c8355ddce48e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/c921498b474212fe4552928bbeb68d70250ce5e8",
-                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8",
+                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/e9c99cda31b21ccb4da4c2124b57c8355ddce48e",
+                "reference": "e9c99cda31b21ccb4da4c2124b57c8355ddce48e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "squizlabs/php_codesniffer": "^3.5"
+                "squizlabs/php_codesniffer": "^3.5.6"
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "limedeck/phpunit-detailed-printer": "^3.1 || ^4.0 || ^5.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^5.0 || ^6.5 || ^7.0 || ^8.0",
+                "phpcsstandards/phpcsdevcs": "^1.1",
+                "phpstan/phpstan": "^1.7",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.5 || ^7.0 || ^8.0 || ^9.0",
                 "sirbrillig/phpcs-import-detection": "^1.1"
             },
             "type": "phpcodesniffer-standard",
@@ -3895,7 +3957,7 @@
                 "source": "https://github.com/sirbrillig/phpcs-variable-analysis",
                 "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki"
             },
-            "time": "2022-02-21T17:01:13+00:00"
+            "time": "2022-06-13T13:49:41+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -5442,16 +5504,16 @@
         },
         {
             "name": "wp-cli/core-command",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/core-command.git",
-                "reference": "a75d052ea000b4f0ec14106c110836b376e95a4f"
+                "reference": "f5fe574c1247b4e9ba50686bbce3b87b67579ad0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/core-command/zipball/a75d052ea000b4f0ec14106c110836b376e95a4f",
-                "reference": "a75d052ea000b4f0ec14106c110836b376e95a4f",
+                "url": "https://api.github.com/repos/wp-cli/core-command/zipball/f5fe574c1247b4e9ba50686bbce3b87b67579ad0",
+                "reference": "f5fe574c1247b4e9ba50686bbce3b87b67579ad0",
                 "shasum": ""
             },
             "require": {
@@ -5507,9 +5569,9 @@
             "homepage": "https://github.com/wp-cli/core-command",
             "support": {
                 "issues": "https://github.com/wp-cli/core-command/issues",
-                "source": "https://github.com/wp-cli/core-command/tree/v2.1.1"
+                "source": "https://github.com/wp-cli/core-command/tree/v2.1.2"
             },
-            "time": "2022-01-21T21:29:11+00:00"
+            "time": "2022-07-05T22:15:28+00:00"
         },
         {
             "name": "wp-cli/cron-command",
@@ -5581,16 +5643,16 @@
         },
         {
             "name": "wp-cli/db-command",
-            "version": "v2.0.20",
+            "version": "v2.0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/db-command.git",
-                "reference": "709f58c30d178afcdecaf56068ca9f5e985ed6b9"
+                "reference": "de9c4914173840edc02aea1ffa66db8c0e7f80a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/db-command/zipball/709f58c30d178afcdecaf56068ca9f5e985ed6b9",
-                "reference": "709f58c30d178afcdecaf56068ca9f5e985ed6b9",
+                "url": "https://api.github.com/repos/wp-cli/db-command/zipball/de9c4914173840edc02aea1ffa66db8c0e7f80a0",
+                "reference": "de9c4914173840edc02aea1ffa66db8c0e7f80a0",
                 "shasum": ""
             },
             "require": {
@@ -5649,9 +5711,9 @@
             "homepage": "https://github.com/wp-cli/db-command",
             "support": {
                 "issues": "https://github.com/wp-cli/db-command/issues",
-                "source": "https://github.com/wp-cli/db-command/tree/v2.0.20"
+                "source": "https://github.com/wp-cli/db-command/tree/v2.0.21"
             },
-            "time": "2022-01-25T03:11:39+00:00"
+            "time": "2022-07-14T14:19:05+00:00"
         },
         {
             "name": "wp-cli/embed-command",
@@ -5991,16 +6053,16 @@
         },
         {
             "name": "wp-cli/export-command",
-            "version": "v2.0.11",
+            "version": "v2.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/export-command.git",
-                "reference": "8dd137e0c739a59bb3d3de684a219dbb34473e11"
+                "reference": "fc647a75896efe9e4485e37aa9a03d430ff25532"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/export-command/zipball/8dd137e0c739a59bb3d3de684a219dbb34473e11",
-                "reference": "8dd137e0c739a59bb3d3de684a219dbb34473e11",
+                "url": "https://api.github.com/repos/wp-cli/export-command/zipball/fc647a75896efe9e4485e37aa9a03d430ff25532",
+                "reference": "fc647a75896efe9e4485e37aa9a03d430ff25532",
                 "shasum": ""
             },
             "require": {
@@ -6048,22 +6110,22 @@
             "homepage": "https://github.com/wp-cli/export-command",
             "support": {
                 "issues": "https://github.com/wp-cli/export-command/issues",
-                "source": "https://github.com/wp-cli/export-command/tree/v2.0.11"
+                "source": "https://github.com/wp-cli/export-command/tree/v2.0.12"
             },
-            "time": "2021-12-13T16:02:15+00:00"
+            "time": "2022-07-14T16:14:28+00:00"
         },
         {
             "name": "wp-cli/extension-command",
-            "version": "v2.1.4",
+            "version": "v2.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/extension-command.git",
-                "reference": "6401d7ea51084fac40010c2fb305be640675f385"
+                "reference": "362a142a5ffc8a1f01a6a81cdfa6e70114342f77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/extension-command/zipball/6401d7ea51084fac40010c2fb305be640675f385",
-                "reference": "6401d7ea51084fac40010c2fb305be640675f385",
+                "url": "https://api.github.com/repos/wp-cli/extension-command/zipball/362a142a5ffc8a1f01a6a81cdfa6e70114342f77",
+                "reference": "362a142a5ffc8a1f01a6a81cdfa6e70114342f77",
                 "shasum": ""
             },
             "require": {
@@ -6145,22 +6207,22 @@
             "homepage": "https://github.com/wp-cli/extension-command",
             "support": {
                 "issues": "https://github.com/wp-cli/extension-command/issues",
-                "source": "https://github.com/wp-cli/extension-command/tree/v2.1.4"
+                "source": "https://github.com/wp-cli/extension-command/tree/v2.1.5"
             },
-            "time": "2022-01-25T02:07:46+00:00"
+            "time": "2022-07-11T11:32:13+00:00"
         },
         {
             "name": "wp-cli/i18n-command",
-            "version": "v2.3.0",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/i18n-command.git",
-                "reference": "bcb1a8159679cafdf1da884dbe5830122bae2c4d"
+                "reference": "45bc2b47a4ed103b871cd2ec5b483ab55ad12d99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/bcb1a8159679cafdf1da884dbe5830122bae2c4d",
-                "reference": "bcb1a8159679cafdf1da884dbe5830122bae2c4d",
+                "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/45bc2b47a4ed103b871cd2ec5b483ab55ad12d99",
+                "reference": "45bc2b47a4ed103b871cd2ec5b483ab55ad12d99",
                 "shasum": ""
             },
             "require": {
@@ -6174,6 +6236,7 @@
                 "wp-cli/wp-cli-tests": "^3.1"
             },
             "suggest": {
+                "ext-json": "Used for reading and generating JSON translation files",
                 "ext-mbstring": "Used for calculating include/exclude matches in code extraction"
             },
             "type": "wp-cli-package",
@@ -6185,7 +6248,9 @@
                 "commands": [
                     "i18n",
                     "i18n make-pot",
-                    "i18n make-json"
+                    "i18n make-json",
+                    "i18n make-mo",
+                    "i18n update-po"
                 ]
             },
             "autoload": {
@@ -6210,9 +6275,9 @@
             "homepage": "https://github.com/wp-cli/i18n-command",
             "support": {
                 "issues": "https://github.com/wp-cli/i18n-command/issues",
-                "source": "https://github.com/wp-cli/i18n-command/tree/v2.3.0"
+                "source": "https://github.com/wp-cli/i18n-command/tree/v2.4.0"
             },
-            "time": "2022-04-06T15:32:48+00:00"
+            "time": "2022-07-04T21:43:20+00:00"
         },
         {
             "name": "wp-cli/import-command",
@@ -6416,16 +6481,16 @@
         },
         {
             "name": "wp-cli/media-command",
-            "version": "v2.0.12",
+            "version": "v2.0.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/media-command.git",
-                "reference": "7cbf32c7fa68631619f85a9bea0fb80fca119ba6"
+                "reference": "bc4eca7a9b9a30663c5a8c8ed14708ccef4c0988"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/media-command/zipball/7cbf32c7fa68631619f85a9bea0fb80fca119ba6",
-                "reference": "7cbf32c7fa68631619f85a9bea0fb80fca119ba6",
+                "url": "https://api.github.com/repos/wp-cli/media-command/zipball/bc4eca7a9b9a30663c5a8c8ed14708ccef4c0988",
+                "reference": "bc4eca7a9b9a30663c5a8c8ed14708ccef4c0988",
                 "shasum": ""
             },
             "require": {
@@ -6472,9 +6537,9 @@
             "homepage": "https://github.com/wp-cli/media-command",
             "support": {
                 "issues": "https://github.com/wp-cli/media-command/issues",
-                "source": "https://github.com/wp-cli/media-command/tree/v2.0.12"
+                "source": "https://github.com/wp-cli/media-command/tree/v2.0.14"
             },
-            "time": "2021-12-06T16:13:51+00:00"
+            "time": "2022-07-14T16:16:59+00:00"
         },
         {
             "name": "wp-cli/mustangostang-spyc",
@@ -6594,16 +6659,16 @@
         },
         {
             "name": "wp-cli/php-cli-tools",
-            "version": "v0.11.13",
+            "version": "v0.11.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/php-cli-tools.git",
-                "reference": "a2866855ac1abc53005c102e901553ad5772dc04"
+                "reference": "f8f340e4a87687549d046e2da516242f7f36c934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/a2866855ac1abc53005c102e901553ad5772dc04",
-                "reference": "a2866855ac1abc53005c102e901553ad5772dc04",
+                "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/f8f340e4a87687549d046e2da516242f7f36c934",
+                "reference": "f8f340e4a87687549d046e2da516242f7f36c934",
                 "shasum": ""
             },
             "require": {
@@ -6642,9 +6707,9 @@
             ],
             "support": {
                 "issues": "https://github.com/wp-cli/php-cli-tools/issues",
-                "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.13"
+                "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.14"
             },
-            "time": "2021-07-01T15:08:16+00:00"
+            "time": "2022-07-04T21:44:34+00:00"
         },
         {
             "name": "wp-cli/rewrite-command",
diff --git a/package.json b/package.json
index 89a3ad0..2898568 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "search-regex",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"description": "Adds search and replace functionality across posts, pages, comments, and meta-data, with full regular expression support",
 	"main": "search-regex.php",
 	"sideEffects": true,
@@ -9,7 +9,7 @@
 		"check-engines": "wp-scripts check-engines",
 		"lint:css": "wp-scripts lint-style",
 		"lint:js": "wp-scripts lint-js",
-		"lint:php": "phpcs -s",
+		"lint:php": "composer run-script lint",
 		"lint:psalm": "./vendor/vimeo/psalm/psalm --show-info=true",
 		"lint:pkg-json": "wp-scripts lint-pkg-json",
 		"packages-update": "wp-scripts packages-update",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index fe2ca93..26927b0 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -2,7 +2,7 @@
 <ruleset name="WordPress Coding Standards for Gutenberg Plugin">
 	<description>Coding standard for Search Regex plugin. Based on WordPress coding standards, but without the annoying Yoda and alignment options</description>
 
-	<config name="testVersion" value="5.5-"/>
+	<config name="testVersion" value="5.6-"/>
 
 	<rule ref="WordPress-Core">
 		<!-- these I dont like -->
diff --git a/src/wp-plugin-components b/src/wp-plugin-components
index cd5049f..cb6c1e9 160000
--- a/src/wp-plugin-components
+++ b/src/wp-plugin-components
@@ -1 +1 @@
-Subproject commit cd5049fc2d6c993402070f11f4ed3e2065829da1
+Subproject commit cb6c1e95440107cb31910ea9181817516d610454

From 9c51e974d25da11279eba0ede95ff256701bb0e5 Mon Sep 17 00:00:00 2001
From: John Godley <johng75@gmail.com>
Date: Tue, 26 Jul 2022 14:13:55 +0100
Subject: [PATCH 7/7] Version bump

---
 composer.json    |   2 +-
 package.json     |   4 +-
 readme.txt       |   5 ++
 search-regex.php |   2 +-
 yarn.lock        | 136 +++++++++++++++++++++++------------------------
 5 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/composer.json b/composer.json
index faeca2c..2083575 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
 		"phpcompatibility/php-compatibility": "*"
 	},
 	"scripts": {
-		"pot": "wp i18n make-pot . languages/search-regex.pot --ignore-domain --exclude=build/search-regex-strings.php",
+		"pot": "wp i18n make-pot . languages/search-regex.pot --ignore-domain --exclude=build/search-regex-strings.php --exclude=build/search-regex.js",
 		"json": "wp i18n make-json languages --purge",
 		"test": "./vendor/bin/phpunit",
 		"lint": "./vendor/bin/phpcs -s"
diff --git a/package.json b/package.json
index 2898568..c870bd0 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
 		"node-fetch": "2",
 		"path": "^0.12.7",
 		"prettier": "npm:wp-prettier@2.6.2",
-		"release-it": "^15.1.3",
+		"release-it": "^15.2.0",
 		"request": "^2.88.2",
 		"through": "^2.3.8",
 		"through2": "^4.0.2",
@@ -92,7 +92,7 @@
 		"redux-thunk": "^2.4.1",
 		"typescript": "^4.7.4",
 		"url": "^0.11.0",
-		"use-debounce": "^8.0.2"
+		"use-debounce": "^8.0.3"
 	},
 	"apidoc": {
 		"name": "Search Regex REST API",
diff --git a/readme.txt b/readme.txt
index e0e8bb0..3b04bfe 100644
--- a/readme.txt
+++ b/readme.txt
@@ -113,6 +113,11 @@ Full documentation can be found on the [Search Regex](http://searchregex.com/) s
 
 == Changelog ==
 
+= 3.0.1 - July 26th 2022 =
+* Fix issue with PHP < 7.4
+* Fix ID appearing on date values
+* Fix a global search on options with no filter causing a bad query
+
 = 3.0 - July 24th 2022 =
 - Major update with many, many, new features
 - Advanced searches with fully customisable filters that can be combined together with AND and OR logic
diff --git a/search-regex.php b/search-regex.php
index 6350bb9..d694296 100644
--- a/search-regex.php
+++ b/search-regex.php
@@ -3,7 +3,7 @@
 Plugin Name: Search Regex
 Plugin URI: https://searchregex.com/
 Description: Adds search and replace functionality across posts, pages, comments, and meta-data, with full regular expression support
-Version: 3.0.0
+Version: 3.0.1
 Author: John Godley
 Text Domain: search-regex
 Domain Path: /locale
diff --git a/yarn.lock b/yarn.lock
index 12bbf7d..941ce59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2073,6 +2073,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
   integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
+"@sindresorhus/is@^5.2.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-5.3.0.tgz#0ec9264cf54a527671d990eb874e030b55b70dcc"
+  integrity sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -6982,11 +6987,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
-
 finalhandler@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
@@ -7197,6 +7197,11 @@ form-data-encoder@1.7.1:
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96"
   integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==
 
+form-data-encoder@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.0.1.tgz#aec41860aca0275cb6026650d139c6701b0992c1"
+  integrity sha512-Oy+P9w5mnO4TWXVgUiQvggNKPI9/ummcSt5usuIV6HkaLKigwzPpoenhEqmGmx3zHqm6ZLJ+CR/99N8JLinaEw==
+
 form-data@4.0.0, form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -7476,20 +7481,20 @@ gettext-parser@^1.3.1:
     encoding "^0.1.12"
     safe-buffer "^5.1.1"
 
-git-up@^4.0.0:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.5.tgz#e7bb70981a37ea2fb8fe049669800a1f9a01d759"
-  integrity sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==
+git-up@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-6.0.0.tgz#dbd6e4eee270338be847a0601e6d0763c90b74db"
+  integrity sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA==
   dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^6.0.0"
+    is-ssh "^1.4.0"
+    parse-url "^7.0.2"
 
-git-url-parse@11.6.0:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605"
-  integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==
+git-url-parse@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-12.0.0.tgz#4ba70bc1e99138321c57e3765aaf7428e5abb793"
+  integrity sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q==
   dependencies:
-    git-up "^4.0.0"
+    git-up "^6.0.0"
 
 glob-all@^3.0.1:
   version "3.2.1"
@@ -7732,7 +7737,26 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-got@12.1.0, got@^12.1.0:
+got@12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-12.2.0.tgz#0b5de8cd48d0a16cd44789fd5fdd071ba3ee1de5"
+  integrity sha512-A81ll5Z8wzeCmSdIlWVMDWFKDo82v2nmOaMZDQNHKGInNqDBcle+CSb6BBiZcn/Aiefz/kSpo520WBKi9QAO/A==
+  dependencies:
+    "@sindresorhus/is" "^5.2.0"
+    "@szmarczak/http-timer" "^5.0.1"
+    "@types/cacheable-request" "^6.0.2"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^6.0.4"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    form-data-encoder "^2.0.1"
+    get-stream "^6.0.1"
+    http2-wrapper "^2.1.10"
+    lowercase-keys "^3.0.0"
+    p-cancelable "^3.0.0"
+    responselike "^2.0.0"
+
+got@^12.1.0:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/got/-/got-12.1.0.tgz#099f3815305c682be4fd6b0ee0726d8e4c6b0af4"
   integrity sha512-hBv2ty9QN2RdbJJMK3hesmSkFTjVIHyIDDbssCKnSmq62edGgImJWD10Eb1k77TiV1bxloxqcFAVK8+9pkhOig==
@@ -8800,7 +8824,7 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-ssh@^1.3.0:
+is-ssh@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
   integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
@@ -11676,25 +11700,22 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse-path@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.4.tgz#4bf424e6b743fb080831f03b536af9fc43f0ffea"
-  integrity sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==
+parse-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d"
+  integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==
   dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-    qs "^6.9.4"
-    query-string "^6.13.8"
+    protocols "^2.0.0"
 
-parse-url@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-6.0.2.tgz#4a30b057bfc452af64512dfb1a7755c103db3ea1"
-  integrity sha512-uCSjOvD3T+6B/sPWhR+QowAZcU/o4bjPrVBQBGFxcDF6J6FraCGIaDBsdoQawiaaAVdHvtqBe3w3vKlfBKySOQ==
+parse-url@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-7.0.2.tgz#d21232417199b8d371c6aec0cedf1406fd6393f0"
+  integrity sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==
   dependencies:
-    is-ssh "^1.3.0"
+    is-ssh "^1.4.0"
     normalize-url "^6.1.0"
-    parse-path "^4.0.4"
-    protocols "^1.4.0"
+    parse-path "^5.0.0"
+    protocols "^2.0.1"
 
 parse5-htmlparser2-tree-adapter@^7.0.0:
   version "7.0.0"
@@ -12305,12 +12326,7 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protocols@^1.4.0:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8"
-  integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
-
-protocols@^2.0.1:
+protocols@^2.0.0, protocols@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
   integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
@@ -12431,7 +12447,7 @@ qs@6.10.3:
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.11.0, qs@^6.9.4:
+qs@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
@@ -12452,16 +12468,6 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.13.8:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
-  integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -13001,10 +13007,10 @@ regjsparser@^0.8.2:
   dependencies:
     jsesc "~0.5.0"
 
-release-it@^15.1.3:
-  version "15.1.3"
-  resolved "https://registry.yarnpkg.com/release-it/-/release-it-15.1.3.tgz#bd170296018df1d5b69be328ef5a0d0975846bea"
-  integrity sha512-pdW9Ua59S3upm2wwzrWiQK8N5vXazNBBYk/UhpVf0faHV6mmY8GunS1ZzawSNi4fOOx55zSQFj2IHkOgfBxNUg==
+release-it@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/release-it/-/release-it-15.2.0.tgz#06837d4682f913d820c873a7934fa05cd8120a7f"
+  integrity sha512-zVtk/+BSX941e9lR2dhWGQhOIVdr98Fifgel4xUnsJVycU0uTtalOUhjoZM2jyDgcD22idmuDVgvgOTl9IyJ/g==
   dependencies:
     "@iarna/toml" "2.2.5"
     "@octokit/rest" "19.0.3"
@@ -13013,9 +13019,9 @@ release-it@^15.1.3:
     cosmiconfig "7.0.1"
     execa "6.1.0"
     form-data "4.0.0"
-    git-url-parse "11.6.0"
+    git-url-parse "12.0.0"
     globby "13.1.2"
-    got "12.1.0"
+    got "12.2.0"
     inquirer "9.0.2"
     is-ci "3.0.1"
     lodash "4.17.21"
@@ -13881,11 +13887,6 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -13973,11 +13974,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
-
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -15068,10 +15064,10 @@ use-composed-ref@^1.3.0:
   resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.3.0.tgz#3d8104db34b7b264030a9d916c5e94fbe280dbda"
   integrity sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==
 
-use-debounce@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-8.0.2.tgz#bd1b522c7b5b5d9dc249824fd2e4c3e4137b1ea9"
-  integrity sha512-4yCQ4FmlmYNpcHXJk1E19chO1X58fH4+QrwKpa5nkx3d7szHR3MjheRgECLvHivp3ClUqEom+SHOGB9zBz+qlw==
+use-debounce@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-8.0.3.tgz#2b4d7d7307a9397acb6520b7a1dea14c2c3d108c"
+  integrity sha512-BV7xuVy4LS0HtzHb23sDwAjfNjdBWlc4oyjJLcdCoVAjPv1+hroZYsCXX4VfRJT+8sLaqCftBOO8l7CMQtn9Gw==
 
 use-isomorphic-layout-effect@^1.1.1:
   version "1.1.2"