diff --git a/recipes/drupal_cms_image/config/image.style.3_4_225x300_focal_point_webp.yml b/recipes/drupal_cms_image/config/image.style.3_4_225x300_focal_point_webp.yml index 3ca97b30e59a2a0335681bd23956a58265ad3f7a..e6e0ddaabb1a8df96d468dd6e2c3800ab0df9e99 100644 --- a/recipes/drupal_cms_image/config/image.style.3_4_225x300_focal_point_webp.yml +++ b/recipes/drupal_cms_image/config/image.style.3_4_225x300_focal_point_webp.yml @@ -14,3 +14,9 @@ effects: width: 225 height: 300 crop_type: focal_point + 9345aea6-53fb-43ca-8f3e-a0bd87a4e796: + uuid: 9345aea6-53fb-43ca-8f3e-a0bd87a4e796 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_image/config/image.style.3_4_450x600_focal_point_webp.yml b/recipes/drupal_cms_image/config/image.style.3_4_450x600_focal_point_webp.yml index 0e01f870075aa5ebb2c81f322d5851bf60ed2c2b..b61a6969930f9158f46ba1bf07b0b49ff250f67b 100644 --- a/recipes/drupal_cms_image/config/image.style.3_4_450x600_focal_point_webp.yml +++ b/recipes/drupal_cms_image/config/image.style.3_4_450x600_focal_point_webp.yml @@ -14,3 +14,9 @@ effects: width: 450 height: 600 crop_type: focal_point + bdd5bd8e-4cd7-4a1f-9c9f-b95cbe9c7138: + uuid: bdd5bd8e-4cd7-4a1f-9c9f-b95cbe9c7138 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_image/config/image.style.4_3_300x225_focal_point_webp.yml b/recipes/drupal_cms_image/config/image.style.4_3_300x225_focal_point_webp.yml index 7cb22e2b5625a021de286e6acfd9740e5a9ea681..b9ebd9491f10cebb2961403db15ba2e699618a72 100644 --- a/recipes/drupal_cms_image/config/image.style.4_3_300x225_focal_point_webp.yml +++ b/recipes/drupal_cms_image/config/image.style.4_3_300x225_focal_point_webp.yml @@ -14,3 +14,9 @@ effects: width: 300 height: 225 crop_type: focal_point + 6f7b215b-1907-472f-8f78-33e30a5c1956: + uuid: 6f7b215b-1907-472f-8f78-33e30a5c1956 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_image/config/image.style.uncropped_300w_webp.yml b/recipes/drupal_cms_image/config/image.style.uncropped_300w_webp.yml index 4eaaf2f4d39e48651d7e32283cda7ab12d1758c5..db6cdc3b5dc635b22700718b493d743796e46101 100644 --- a/recipes/drupal_cms_image/config/image.style.uncropped_300w_webp.yml +++ b/recipes/drupal_cms_image/config/image.style.uncropped_300w_webp.yml @@ -12,3 +12,9 @@ effects: width: 300 height: null upscale: false + edf92b44-e86e-4b5c-b11c-fd6e44ebda67: + uuid: edf92b44-e86e-4b5c-b11c-fd6e44ebda67 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_image/tests/src/Functional/ComponentValidationTest.php b/recipes/drupal_cms_image/tests/src/Functional/ComponentValidationTest.php index d11db660c34c0b9eaa6315a900562a1991fad64a..496febe0d0bb920fb6156cc6af73f2d5218c5cbd 100644 --- a/recipes/drupal_cms_image/tests/src/Functional/ComponentValidationTest.php +++ b/recipes/drupal_cms_image/tests/src/Functional/ComponentValidationTest.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace Drupal\Tests\drupal_cms_image\Functional; use Drupal\FunctionalTests\Core\Recipe\RecipeTestTrait; +use Drupal\image\Entity\ImageStyle; use Drupal\Tests\BrowserTestBase; /** @@ -26,6 +27,12 @@ class ComponentValidationTest extends BrowserTestBase { $this->applyRecipe($dir); // Apply it again to prove that it is idempotent. $this->applyRecipe($dir); + + // Ensure all image styles convert to WebP. + $image_styles = ImageStyle::loadMultiple(); + foreach ($image_styles as $id => $image_style) { + $this->assertSame('webp', $image_style->getDerivativeExtension('png'), "The '$id' image style does not convert to WebP."); + } } } diff --git a/recipes/drupal_cms_seo_tools/config/image.style.social_media_facebook.yml b/recipes/drupal_cms_seo_tools/config/image.style.social_media_facebook.yml index 4fcb9a96a24b760dbec96eb35dbcba02c1b1ecef..72a374063c3307e3c5afb2a9fb84fb7a3c336aae 100644 --- a/recipes/drupal_cms_seo_tools/config/image.style.social_media_facebook.yml +++ b/recipes/drupal_cms_seo_tools/config/image.style.social_media_facebook.yml @@ -14,3 +14,9 @@ effects: width: 1200 height: 630 crop_type: focal_point + 8ddd479d-03db-45d3-8591-a7b72e13bb21: + uuid: 8ddd479d-03db-45d3-8591-a7b72e13bb21 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_seo_tools/config/image.style.social_media_x.yml b/recipes/drupal_cms_seo_tools/config/image.style.social_media_x.yml index 41b8389a94c0587894cea7cb34c8291e7d54c9ee..f972980df68c740045453eaa456b571a1de9db53 100644 --- a/recipes/drupal_cms_seo_tools/config/image.style.social_media_x.yml +++ b/recipes/drupal_cms_seo_tools/config/image.style.social_media_x.yml @@ -14,3 +14,9 @@ effects: width: 1600 height: 900 crop_type: focal_point + 94553ea6-7659-4f21-b586-3dd07fb21e88: + uuid: 94553ea6-7659-4f21-b586-3dd07fb21e88 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/recipes/drupal_cms_seo_tools/tests/src/Functional/ContentMetaTagsTest.php b/recipes/drupal_cms_seo_tools/tests/src/Functional/ContentMetaTagsTest.php index d5ae3a4928048054ff6ef8eaf6198866cb4df7ec..961b20e447c002d14cf84db8fc07da0e18a14340 100644 --- a/recipes/drupal_cms_seo_tools/tests/src/Functional/ContentMetaTagsTest.php +++ b/recipes/drupal_cms_seo_tools/tests/src/Functional/ContentMetaTagsTest.php @@ -122,7 +122,7 @@ class ContentMetaTagsTest extends BrowserTestBase { $assert_session->elementAttributeContains('css', 'meta[property="og:image:alt"]', 'content', $alt_text); $assert_session->elementAttributeContains('css', 'meta[property="og:image:width"]', 'content', (string) $facebook_dimensions['width']); $assert_session->elementAttributeContains('css', 'meta[property="og:image:height"]', 'content', (string) $facebook_dimensions['height']); - $assert_session->elementAttributeContains('css', 'meta[property="og:image:type"]', 'content', $file->getMimeType()); + $assert_session->elementAttributeContains('css', 'meta[property="og:image:type"]', 'content', 'image/webp'); $assert_session->elementAttributeContains('css', 'meta[name="twitter:image"]', 'content', $name); $assert_session->elementAttributeContains('css', 'meta[name="twitter:image:alt"]', 'content', $alt_text); };