diff --git a/.github/workflows/build-test-measure.yml b/.github/workflows/build-test-measure.yml
index 9730d9d2666..eb37db7e3d9 100644
--- a/.github/workflows/build-test-measure.yml
+++ b/.github/workflows/build-test-measure.yml
@@ -202,6 +202,7 @@ jobs:
- name: Normalize composer.json
run: |
composer require --no-interaction --dev ergebnis/composer-normalize --ignore-platform-reqs
+ composer config --no-interaction --no-plugins allow-plugins.ergebnis/composer-normalize true
composer --no-interaction normalize --dry-run
#-----------------------------------------------------------------------------------------------------------------------
diff --git a/assets/src/block-validation/components/error/get-error-source-title.js b/assets/src/block-validation/components/error/get-error-source-title.js
index abae43b3738..9a024569678 100644
--- a/assets/src/block-validation/components/error/get-error-source-title.js
+++ b/assets/src/block-validation/components/error/get-error-source-title.js
@@ -17,6 +17,10 @@ import { __, sprintf } from '@wordpress/i18n';
function getKeyedSources( sources ) {
const keyedSources = { theme: [], plugin: [], 'mu-plugin': [], embed: [], core: [], blocks: [] };
+ if ( ! sources?.length ) {
+ return keyedSources;
+ }
+
for ( const source of sources ) {
if ( source.type && source.type in keyedSources ) {
keyedSources[ source.type ].push( source );
@@ -86,7 +90,7 @@ export function getErrorSourceTitle( sources = [] ) {
output.push( __( 'Core', 'amp' ) );
}
- if ( 0 === output.length && 0 < sources.length ) {
+ if ( ! output.length && sources?.length ) {
output.push( __( 'Unknown', 'amp' ) );
}
diff --git a/assets/src/block-validation/components/error/test/get-error-source-title.js b/assets/src/block-validation/components/error/test/get-error-source-title.js
index d2ab9767c04..2e7e62978ed 100644
--- a/assets/src/block-validation/components/error/test/get-error-source-title.js
+++ b/assets/src/block-validation/components/error/test/get-error-source-title.js
@@ -5,6 +5,7 @@ import { getErrorSourceTitle } from '../get-error-source-title';
describe( 'getErrorSorceTitle', () => {
it( 'returns an empty string if nothing is passed', () => {
+ expect( getErrorSourceTitle( null ) ).toBe( '' );
expect( getErrorSourceTitle( [] ) ).toBe( '' );
} );
diff --git a/assets/src/block-validation/hooks/use-validation-error-state-updates.js b/assets/src/block-validation/hooks/use-validation-error-state-updates.js
index d52f4404c29..8ba3cac804f 100644
--- a/assets/src/block-validation/hooks/use-validation-error-state-updates.js
+++ b/assets/src/block-validation/hooks/use-validation-error-state-updates.js
@@ -207,7 +207,7 @@ export function useValidationErrorStateUpdates() {
*/
useEffect( () => {
const newValidationErrors = previousValidationErrors.map( ( validationError ) => {
- if ( ! validationError.error.sources ) {
+ if ( ! validationError.error.sources?.length ) {
return validationError;
}
diff --git a/assets/src/components/site-scan-context-provider/get-sources-from-scannable-urls.js b/assets/src/components/site-scan-context-provider/get-sources-from-scannable-urls.js
index 31facc2d950..10188ba67d8 100644
--- a/assets/src/components/site-scan-context-provider/get-sources-from-scannable-urls.js
+++ b/assets/src/components/site-scan-context-provider/get-sources-from-scannable-urls.js
@@ -29,6 +29,10 @@ export function getSourcesFromScannableUrls( scannableUrls = [], { useAmpUrls =
}
for ( const validationError of validationErrors ) {
+ if ( ! validationError?.sources?.length ) {
+ continue;
+ }
+
for ( const source of validationError.sources ) {
if ( source.type === 'plugin' ) {
const pluginSlug = getPluginSlugFromFile( source.name );
diff --git a/assets/src/components/site-scan-context-provider/test/get-slugs-from-validation-results.js b/assets/src/components/site-scan-context-provider/test/get-slugs-from-validation-results.js
index 7cf3abe8c32..132fcde2ae8 100644
--- a/assets/src/components/site-scan-context-provider/test/get-slugs-from-validation-results.js
+++ b/assets/src/components/site-scan-context-provider/test/get-slugs-from-validation-results.js
@@ -78,6 +78,9 @@ describe( 'getSourcesFromScannableUrls', () => {
{ type: 'plugin', name: 'jetpack' },
],
},
+ {
+ sources: null,
+ },
],
},
];
diff --git a/composer.json b/composer.json
index a78ad2ee46d..e5260a0c519 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"ext-json": "*",
"ext-libxml": "*",
"ext-spl": "*",
- "ampproject/amp-toolbox": "0.9.3",
+ "ampproject/amp-toolbox": "0.10.0",
"cweagans/composer-patches": "~1.0",
"fasterimage/fasterimage": "1.5.0",
"sabberworm/php-css-parser": "dev-master#bfdd976"
@@ -76,6 +76,12 @@
]
},
"config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true,
+ "civicrm/composer-downloads-plugin": true,
+ "ampproject/php-css-parser-install-plugin": true,
+ "cweagans/composer-patches": true
+ },
"platform": {
"php": "5.6.20"
},
diff --git a/composer.lock b/composer.lock
index 71cdc61e2fd..1507c2a27d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "bdf879c80ebfac326fc27ad56b03a742",
+ "content-hash": "300c329c12165e6c58cdf53a2052743f",
"packages": [
{
"name": "ampproject/amp-toolbox",
- "version": "0.9.3",
+ "version": "0.10.0",
"source": {
"type": "git",
"url": "https://github.com/ampproject/amp-toolbox-php.git",
- "reference": "b4c723a53d9bc5737ab67fba23d8162150d98eea"
+ "reference": "be395b7ecee168318a6f5048e875a4c0d1eb52bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ampproject/amp-toolbox-php/zipball/b4c723a53d9bc5737ab67fba23d8162150d98eea",
- "reference": "b4c723a53d9bc5737ab67fba23d8162150d98eea",
+ "url": "https://api.github.com/repos/ampproject/amp-toolbox-php/zipball/be395b7ecee168318a6f5048e875a4c0d1eb52bf",
+ "reference": "be395b7ecee168318a6f5048e875a4c0d1eb52bf",
"shasum": ""
},
"require": {
@@ -76,9 +76,9 @@
"description": "A collection of AMP tools making it easier to publish and host AMP pages with PHP.",
"support": {
"issues": "https://github.com/ampproject/amp-toolbox-php/issues",
- "source": "https://github.com/ampproject/amp-toolbox-php/tree/0.9.3"
+ "source": "https://github.com/ampproject/amp-toolbox-php/tree/0.10.0"
},
- "time": "2021-12-14T21:26:08+00:00"
+ "time": "2022-01-07T17:03:36+00:00"
},
{
"name": "cweagans/composer-patches",
@@ -292,7 +292,7 @@
"packages-dev": [
{
"name": "ampproject/php-css-parser-install-plugin",
- "version": "dev-fix/update-amp-toolbox-0.9.3",
+ "version": "dev-add/update-to-amp-toolbox-0.10.0",
"dist": {
"type": "path",
"url": "./php-css-parser-install-composer-plugin",
@@ -6412,5 +6412,5 @@
"platform-overrides": {
"php": "5.6.20"
},
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.2.0"
}
diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 07c9a6c1bba..ee18eba26b8 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -91,6 +91,7 @@ public function get_scripts() {
* Get regex pattern for matching HTML attributes from a given tag name.
*
* @since 1.5.0
+ * @todo This does not currently work with single-quoted attribute values or non-quoted attributes.
*
* @param string $html HTML source haystack.
* @param string $tag_name Tag name.
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 41a57a06208..ddcc6ae4353 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -5,6 +5,7 @@
* @package AMP
*/
+use AmpProject\CssLength;
use AmpProject\Dom\Document;
use AmpProject\Dom\Element;
use AmpProject\Extension;
@@ -92,7 +93,7 @@ public function __construct( $args = [] ) {
*/
public function register_embed() {
add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
- add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
+ add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], PHP_INT_MAX, 2 );
}
/**
@@ -100,7 +101,7 @@ public function register_embed() {
*/
public function unregister_embed() {
remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
- remove_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10 );
+ remove_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], PHP_INT_MAX );
}
/**
@@ -145,6 +146,7 @@ public function render( $html, $url, $video_id ) {
$attributes[ $iframe_prop ] = $props[ $iframe_prop ];
}
}
+ $attributes = $this->amend_fixed_height_layout( $attributes );
$placeholder = $this->get_placeholder_markup( $url, $video_id, $attributes );
@@ -209,6 +211,8 @@ private function get_amp_component( Document $dom, Element $node ) {
return false;
}
+ $attributes = $this->amend_fixed_height_layout( $attributes );
+
$amp_node = AMP_DOM_Utils::create_node(
$dom,
Extension::YOUTUBE,
@@ -224,6 +228,24 @@ private function get_amp_component( Document $dom, Element $node ) {
return $amp_node;
}
+ /**
+ * Amend attributes with fixed-height layout if there is a 100% width present.
+ *
+ * @param array $attributes Attributes.
+ * @return array Amended attributes.
+ */
+ private function amend_fixed_height_layout( $attributes ) {
+ if (
+ isset( $attributes[ Attribute::WIDTH ] )
+ &&
+ ( '100%' === $attributes[ Attribute::WIDTH ] || CssLength::AUTO === $attributes[ Attribute::WIDTH ] )
+ ) {
+ $attributes[ Attribute::LAYOUT ] = Layout::FIXED_HEIGHT;
+ $attributes[ Attribute::WIDTH ] = CssLength::AUTO;
+ }
+ return $attributes;
+ }
+
/**
* Prepare attributes for amp-youtube component.
*
@@ -297,7 +319,7 @@ private function get_placeholder_element( Element $amp_component, $video_id, $at
Attribute::OBJECT_FIT => 'cover',
];
- if ( $attributes[ Attribute::TITLE ] ) {
+ if ( ! empty( $attributes[ Attribute::TITLE ] ) ) {
$img_attributes[ Attribute::ALT ] = $attributes[ Attribute::TITLE ];
}
@@ -493,6 +515,11 @@ public function video_override( $html, $attr ) {
return $html;
}
+ // Construct a tag so that any width/height attributes will be passed along.
+ if ( ! $html ) {
+ $html = AMP_HTML_Utils::build_tag( Tag::IFRAME, $attr );
+ }
+
return $this->render( $html, $src, $video_id );
}
}
diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
index da47ae73238..5fcf8d0055e 100644
--- a/includes/validation/class-amp-validation-error-taxonomy.php
+++ b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -2732,7 +2732,7 @@ public static function render_sources( $sources ) {
-
+
diff --git a/package-lock.json b/package-lock.json
index e8cc6c590c7..cce09f3dcd2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1397,21 +1397,37 @@
}
},
"@babel/plugin-transform-react-constant-elements": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.0.tgz",
- "integrity": "sha512-OgtklS+p9t1X37eWA4XdvvbZG/3gqzX569gqmo3q4/Ui6qjfTQmOs5UTSrfdD9nVByHhX6Gbm/Pyc4KbwUXGWA==",
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz",
+ "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==",
"dev": true,
"requires": {
- "@babel/helper-plugin-utils": "^7.14.5"
+ "@babel/helper-plugin-utils": "^7.16.7"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+ "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+ "dev": true
+ }
}
},
"@babel/plugin-transform-react-display-name": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz",
- "integrity": "sha512-FJFdJAqaCpndL+pIf0aeD/qlQwT7QXOvR6Cc8JPvNhKJBi2zc/DPc4g05Y3fbD/0iWAMQFGij4+Xw+4L/BMpTg==",
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
+ "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
"dev": true,
"requires": {
- "@babel/helper-plugin-utils": "^7.14.5"
+ "@babel/helper-plugin-utils": "^7.16.7"
+ },
+ "dependencies": {
+ "@babel/helper-plugin-utils": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+ "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+ "dev": true
+ }
}
},
"@babel/plugin-transform-react-jsx": {
@@ -1428,22 +1444,119 @@
}
},
"@babel/plugin-transform-react-jsx-development": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz",
- "integrity": "sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==",
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
+ "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
"dev": true,
"requires": {
- "@babel/plugin-transform-react-jsx": "^7.16.0"
+ "@babel/plugin-transform-react-jsx": "^7.16.7"
+ },
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+ "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-module-imports": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+ "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-plugin-utils": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+ "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+ "dev": true
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "dev": true
+ },
+ "@babel/plugin-syntax-jsx": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz",
+ "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.16.7"
+ }
+ },
+ "@babel/plugin-transform-react-jsx": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz",
+ "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-annotate-as-pure": "^7.16.7",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/plugin-syntax-jsx": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/types": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+ "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@babel/plugin-transform-react-pure-annotations": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz",
- "integrity": "sha512-NC/Bj2MG+t8Ef5Pdpo34Ay74X4Rt804h5y81PwOpfPtmAK3i6CizmQqwyBQzIepz1Yt8wNr2Z2L7Lu3qBMfZMA==",
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
+ "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
"dev": true,
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.0",
- "@babel/helper-plugin-utils": "^7.14.5"
+ "@babel/helper-annotate-as-pure": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.16.7"
+ },
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+ "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-plugin-utils": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+ "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+ "dev": true
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "dev": true
+ },
+ "@babel/types": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+ "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@babel/plugin-transform-regenerator": {
@@ -1650,17 +1763,87 @@
}
},
"@babel/preset-react": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.0.tgz",
- "integrity": "sha512-d31IFW2bLRB28uL1WoElyro8RH5l6531XfxMtCeCmp6RVAF1uTfxxUA0LH1tXl+psZdwfmIbwoG4U5VwgbhtLw==",
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz",
+ "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
"dev": true,
"requires": {
- "@babel/helper-plugin-utils": "^7.14.5",
- "@babel/helper-validator-option": "^7.14.5",
- "@babel/plugin-transform-react-display-name": "^7.16.0",
- "@babel/plugin-transform-react-jsx": "^7.16.0",
- "@babel/plugin-transform-react-jsx-development": "^7.16.0",
- "@babel/plugin-transform-react-pure-annotations": "^7.16.0"
+ "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-validator-option": "^7.16.7",
+ "@babel/plugin-transform-react-display-name": "^7.16.7",
+ "@babel/plugin-transform-react-jsx": "^7.16.7",
+ "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+ "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+ },
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+ "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-module-imports": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+ "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/helper-plugin-utils": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+ "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+ "dev": true
+ },
+ "@babel/helper-validator-identifier": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+ "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "dev": true
+ },
+ "@babel/helper-validator-option": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+ "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+ "dev": true
+ },
+ "@babel/plugin-syntax-jsx": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz",
+ "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.16.7"
+ }
+ },
+ "@babel/plugin-transform-react-jsx": {
+ "version": "7.16.7",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz",
+ "integrity": "sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-annotate-as-pure": "^7.16.7",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/plugin-syntax-jsx": "^7.16.7",
+ "@babel/types": "^7.16.7"
+ }
+ },
+ "@babel/types": {
+ "version": "7.16.8",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+ "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-validator-identifier": "^7.16.7",
+ "to-fast-properties": "^2.0.0"
+ }
+ }
}
},
"@babel/preset-typescript": {
@@ -1817,15 +2000,15 @@
"dev": true
},
"@discoveryjs/json-ext": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
- "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",
+ "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
"dev": true
},
"@emotion/babel-plugin": {
- "version": "11.3.0",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz",
- "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==",
+ "version": "11.7.2",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz",
+ "integrity": "sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==",
"requires": {
"@babel/helper-module-imports": "^7.12.13",
"@babel/plugin-syntax-jsx": "^7.12.13",
@@ -1838,28 +2021,28 @@
"escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0",
"source-map": "^0.5.7",
- "stylis": "^4.0.3"
+ "stylis": "4.0.13"
}
},
"@emotion/cache": {
- "version": "11.6.0",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.6.0.tgz",
- "integrity": "sha512-ElbsWY1KMwEowkv42vGo0UPuLgtPYfIs9BxxVrmvsaJVvktknsHYYlx5NQ5g6zLDcOTyamlDc7FkRg2TAcQDKQ==",
+ "version": "11.7.1",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz",
+ "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==",
"requires": {
"@emotion/memoize": "^0.7.4",
"@emotion/sheet": "^1.1.0",
"@emotion/utils": "^1.0.0",
"@emotion/weak-memoize": "^0.2.5",
- "stylis": "^4.0.10"
+ "stylis": "4.0.13"
}
},
"@emotion/css": {
- "version": "11.5.0",
- "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.5.0.tgz",
- "integrity": "sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==",
+ "version": "11.7.1",
+ "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.7.1.tgz",
+ "integrity": "sha512-RUUgPlMZunlc7SE5A6Hg+VWRzb2cU6O9xlV78KCFgcnl25s7Qz/20oQg71iKudpLqk7xj0vhbJlwcJJMT0BOZg==",
"requires": {
- "@emotion/babel-plugin": "^11.0.0",
- "@emotion/cache": "^11.5.0",
+ "@emotion/babel-plugin": "^11.7.1",
+ "@emotion/cache": "^11.7.1",
"@emotion/serialize": "^1.0.0",
"@emotion/sheet": "^1.0.3",
"@emotion/utils": "^1.0.0"
@@ -1884,12 +2067,12 @@
"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
},
"@emotion/react": {
- "version": "11.7.0",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.0.tgz",
- "integrity": "sha512-WL93hf9+/2s3cA1JVJlz8+Uy6p6QWukqQFOm2OZO5ki51hfucHMOmbSjiyC3t2Y4RI8XUmBoepoc/24ny/VBbA==",
+ "version": "11.7.1",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.7.1.tgz",
+ "integrity": "sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==",
"requires": {
"@babel/runtime": "^7.13.10",
- "@emotion/cache": "^11.6.0",
+ "@emotion/cache": "^11.7.1",
"@emotion/serialize": "^1.0.2",
"@emotion/sheet": "^1.1.0",
"@emotion/utils": "^1.0.0",
@@ -2726,63 +2909,64 @@
"dev": true
},
"@popperjs/core": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz",
- "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ=="
+ "version": "2.11.2",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
+ "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
},
"@react-spring/animated": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.3.1.tgz",
- "integrity": "sha512-23YaERZ++BwZ8F8PxPFqrpOwp/JZun1Pj6aHZtPAU42j5LycBRasT9XMw7Eyr7zNFhT+rl3R3wFfd4WX6Ax+UA==",
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.4.1.tgz",
+ "integrity": "sha512-uAJkcrSlpg8uSe8zy7eJcDdNpI5QvRXrZUKhn5dlGAPk3psgY5qj6pahzB0k5NZZQ27ls8Z5Nt4VKhGaXPJNDQ==",
"requires": {
- "@react-spring/shared": "~9.3.0",
- "@react-spring/types": "~9.3.0"
+ "@react-spring/shared": "~9.4.0",
+ "@react-spring/types": "~9.4.0"
}
},
"@react-spring/core": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.3.1.tgz",
- "integrity": "sha512-8rmfmEHLHGtF1CUiXRn64YJqsXNxv2cGX8oNnBnsuoE33c48Zc34t2VIMB4R9q5zwIUCvDBGfiEenA8ZAPxqOQ==",
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.4.1.tgz",
+ "integrity": "sha512-sXQmGg4wNeyoVZ/LdEF01xtzQKZtLIyFDX03hoa0oa9VTgLNTVSbVXD9q2xsH8HtWpY4OFPTi/9Noi93gjnYyg==",
"requires": {
- "@react-spring/animated": "~9.3.0",
- "@react-spring/shared": "~9.3.0",
- "@react-spring/types": "~9.3.0"
+ "@react-spring/animated": "~9.4.0",
+ "@react-spring/rafz": "~9.4.0",
+ "@react-spring/shared": "~9.4.0",
+ "@react-spring/types": "~9.4.0"
}
},
"@react-spring/rafz": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.3.1.tgz",
- "integrity": "sha512-fEBMCarGVl+/2kdO+g6Zig4F+3ymwmcGN8S71gb1c7Cbbxb87kviPz8EhshfIHoiLeJPGlqwcuGbxNmZbBamvA=="
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.4.1.tgz",
+ "integrity": "sha512-R/mNOQ4axraWsL/jwzoaqfeX6RwUODg3WOGweL8zYbHHheRqQV+QwnhGmDATepBZ1H3UUulhXvOqkzWzjnpuQQ=="
},
"@react-spring/shared": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.3.1.tgz",
- "integrity": "sha512-jhPpxzURGo6Nty90ex1lkxmZae7w/VAbnGmb/nXcYoZwSoNR+W2aAd00iXsh2ZGz6MgoJOsc495JeG3uC7Am8A==",
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.4.1.tgz",
+ "integrity": "sha512-7atTQOhEQmw5UEYbb5yk7YEaf11AcRF7UISfAmr9FJ2FJD4VUVCn1R4V78omiFiRvnU6qI3GRhkRnIvYM8aAZw==",
"requires": {
- "@react-spring/rafz": "~9.3.0",
- "@react-spring/types": "~9.3.0"
+ "@react-spring/rafz": "~9.4.0",
+ "@react-spring/types": "~9.4.0"
}
},
"@react-spring/types": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.3.1.tgz",
- "integrity": "sha512-W/YMJMX35XgGGzX0gKORBTwnvQ+1loDOFN3XlZkW5fgpEY+7VkRUpPyqPWXQr3n6lHrsLmHIGdpznqZi54ACTQ=="
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.4.1.tgz",
+ "integrity": "sha512-eZmlFRc+XkY/HJi4RswLkIHH0nKQkqKRHPUqnseffcBuZ5FNXKDUmNnLUpqkrCpl746QCFVQtI5QptLklDATfQ=="
},
"@react-spring/web": {
- "version": "9.3.1",
- "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.3.1.tgz",
- "integrity": "sha512-sisZIgFGva/Z+xKWPSfXpukF0AP3kR9ALTxlHL87fVotMUCJX5vtH/YlVcywToEFwTHKt3MpI5Wy2M+vgVEeaw==",
+ "version": "9.4.1",
+ "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.4.1.tgz",
+ "integrity": "sha512-ajlGJl0Zqa3idhZw0KL5chP8AIn4wPHpDY7WjtWaWjVZSZRSBAeHmfqNLtAGCjazeO/Q6zmt6wdGs8bX8q42rQ==",
"requires": {
- "@react-spring/animated": "~9.3.0",
- "@react-spring/core": "~9.3.0",
- "@react-spring/shared": "~9.3.0",
- "@react-spring/types": "~9.3.0"
+ "@react-spring/animated": "~9.4.0",
+ "@react-spring/core": "~9.4.0",
+ "@react-spring/shared": "~9.4.0",
+ "@react-spring/types": "~9.4.0"
}
},
"@sideway/address": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz",
- "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz",
+ "integrity": "sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ==",
"dev": true,
"requires": {
"@hapi/hoek": "^9.0.0"
@@ -2913,9 +3097,9 @@
},
"dependencies": {
"camelcase": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
- "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
"dev": true
},
"cosmiconfig": {
@@ -3063,9 +3247,9 @@
"dev": true
},
"@types/babel__core": {
- "version": "7.1.16",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz",
- "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==",
+ "version": "7.1.18",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz",
+ "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==",
"dev": true,
"requires": {
"@babel/parser": "^7.1.0",
@@ -3076,9 +3260,9 @@
}
},
"@types/babel__generator": {
- "version": "7.6.3",
- "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
- "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+ "version": "7.6.4",
+ "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+ "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0"
@@ -3113,9 +3297,9 @@
}
},
"@types/eslint": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz",
- "integrity": "sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==",
+ "version": "8.2.2",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz",
+ "integrity": "sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==",
"dev": true,
"requires": {
"@types/estree": "*",
@@ -3123,9 +3307,9 @@
}
},
"@types/eslint-scope": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
- "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+ "version": "3.7.3",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+ "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"dev": true,
"requires": {
"@types/eslint": "*",
@@ -3194,9 +3378,9 @@
"dev": true
},
"@types/lodash": {
- "version": "4.14.177",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
- "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
+ "version": "4.14.178",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz",
+ "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="
},
"@types/mdast": {
"version": "3.0.10",
@@ -3220,9 +3404,9 @@
"dev": true
},
"@types/mousetrap": {
- "version": "1.6.8",
- "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.8.tgz",
- "integrity": "sha512-zTqjvgCUT5EoXqbqmd8iJMb4NJqyV/V7pK7AIKq7qcaAsJIpGlTVJS1HQM6YkdHCdnkNSbhcQI7MXYxFfE3iCA=="
+ "version": "1.6.9",
+ "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.9.tgz",
+ "integrity": "sha512-HUAiN65VsRXyFCTicolwb5+I7FM6f72zjMWr+ajGk+YTvzBgXqa2A5U7d+rtsouAkunJ5U4Sb5lNJjo9w+nmXg=="
},
"@types/node": {
"version": "16.10.9",
@@ -3242,9 +3426,9 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
"@types/prettier": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz",
- "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz",
+ "integrity": "sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==",
"dev": true
},
"@types/prop-types": {
@@ -3661,18 +3845,16 @@
"dev": true
},
"@wojtekmaj/enzyme-adapter-react-17": {
- "version": "0.6.5",
- "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.5.tgz",
- "integrity": "sha512-ChIObUiXXYUiqzXPqOai+p6KF5dlbItpDDYsftUOQiAiygbMDlLeJIjynC6ZrJIa2U2MpRp4YJmtR2GQyIHjgA==",
+ "version": "0.6.6",
+ "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.6.tgz",
+ "integrity": "sha512-gSfhg8CiL0Vwc2UgUblGVZIy7M0KyXaZsd8+QwzV8TSVRLkGyzdLtYEcs9wRWyQTsdmOd+oRGqbVgUX7AVJxug==",
"dev": true,
"requires": {
- "@wojtekmaj/enzyme-adapter-utils": "^0.1.1",
+ "@wojtekmaj/enzyme-adapter-utils": "^0.1.2",
"enzyme-shallow-equal": "^1.0.0",
"has": "^1.0.0",
- "object.assign": "^4.1.0",
- "object.values": "^1.1.0",
"prop-types": "^15.7.0",
- "react-is": "^17.0.2",
+ "react-is": "^17.0.0",
"react-test-renderer": "^17.0.0"
},
"dependencies": {
@@ -3685,14 +3867,13 @@
}
},
"@wojtekmaj/enzyme-adapter-utils": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.1.tgz",
- "integrity": "sha512-bNPWtN/d8huKOkC6j1E3EkSamnRrHHT7YuR6f9JppAQqtoAm3v4/vERe4J14jQKmHLCyEBHXrlgb7H6l817hVg==",
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.2.tgz",
+ "integrity": "sha512-MM/DqDqvxNVlWLqSVQiUbRN9MuDLJfefmPbJ8ZKdmdf5ID8G+i42XhFpoQh5bAZUCdwzRae3+WSZl2lXcFOrhw==",
"dev": true,
"requires": {
"function.prototype.name": "^1.1.0",
"has": "^1.0.0",
- "object.assign": "^4.1.0",
"object.fromentries": "^2.0.0",
"prop-types": "^15.7.0"
}
@@ -3766,9 +3947,9 @@
}
},
"@wordpress/block-editor": {
- "version": "8.0.9",
- "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.9.tgz",
- "integrity": "sha512-jH8Yh3M6zIDqyVv9zN7h08fYE0RthDf9JYcFBC/sBLn4BslMBKMyxNB6Pu0n9Bubhh5sAtErMFB4YccjxxhRuQ==",
+ "version": "8.0.13",
+ "resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-8.0.13.tgz",
+ "integrity": "sha512-U/0Hj6wwayOFqBZg8ObR6XaDMpEnq1PXsNemxKp4BhLixiBDKMC0eXC0kBQJYm6BouMVwiw2r0StIyvl+XFovA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@react-spring/web": "^9.2.4",
@@ -3776,10 +3957,10 @@
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/blob": "^3.2.2",
"@wordpress/block-serialization-default-parser": "^4.2.3",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/dom": "^3.2.7",
"@wordpress/element": "^4.0.4",
@@ -3788,10 +3969,10 @@
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/is-shallow-equal": "^4.2.1",
- "@wordpress/keyboard-shortcuts": "^3.0.6",
+ "@wordpress/keyboard-shortcuts": "^3.0.7",
"@wordpress/keycodes": "^3.2.4",
- "@wordpress/notices": "^3.2.7",
- "@wordpress/rich-text": "^5.0.6",
+ "@wordpress/notices": "^3.2.8",
+ "@wordpress/rich-text": "^5.0.7",
"@wordpress/shortcode": "^3.2.3",
"@wordpress/token-list": "^2.2.2",
"@wordpress/url": "^3.3.1",
@@ -3813,9 +3994,9 @@
}
},
"@wordpress/block-library": {
- "version": "6.0.13",
- "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.13.tgz",
- "integrity": "sha512-ydtr8BycYW5rxkZ8VbCLz7ZSCpzDGF9yimqvvICXzWSQHn4Sohk417NQB33awwawgr7wsOY/RhhIACdbz3G7Nw==",
+ "version": "6.0.18",
+ "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.18.tgz",
+ "integrity": "sha512-U7JiHp5d+JkUtsSByplkvfbWonUbRLFS1Gm6afbICT1w4hj3xFFxgBo9aCc8VzQOFS/2fpoQUANEK6h5QUBdAg==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
@@ -3823,12 +4004,12 @@
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/autop": "^3.2.3",
"@wordpress/blob": "^3.2.2",
- "@wordpress/block-editor": "^8.0.9",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/core-data": "^4.0.8",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/block-editor": "^8.0.13",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/core-data": "^4.0.9",
+ "@wordpress/data": "^6.1.5",
"@wordpress/date": "^4.2.3",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/dom": "^3.2.7",
@@ -3838,16 +4019,16 @@
"@wordpress/html-entities": "^3.2.3",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
- "@wordpress/interface": "^4.1.11",
+ "@wordpress/interface": "^4.1.15",
"@wordpress/is-shallow-equal": "^4.2.1",
"@wordpress/keycodes": "^3.2.4",
- "@wordpress/notices": "^3.2.7",
+ "@wordpress/notices": "^3.2.8",
"@wordpress/primitives": "^3.0.4",
- "@wordpress/reusable-blocks": "^3.0.15",
- "@wordpress/rich-text": "^5.0.6",
- "@wordpress/server-side-render": "^3.0.13",
+ "@wordpress/reusable-blocks": "^3.0.19",
+ "@wordpress/rich-text": "^5.0.7",
+ "@wordpress/server-side-render": "^3.0.17",
"@wordpress/url": "^3.3.1",
- "@wordpress/viewport": "^4.0.6",
+ "@wordpress/viewport": "^4.0.7",
"classnames": "^2.3.1",
"colord": "^2.7.0",
"fast-average-color": "4.3.0",
@@ -3866,16 +4047,16 @@
}
},
"@wordpress/blocks": {
- "version": "11.1.4",
- "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-11.1.4.tgz",
- "integrity": "sha512-iTmkALp7diiP83ICsqQmtCvekOVEa1GCgbybfMS+eniVSXmMIgfZB69eYvf22XqQa68r9nCTIYuP2maPwPid3A==",
+ "version": "11.1.5",
+ "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-11.1.5.tgz",
+ "integrity": "sha512-r4xNTQPpUqJ7vqsJqH4D5+GeRQVOLF+9dkeNxkKQnJSFZ5y6POd28d0gMsOcTdGtAzXN6sak104DaKry2SWQNA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/autop": "^3.2.3",
"@wordpress/blob": "^3.2.2",
"@wordpress/block-serialization-default-parser": "^4.2.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/dom": "^3.2.7",
"@wordpress/element": "^4.0.4",
@@ -3900,9 +4081,9 @@
"dev": true
},
"@wordpress/components": {
- "version": "19.1.3",
- "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.1.3.tgz",
- "integrity": "sha512-wt0t6HxAEtNIvGpz4kIZfVa/fMeJr94vmPmoQyiDOrUGVH4T/7bkBKpNvcNmSo/xUkDgZ3p/t07AjzSF+spIrQ==",
+ "version": "19.2.0",
+ "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-19.2.0.tgz",
+ "integrity": "sha512-IFvbH7Jo9jqbH+ZXCMm+tLaJDn95Q783aNtm9GVA+z3nJSyh4Dl2MXsRfOSE/mLd2iToPDCrpuHi51hr/lrGcw==",
"requires": {
"@babel/runtime": "^7.16.0",
"@emotion/cache": "^11.4.0",
@@ -3911,7 +4092,7 @@
"@emotion/styled": "^11.3.0",
"@emotion/utils": "1.0.0",
"@wordpress/a11y": "^3.2.4",
- "@wordpress/compose": "^5.0.6",
+ "@wordpress/compose": "^5.0.7",
"@wordpress/date": "^4.2.3",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/dom": "^3.2.7",
@@ -3922,7 +4103,7 @@
"@wordpress/is-shallow-equal": "^4.2.1",
"@wordpress/keycodes": "^3.2.4",
"@wordpress/primitives": "^3.0.4",
- "@wordpress/rich-text": "^5.0.6",
+ "@wordpress/rich-text": "^5.0.7",
"@wordpress/warning": "^2.2.2",
"classnames": "^2.3.1",
"colord": "^2.7.0",
@@ -3945,9 +4126,9 @@
}
},
"@wordpress/compose": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-5.0.6.tgz",
- "integrity": "sha512-Gm0BA74oHCjbr8A7xifKYK2V++eeAscsIIURgqo3NN4qCIaGuqMEgUDdTxCBW4vJL6TKAE0Yk56018V6mg56Cg==",
+ "version": "5.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-5.0.7.tgz",
+ "integrity": "sha512-5PJmxW85tlw4lteiXKKycloZ3tNzcKSCYpnZa07XHKHYvq5aoKRrHwh+t3oSnLjjavczVd6Lcd7EQPpD18MSbw==",
"requires": {
"@babel/runtime": "^7.16.0",
"@types/lodash": "^4.14.172",
@@ -3966,14 +4147,14 @@
}
},
"@wordpress/core-data": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-4.0.8.tgz",
- "integrity": "sha512-nv7lXFU+7kdPhoD/Cz5oi6Xu1ODPRDwoMYYpIPB2nEfLi6foleDxhUuib9unwAtvUKNtQnrClDesys7l6pXMwQ==",
+ "version": "4.0.9",
+ "resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-4.0.9.tgz",
+ "integrity": "sha512-BCHqGWLre2GBClI901ar9+S5T0EmNQ56wdYqPE6aZJlTV3/QWgFoL241NqGvjAJ6ipC9+clpwwndX7JFG3juKw==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/element": "^4.0.4",
"@wordpress/html-entities": "^3.2.3",
@@ -3987,12 +4168,12 @@
}
},
"@wordpress/data": {
- "version": "6.1.4",
- "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-6.1.4.tgz",
- "integrity": "sha512-8kjLchELZCxjETPHnFrb2VaeIOEUAYrsO9moDUkhUnQ7SnCWGxhOYUKSMm0QknWjoAIBuJkuejTB98uqkREZWA==",
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/@wordpress/data/-/data-6.1.5.tgz",
+ "integrity": "sha512-v31NAUpDUqlCma2FYqP45cUrCz5EfMH4m6X50c4lbuAV2ScVsWCRxb5X8mgHjZjDhKcp97fbknviCAD/pFEOng==",
"requires": {
"@babel/runtime": "^7.16.0",
- "@wordpress/compose": "^5.0.6",
+ "@wordpress/compose": "^5.0.7",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/element": "^4.0.4",
"@wordpress/is-shallow-equal": "^4.2.1",
@@ -4007,13 +4188,13 @@
}
},
"@wordpress/data-controls": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.2.7.tgz",
- "integrity": "sha512-4FDOscyEs+/aaR+Aczo1XfmESjmpAPicD1i67jwQY2HPMPke1fyTszIB+17daimELDAt17v9dPLcMspyB+SRGg==",
+ "version": "2.2.8",
+ "resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.2.8.tgz",
+ "integrity": "sha512-hoaYLeZEmgUBJvHsv5SeGUKx433HfQfJ5sPu/8PiouUK/vr+8rMGM02ydTye6saWAMOHxvOxa08rzIWvWnZg/w==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3"
}
},
@@ -4064,9 +4245,9 @@
}
},
"@wordpress/e2e-test-utils": {
- "version": "5.4.9",
- "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.9.tgz",
- "integrity": "sha512-L0ReQGU8N9soIUoomVEILR7/PX0BrlBMltH9yjFuNxUweqZxoKd5vhNEDQfN2BZM24Zrnm9P/XQmdNwr9r/vPw==",
+ "version": "5.4.10",
+ "resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-5.4.10.tgz",
+ "integrity": "sha512-JRp1f7uQ9INpN3t0x4X07P3uBMwaitou9lvYWpDwVsHRcDn21NyFpVYbsX/T63ADIpvcqIhql58RnkVJRUWYxg==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
@@ -4079,36 +4260,36 @@
}
},
"@wordpress/edit-post": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.15.tgz",
- "integrity": "sha512-FderqFJd+gH4EoCsGl78wqGfCFMGNIcLSoY51LO+UV2Cp750bla8llwQ4iKYD3Ilej+E4mB+v+kN53juXwH+Vw==",
+ "version": "5.0.20",
+ "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.20.tgz",
+ "integrity": "sha512-7/8BT2vPin/vg6Opml3uFYhtFMjsdX4DGniiEUeZhoRLC7AiU1VNlxEKklTNRkMHQI4tCcr6+qc7YoMbB5nmyQ==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
- "@wordpress/block-editor": "^8.0.9",
- "@wordpress/block-library": "^6.0.13",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/core-data": "^4.0.8",
- "@wordpress/data": "^6.1.4",
- "@wordpress/data-controls": "^2.2.7",
- "@wordpress/editor": "^12.0.12",
+ "@wordpress/block-editor": "^8.0.13",
+ "@wordpress/block-library": "^6.0.18",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/core-data": "^4.0.9",
+ "@wordpress/data": "^6.1.5",
+ "@wordpress/data-controls": "^2.2.8",
+ "@wordpress/editor": "^12.0.16",
"@wordpress/element": "^4.0.4",
"@wordpress/hooks": "^3.2.2",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
- "@wordpress/interface": "^4.1.11",
- "@wordpress/keyboard-shortcuts": "^3.0.6",
+ "@wordpress/interface": "^4.1.15",
+ "@wordpress/keyboard-shortcuts": "^3.0.7",
"@wordpress/keycodes": "^3.2.4",
"@wordpress/media-utils": "^3.0.5",
- "@wordpress/notices": "^3.2.7",
- "@wordpress/plugins": "^4.0.6",
+ "@wordpress/notices": "^3.2.8",
+ "@wordpress/plugins": "^4.0.7",
"@wordpress/primitives": "^3.0.4",
"@wordpress/url": "^3.3.1",
- "@wordpress/viewport": "^4.0.6",
+ "@wordpress/viewport": "^4.0.7",
"@wordpress/warning": "^2.2.2",
"classnames": "^2.3.1",
"lodash": "^4.17.21",
@@ -4126,22 +4307,22 @@
}
},
"@wordpress/editor": {
- "version": "12.0.12",
- "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.12.tgz",
- "integrity": "sha512-rXFJq2zLblwsvsql17bql6xQBSIIU+BLsqhG+CH7CWyd4IyCNCdmwmdkwvmKiTmEklVU7qkEkXoT6brzmk1K5g==",
+ "version": "12.0.16",
+ "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.0.16.tgz",
+ "integrity": "sha512-RtDf0h0lh613qudt5eG9EbG5Pp5PMuB8yfwnHCrA8d0yGaF24k3pxE7QMBaWeAcKGnDwev30Nt980nBtcm5+1w==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
"@wordpress/api-fetch": "^5.2.6",
"@wordpress/autop": "^3.2.3",
"@wordpress/blob": "^3.2.2",
- "@wordpress/block-editor": "^8.0.9",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/core-data": "^4.0.8",
- "@wordpress/data": "^6.1.4",
- "@wordpress/data-controls": "^2.2.7",
+ "@wordpress/block-editor": "^8.0.13",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/core-data": "^4.0.9",
+ "@wordpress/data": "^6.1.5",
+ "@wordpress/data-controls": "^2.2.8",
"@wordpress/date": "^4.2.3",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/element": "^4.0.4",
@@ -4150,13 +4331,13 @@
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
"@wordpress/is-shallow-equal": "^4.2.1",
- "@wordpress/keyboard-shortcuts": "^3.0.6",
+ "@wordpress/keyboard-shortcuts": "^3.0.7",
"@wordpress/keycodes": "^3.2.4",
"@wordpress/media-utils": "^3.0.5",
- "@wordpress/notices": "^3.2.7",
- "@wordpress/reusable-blocks": "^3.0.15",
- "@wordpress/rich-text": "^5.0.6",
- "@wordpress/server-side-render": "^3.0.13",
+ "@wordpress/notices": "^3.2.8",
+ "@wordpress/reusable-blocks": "^3.0.19",
+ "@wordpress/rich-text": "^5.0.7",
+ "@wordpress/server-side-render": "^3.0.17",
"@wordpress/url": "^3.3.1",
"@wordpress/wordcount": "^3.2.3",
"classnames": "^2.3.1",
@@ -4337,22 +4518,22 @@
}
},
"@wordpress/interface": {
- "version": "4.1.11",
- "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.11.tgz",
- "integrity": "sha512-G28FsfH3sdw7padLMy47/SMwHjPLt3ZPqdHUa1tkSNZ1eZ8Slyr9iHj051aqZS5m51ItCnIjvVUaJZmS5r6ZEg==",
+ "version": "4.1.15",
+ "resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.1.15.tgz",
+ "integrity": "sha512-11vTvDG08A0QMicNc4hJBNMFDATRxWPEEEiB0g2pZRyZ09kMXcJ4Je9SdZz5jl2Bz/x8oEeTYeLqyvioq928cw==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/element": "^4.0.4",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
- "@wordpress/plugins": "^4.0.6",
- "@wordpress/viewport": "^4.0.6",
+ "@wordpress/plugins": "^4.0.7",
+ "@wordpress/viewport": "^4.0.7",
"classnames": "^2.3.1",
"lodash": "^4.17.21"
}
@@ -4400,13 +4581,13 @@
}
},
"@wordpress/keyboard-shortcuts": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-3.0.6.tgz",
- "integrity": "sha512-JOmWcmlSADYl+xihCO3a516WKRULmYXQ7a3/fmoGQDauwIOteFjtpNFMn7lstprNiU6e8WIUHiVL5nWwZiyvig==",
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-3.0.7.tgz",
+ "integrity": "sha512-qBlM4Wa1ntzX7MQM7oifOKnHgH+sWGdynmut4rCuCUqfGqqB6hwBE3nkg3sMMWYKTxA8AtE8wcxPr9bQffnx1w==",
"requires": {
"@babel/runtime": "^7.16.0",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/element": "^4.0.4",
"@wordpress/keycodes": "^3.2.4",
"lodash": "^4.17.21",
@@ -4437,13 +4618,13 @@
}
},
"@wordpress/notices": {
- "version": "3.2.7",
- "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.2.7.tgz",
- "integrity": "sha512-1VmnJznby96jjUbcTaT1WOiR4aCh8rrCHy3nTyAjHcJmJNvDGLLj4TgChlMk5Sw8j9K4x9kxmSiEA/IlrSPGkQ==",
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.2.8.tgz",
+ "integrity": "sha512-SC7O+L81Xf50ntHSfUGpvnb1FutSV4RZxZQyEDdiRe4Ril1dnm4ddU49AXunPHsQ68VYNUBxs8P30EplXtZp5g==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/data": "^6.1.5",
"lodash": "^4.17.21"
}
},
@@ -4454,13 +4635,13 @@
"dev": true
},
"@wordpress/plugins": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-4.0.6.tgz",
- "integrity": "sha512-aM1fw04WD4MPpwPtJzlkxQ3Re/w1scja9ybGQ0TkKT8lQxBUHRq/9g/IcKOVEEgWSTIn+ThT+FmWkX1Dk+iflg==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-4.0.7.tgz",
+ "integrity": "sha512-dSvSOTkGuoJ7kfst/eLJpHNHf12If+UYsB5WuGXy5sk3z5H9EIOe6XC5272ZVrS/5DUGloCxZP7k7m2vG5iXuQ==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
- "@wordpress/compose": "^5.0.6",
+ "@wordpress/compose": "^5.0.7",
"@wordpress/element": "^4.0.4",
"@wordpress/hooks": "^3.2.2",
"@wordpress/icons": "^6.1.1",
@@ -4515,33 +4696,33 @@
}
},
"@wordpress/reusable-blocks": {
- "version": "3.0.15",
- "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.15.tgz",
- "integrity": "sha512-MCGiPeFn7oO+uZa9E0edf1c0CJUWlVQEYP44+QXr/pggDz16ulHP/YsQkp6z/IFC1luPmyZ4pVQBGSnyTg8D1w==",
- "requires": {
- "@wordpress/block-editor": "^8.0.9",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/core-data": "^4.0.8",
- "@wordpress/data": "^6.1.4",
+ "version": "3.0.19",
+ "resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.0.19.tgz",
+ "integrity": "sha512-EU4Vo3ETTTN5DAQCrgh3AOuVRsZCrIJ1LcRgGJfFBSEJe6Sto3pxxj3ZtI+Goc4U553q3M/qpghHZNo1JZcfew==",
+ "requires": {
+ "@wordpress/block-editor": "^8.0.13",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/core-data": "^4.0.9",
+ "@wordpress/data": "^6.1.5",
"@wordpress/element": "^4.0.4",
"@wordpress/i18n": "^4.2.4",
"@wordpress/icons": "^6.1.1",
- "@wordpress/notices": "^3.2.7",
+ "@wordpress/notices": "^3.2.8",
"@wordpress/url": "^3.3.1",
"lodash": "^4.17.21"
}
},
"@wordpress/rich-text": {
- "version": "5.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-5.0.6.tgz",
- "integrity": "sha512-9Myj6UQ3fYZERaUoVXRjq2rq7G77Tfe7XrQAntfW7El7/NWDkB/TddgsuOkFd8NG8E7/jEih7d7G9erm4y6adg==",
+ "version": "5.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-5.0.7.tgz",
+ "integrity": "sha512-oroNrJFJw9DNVielMdel/EeJNwD/bGzKPEAL0cp1AbilcS4jNxBW7oR+hOOv/ZQGH+1iDmOhwhOdERP4n78s3A==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/a11y": "^3.2.4",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/dom": "^3.2.7",
"@wordpress/element": "^4.0.4",
"@wordpress/escape-html": "^2.2.3",
@@ -4555,9 +4736,9 @@
}
},
"@wordpress/scripts": {
- "version": "19.2.2",
- "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.2.tgz",
- "integrity": "sha512-cH1NVhBKScNHIHXc3Af7FBOdsZBrA72IJVcZwUx79/BJVEhPVG3B9Kn4xkXP9RtYCkWETQ+s/KodzolL9RuHmQ==",
+ "version": "19.2.3",
+ "resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-19.2.3.tgz",
+ "integrity": "sha512-jloIx5KlolaUy6dURK0UZNzfJtBrWXMQ2xeiKD2LLktAQQXu/rz63hFmQrjB49e97WdQJNA1yTiNxums2BeGDg==",
"dev": true,
"requires": {
"@svgr/webpack": "^5.5.0",
@@ -4592,7 +4773,7 @@
"markdownlint": "^0.23.1",
"markdownlint-cli": "^0.27.1",
"merge-deep": "^3.0.3",
- "mini-css-extract-plugin": "^2.1.0",
+ "mini-css-extract-plugin": "^2.5.0",
"minimist": "^1.2.0",
"npm-package-json-lint": "^5.0.0",
"postcss": "^8.2.15",
@@ -4666,14 +4847,20 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
+ "klona": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+ "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+ "dev": true
+ },
"postcss-loader": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.0.tgz",
- "integrity": "sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+ "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
"dev": true,
"requires": {
"cosmiconfig": "^7.0.0",
- "klona": "^2.0.4",
+ "klona": "^2.0.5",
"semver": "^7.3.5"
}
},
@@ -4698,16 +4885,16 @@
}
},
"@wordpress/server-side-render": {
- "version": "3.0.13",
- "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.13.tgz",
- "integrity": "sha512-LQxTzuZK+8PPZS1S+pR6VBdnAw2TJX+AvlTSorVjmRTHrJHjtJUZO3F5opon9oC5XaIBW1+wBeS6MhmufN4pEg==",
+ "version": "3.0.17",
+ "resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.0.17.tgz",
+ "integrity": "sha512-UIyywGUSlbOVFi1SNwI/uUmHmUJFX+N9XeBCAnS15PmfYflBkiuz9FPmZWoqLoOE4uWTI7K9lAP1tkY80lotIA==",
"requires": {
"@babel/runtime": "^7.16.0",
"@wordpress/api-fetch": "^5.2.6",
- "@wordpress/blocks": "^11.1.4",
- "@wordpress/components": "^19.1.3",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/blocks": "^11.1.5",
+ "@wordpress/components": "^19.2.0",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"@wordpress/deprecated": "^3.2.3",
"@wordpress/element": "^4.0.4",
"@wordpress/i18n": "^4.2.4",
@@ -4755,14 +4942,14 @@
}
},
"@wordpress/viewport": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-4.0.6.tgz",
- "integrity": "sha512-adqJ6gN+GYJiJqXuvMRtt8o0jIY6Yz0kiovtuc5gjzFGTxSm25zcP5FX/py7i8yKgVazATQOEkqVAIEwVG43Nw==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-4.0.7.tgz",
+ "integrity": "sha512-huxUrFW6JNhj/hUfvftZeht3B6HF0jk10oyHW3dPcFW57ceecJTDB9BdS7a99B1LBP8AWjdN8x/3SqrMwE4yfg==",
"dev": true,
"requires": {
"@babel/runtime": "^7.16.0",
- "@wordpress/compose": "^5.0.6",
- "@wordpress/data": "^6.1.4",
+ "@wordpress/compose": "^5.0.7",
+ "@wordpress/data": "^6.1.5",
"lodash": "^4.17.21"
}
},
@@ -4901,9 +5088,9 @@
},
"dependencies": {
"ajv": {
- "version": "8.8.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
- "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+ "version": "8.9.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
+ "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -5156,17 +5343,50 @@
"dev": true
},
"autoprefixer": {
- "version": "10.4.0",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz",
- "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==",
+ "version": "10.4.2",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz",
+ "integrity": "sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==",
"dev": true,
"requires": {
- "browserslist": "^4.17.5",
- "caniuse-lite": "^1.0.30001272",
- "fraction.js": "^4.1.1",
+ "browserslist": "^4.19.1",
+ "caniuse-lite": "^1.0.30001297",
+ "fraction.js": "^4.1.2",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
- "postcss-value-parser": "^4.1.0"
+ "postcss-value-parser": "^4.2.0"
+ },
+ "dependencies": {
+ "browserslist": {
+ "version": "4.19.1",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz",
+ "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==",
+ "dev": true,
+ "requires": {
+ "caniuse-lite": "^1.0.30001286",
+ "electron-to-chromium": "^1.4.17",
+ "escalade": "^3.1.1",
+ "node-releases": "^2.0.1",
+ "picocolors": "^1.0.0"
+ }
+ },
+ "caniuse-lite": {
+ "version": "1.0.30001300",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz",
+ "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==",
+ "dev": true
+ },
+ "electron-to-chromium": {
+ "version": "1.4.47",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.47.tgz",
+ "integrity": "sha512-ZHc8i3/cgeCRK/vC7W2htAG6JqUmOUgDNn/f9yY9J8UjfLjwzwOVEt4MWmgJAdvmxyrsR5KIFA/6+kUHGY0eUA==",
+ "dev": true
+ },
+ "postcss-value-parser": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+ "dev": true
+ }
}
},
"autosize": {
@@ -10010,9 +10230,9 @@
}
},
"http-parser-js": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
- "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",
+ "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
"dev": true
},
"http-proxy-agent": {
@@ -10068,6 +10288,12 @@
"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
"dev": true
},
+ "immutable": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+ "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+ "dev": true
+ },
"import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -10084,9 +10310,9 @@
"dev": true
},
"import-local": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
- "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+ "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
"dev": true,
"requires": {
"pkg-dir": "^4.2.0",
@@ -10740,9 +10966,9 @@
}
},
"istanbul-reports": {
- "version": "3.0.5",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
- "integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+ "integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
"dev": true,
"requires": {
"html-escaper": "^2.0.0",
@@ -12393,9 +12619,9 @@
}
},
"camelcase": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
- "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
"dev": true
},
"chalk": {
@@ -12535,14 +12761,14 @@
}
},
"joi": {
- "version": "17.4.2",
- "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz",
- "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==",
+ "version": "17.5.0",
+ "resolved": "https://registry.npmjs.org/joi/-/joi-17.5.0.tgz",
+ "integrity": "sha512-R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw==",
"dev": true,
"requires": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
- "@sideway/address": "^4.1.0",
+ "@sideway/address": "^4.1.3",
"@sideway/formula": "^3.0.0",
"@sideway/pinpoint": "^2.0.0"
}
@@ -12604,9 +12830,9 @@
},
"dependencies": {
"acorn": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
- "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+ "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
"dev": true
},
"form-data": {
@@ -13853,12 +14079,6 @@
"integrity": "sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ==",
"dev": true
},
- "mime": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
- "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
- "dev": true
- },
"mime-db": {
"version": "1.51.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
@@ -13887,18 +14107,18 @@
"dev": true
},
"mini-css-extract-plugin": {
- "version": "2.4.5",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
- "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.2.tgz",
+ "integrity": "sha512-Lwgq9qLNyBK6yNLgzssXnq4r2+mB9Mz3cJWlM8kseysHIvTicFhDNimFgY94jjqlwhNzLPsq8wv4X+vOHtMdYA==",
"dev": true,
"requires": {
"schema-utils": "^4.0.0"
},
"dependencies": {
"ajv": {
- "version": "8.8.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
- "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+ "version": "8.9.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
+ "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -14051,6 +14271,12 @@
"resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
"integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="
},
+ "mrmime": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz",
+ "integrity": "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==",
+ "dev": true
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -14133,12 +14359,6 @@
"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
"dev": true
},
- "node-modules-regexp": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
- "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
- "dev": true
- },
"node-notifier": {
"version": "8.0.2",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
@@ -14317,9 +14537,9 @@
"dev": true
},
"ignore": {
- "version": "5.1.9",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
- "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+ "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
"dev": true
},
"semver": {
@@ -14866,13 +15086,10 @@
}
},
"pirates": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
- "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
- "dev": true,
- "requires": {
- "node-modules-regexp": "^1.0.0"
- }
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
+ "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
+ "dev": true
},
"pkg-dir": {
"version": "2.0.0",
@@ -16941,9 +17158,9 @@
"dev": true
},
"qs": {
- "version": "6.10.1",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
- "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+ "version": "6.10.3",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+ "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
"dev": true,
"requires": {
"side-channel": "^1.0.4"
@@ -17990,18 +18207,20 @@
}
},
"sass": {
- "version": "1.43.4",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz",
- "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==",
+ "version": "1.48.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.48.0.tgz",
+ "integrity": "sha512-hQi5g4DcfjcipotoHZ80l7GNJHGqQS5LwMBjVYB/TaT0vcSSpbgM8Ad7cgfsB2M0MinbkEQQPO9+sjjSiwxqmw==",
"dev": true,
"requires": {
- "chokidar": ">=3.0.0 <4.0.0"
+ "chokidar": ">=3.0.0 <4.0.0",
+ "immutable": "^4.0.0",
+ "source-map-js": ">=0.6.2 <2.0.0"
}
},
"sass-loader": {
- "version": "12.3.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.3.0.tgz",
- "integrity": "sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==",
+ "version": "12.4.0",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
+ "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
"dev": true,
"requires": {
"klona": "^2.0.4",
@@ -18193,13 +18412,13 @@
"integrity": "sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og=="
},
"sirv": {
- "version": "1.0.18",
- "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.18.tgz",
- "integrity": "sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==",
+ "version": "1.0.19",
+ "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+ "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
"dev": true,
"requires": {
"@polka/url": "^1.0.0-next.20",
- "mime": "^2.3.1",
+ "mrmime": "^1.0.0",
"totalist": "^1.0.0"
}
},
@@ -18398,14 +18617,22 @@
"dev": true
},
"source-map-loader": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.0.tgz",
- "integrity": "sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
+ "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
"dev": true,
"requires": {
"abab": "^2.0.5",
- "iconv-lite": "^0.6.2",
- "source-map-js": "^0.6.2"
+ "iconv-lite": "^0.6.3",
+ "source-map-js": "^1.0.1"
+ },
+ "dependencies": {
+ "source-map-js": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
+ "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
+ "dev": true
+ }
}
},
"source-map-resolve": {
@@ -18959,9 +19186,9 @@
"dev": true
},
"hosted-git-info": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
- "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -19209,9 +19436,9 @@
}
},
"stylis": {
- "version": "4.0.10",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",
- "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="
+ "version": "4.0.13",
+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
+ "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
},
"sugarss": {
"version": "2.0.0",
@@ -19541,12 +19768,12 @@
}
},
"terser-webpack-plugin": {
- "version": "5.2.5",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz",
- "integrity": "sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz",
+ "integrity": "sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==",
"dev": true,
"requires": {
- "jest-worker": "^27.0.6",
+ "jest-worker": "^27.4.1",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
"source-map": "^0.6.1",
@@ -19560,9 +19787,9 @@
"dev": true
},
"jest-worker": {
- "version": "27.3.1",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
- "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+ "version": "27.4.6",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz",
+ "integrity": "sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==",
"dev": true,
"requires": {
"@types/node": "*",
@@ -20291,9 +20518,9 @@
}
},
"watchpack": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
- "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
+ "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
"dev": true,
"requires": {
"glob-to-regexp": "^0.4.1",
@@ -20307,9 +20534,9 @@
"dev": true
},
"webpack": {
- "version": "5.64.2",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.2.tgz",
- "integrity": "sha512-4KGc0+Ozi0aS3EaLNRvEppfZUer+CaORKqL6OBjDLZOPf9YfN8leagFzwe6/PoBdHFxc/utKArl8LMC0Ivtmdg==",
+ "version": "5.66.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz",
+ "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@@ -20326,7 +20553,7 @@
"eslint-scope": "5.1.1",
"events": "^3.2.0",
"glob-to-regexp": "^0.4.1",
- "graceful-fs": "^4.2.4",
+ "graceful-fs": "^4.2.9",
"json-parse-better-errors": "^1.0.2",
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
@@ -20334,14 +20561,20 @@
"schema-utils": "^3.1.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
- "watchpack": "^2.2.0",
+ "watchpack": "^2.3.1",
"webpack-sources": "^3.2.2"
},
"dependencies": {
"acorn": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
- "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+ "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+ "dev": true
+ },
+ "graceful-fs": {
+ "version": "4.2.9",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"schema-utils": {
@@ -20356,9 +20589,9 @@
}
},
"webpack-sources": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
- "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
"dev": true
}
}
@@ -20381,9 +20614,9 @@
},
"dependencies": {
"acorn": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
- "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+ "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
"dev": true
},
"acorn-walk": {
@@ -20901,9 +21134,9 @@
}
},
"ws": {
- "version": "7.5.5",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
- "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+ "version": "7.5.6",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz",
+ "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==",
"dev": true
},
"xml-name-validator": {
diff --git a/package.json b/package.json
index 871e12181f4..a65826924d9 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,11 @@
"dependencies": {
"@wordpress/api-fetch": "5.2.6",
"@wordpress/autop": "3.2.3",
- "@wordpress/components": "19.1.3",
- "@wordpress/compose": "5.0.6",
+ "@wordpress/components": "19.2.0",
+ "@wordpress/compose": "5.0.7",
"@wordpress/date": "4.2.3",
"@wordpress/dom-ready": "3.2.3",
- "@wordpress/editor": "12.0.12",
+ "@wordpress/editor": "12.0.16",
"@wordpress/element": "4.0.4",
"@wordpress/escape-html": "2.2.3",
"@wordpress/html-entities": "3.2.3",
@@ -49,18 +49,18 @@
"@babel/core": "7.16.0",
"@babel/plugin-proposal-class-properties": "7.16.0",
"@wordpress/babel-preset-default": "6.4.1",
- "@wordpress/block-editor": "8.0.9",
- "@wordpress/blocks": "11.1.4",
+ "@wordpress/block-editor": "8.0.13",
+ "@wordpress/blocks": "11.1.5",
"@wordpress/browserslist-config": "4.1.0",
- "@wordpress/data": "6.1.4",
+ "@wordpress/data": "6.1.5",
"@wordpress/dependency-extraction-webpack-plugin": "3.2.1",
- "@wordpress/e2e-test-utils": "5.4.9",
- "@wordpress/edit-post": "5.0.15",
+ "@wordpress/e2e-test-utils": "5.4.10",
+ "@wordpress/edit-post": "5.0.20",
"@wordpress/eslint-plugin": "9.3.0",
"@wordpress/hooks": "3.2.2",
"@wordpress/jest-puppeteer-axe": "3.1.1",
- "@wordpress/plugins": "4.0.6",
- "@wordpress/scripts": "19.2.2",
+ "@wordpress/plugins": "4.0.7",
+ "@wordpress/scripts": "19.2.3",
"axios": "0.21.2",
"babel-plugin-inline-react-svg": "2.0.1",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
diff --git a/tests/php/test-class-amp-youtube-embed-handler.php b/tests/php/test-class-amp-youtube-embed-handler.php
index 3e9e745e488..9dd40755dd0 100644
--- a/tests/php/test-class-amp-youtube-embed-handler.php
+++ b/tests/php/test-class-amp-youtube-embed-handler.php
@@ -6,6 +6,7 @@
* @since 0.7
*/
+use AmpProject\AmpWP\Tests\Helpers\MarkupComparison;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\AmpWP\Tests\Helpers\WithoutBlockPreRendering;
use AmpProject\AmpWP\Tests\TestCase;
@@ -17,6 +18,7 @@
*/
class Test_AMP_YouTube_Embed_Handler extends TestCase {
+ use MarkupComparison;
use PrivateAccess;
use WithoutBlockPreRendering {
setUp as public prevent_block_pre_render;
@@ -114,7 +116,7 @@ public function test_register_and_unregister_embed() {
$embed = new AMP_YouTube_Embed_Handler();
$embed->register_embed();
$this->assertEquals( 10, has_filter( 'embed_oembed_html', [ $embed, 'filter_embed_oembed_html' ] ) );
- $this->assertEquals( 10, has_filter( 'wp_video_shortcode_override', [ $embed, 'video_override' ] ) );
+ $this->assertEquals( PHP_INT_MAX, has_filter( 'wp_video_shortcode_override', [ $embed, 'video_override' ] ) );
$embed->unregister_embed();
$this->assertFalse( has_filter( 'embed_oembed_html', [ $embed, 'filter_embed_oembed_html' ] ) );
$this->assertFalse( has_filter( 'wp_video_shortcode_override', [ $embed, 'video_override' ] ) );
@@ -156,6 +158,10 @@ public function sanitize_raw_embeds_data_provider() {
'source' => '',
'expected' => '',
],
+ 'youtube-fixed-height' => [
+ 'source' => '',
+ 'expected' => '
',
+ ],
];
}
@@ -166,6 +172,7 @@ public function sanitize_raw_embeds_data_provider() {
* @covers ::get_amp_component()
* @covers ::get_placeholder_element()
* @covers ::prepare_attributes()
+ * @covers ::amend_fixed_height_layout()
*/
public function test_sanitize_raw_embeds( $source, $expected ) {
@@ -180,7 +187,7 @@ public function test_sanitize_raw_embeds( $source, $expected ) {
$content = AMP_DOM_Utils::get_content_from_dom( $dom );
- $this->assertEquals( $expected, trim( $content ) );
+ $this->assertEqualMarkup( $expected, $content );
}
/**
@@ -190,6 +197,7 @@ public function test_sanitize_raw_embeds( $source, $expected ) {
* @covers ::video_override()
* @covers ::render()
* @covers ::get_placeholder_markup()
+ * @covers ::amend_fixed_height_layout()
*/
public function test_video_override() {
remove_all_filters( 'wp_video_shortcode_override' );
@@ -201,8 +209,33 @@ public function test_video_override() {
];
$youtube_shortcode = $this->handler->video_override( '', $attr_youtube );
- $this->assertStringContainsString( 'assertStringContainsString( $youtube_id, $youtube_shortcode );
+ $this->assertEqualMarkup(
+ '
',
+ $youtube_shortcode
+ );
+
+ // Test when wp_video_shortcode_override filter has already overridden the markup.
+ $youtube_shortcode = $this->handler->video_override( "", $attr_youtube );
+ $this->assertEqualMarkup(
+ '',
+ $youtube_shortcode
+ );
+
+ // Test 100% width in video shortcode.
+ $youtube_shortcode = $this->handler->video_override(
+ '',
+ array_merge(
+ $attr_youtube,
+ [
+ 'width' => '100%',
+ 'height' => '315',
+ ]
+ )
+ );
+ $this->assertEqualMarkup(
+ '',
+ $youtube_shortcode
+ );
$vimeo_id = '64086087';
$vimeo_src = 'https://vimeo.com/' . $vimeo_id;
@@ -313,9 +346,9 @@ public function test__conversion( $source, $expected, $fallback_for_expected = n
version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.1', '<' )
&& null !== $fallback_for_expected
) {
- $this->assertEquals( $fallback_for_expected, $filtered_content );
+ $this->assertEqualMarkup( $fallback_for_expected, $filtered_content );
} else {
- $this->assertEquals( $expected, $filtered_content );
+ $this->assertEqualMarkup( $expected, $filtered_content );
}
}
diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php
index 6178dc22e24..6b34000c130 100644
--- a/tests/php/validation/test-class-amp-validation-manager.php
+++ b/tests/php/validation/test-class-amp-validation-manager.php
@@ -1382,6 +1382,9 @@ public function test_add_block_source_comments( $content, $expected, $query ) {
$rendered_block = do_blocks( AMP_Validation_Manager::add_block_source_comments( $content ) );
+ // Remove class name injected by gutenberg_render_layout_support_flag().
+ $rendered_block = preg_replace( '/(?<= class=")wp-container-\w+ /', '', $rendered_block );
+
$expected = str_replace(
[
'{{post_id}}',