From 19ffe8719cfa8fb114ab8f459ff88e99b71dbd50 Mon Sep 17 00:00:00 2001 From: Sonvir Date: Wed, 13 Nov 2024 00:57:34 +0530 Subject: [PATCH] Issue-719: Replace webp with wfp module. (#750) Co-authored-by: sonvir249 <39142-sonvir249@users.noreply.drupalcode.org> --- composer.json | 2 +- composer.lock | 51 +++++++++---------- config/sync/core.extension.yml | 2 +- config/sync/image.style.card.yml | 6 +++ config/sync/image.style.hero_lg_1x.yml | 6 +++ config/sync/image.style.hero_lg_2x.yml | 6 +++ config/sync/image.style.hero_md_1x.yml | 6 +++ config/sync/image.style.hero_md_2x.yml | 6 +++ config/sync/image.style.hero_mobile_1x.yml | 6 +++ config/sync/image.style.hero_mobile_2x.yml | 6 +++ config/sync/image.style.hero_sm_1x.yml | 6 +++ config/sync/image.style.hero_sm_2x.yml | 6 +++ config/sync/image.style.hero_xl_1x.yml | 6 +++ config/sync/image.style.hero_xl_2x.yml | 6 +++ config/sync/image.style.large.yml | 6 +++ ...e.style.media_entity_browser_thumbnail.yml | 6 +++ config/sync/image.style.media_library.yml | 6 +++ config/sync/image.style.medium.yml | 6 +++ config/sync/image.style.prose_image.yml | 6 +++ config/sync/image.style.prose_image_x2.yml | 6 +++ config/sync/image.style.quote_lg_1x.yml | 6 +++ config/sync/image.style.quote_lg_2x.yml | 6 +++ config/sync/image.style.quote_md_1x.yml | 6 +++ config/sync/image.style.quote_md_2x.yml | 6 +++ config/sync/image.style.quote_mobile_1x.yml | 6 +++ config/sync/image.style.quote_mobile_2x.yml | 6 +++ config/sync/image.style.quote_sm_1x.yml | 6 +++ config/sync/image.style.quote_sm_2x.yml | 6 +++ config/sync/image.style.quote_xl_1x.yml | 6 +++ config/sync/image.style.quote_xl_2x.yml | 6 +++ config/sync/image.style.thumbnail.yml | 6 +++ config/sync/webp.settings.yml | 3 -- config/sync/wpf.settings.yml | 33 ++++++++++++ 33 files changed, 228 insertions(+), 31 deletions(-) delete mode 100644 config/sync/webp.settings.yml create mode 100644 config/sync/wpf.settings.yml diff --git a/composer.json b/composer.json index 7d486f2b0..c846b902f 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,7 @@ "drupal/ultimate_cron": "^2.0@alpha", "drupal/upgrade_status": "^4.0", "drupal/username_enumeration_prevention": "^1.3", - "drupal/webp": "^1.0@RC", + "drupal/wpf": "^1.2", "drush/drush": "^12.4", "longwave/laminas-diactoros": "^2.14", "npm-asset/anchor-js": "^5.0", diff --git a/composer.lock b/composer.lock index 3245ab921..e146533c8 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": "9be78e9e1839c8bd8e6a369c0b63a196", + "content-hash": "b39359d82267f4b683b257763dce7b60", "packages": [ { "name": "asm89/stack-cors", @@ -5505,31 +5505,31 @@ } }, { - "name": "drupal/webp", - "version": "1.0.0-rc2", + "name": "drupal/wpf", + "version": "1.2.4", "source": { "type": "git", - "url": "https://git.drupalcode.org/project/webp.git", - "reference": "8.x-1.0-rc2" + "url": "https://git.drupalcode.org/project/wpf.git", + "reference": "1.2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/webp-8.x-1.0-rc2.zip", - "reference": "8.x-1.0-rc2", - "shasum": "16a1d2c29af57ac04603bcba275e732340491554" + "url": "https://ftp.drupal.org/files/projects/wpf-1.2.4.zip", + "reference": "1.2.4", + "shasum": "faa7f46b2a91416cf789ba938a001c3826962a83" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11", + "drupal/core": "^10.3 || ^11", "ext-gd": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc2", - "datestamp": "1713170119", + "version": "1.2.4", + "datestamp": "1721639534", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -5539,28 +5539,28 @@ ], "authors": [ { - "name": "Bart Vanhoutte", - "homepage": "https://www.drupal.org/user/145609", - "email": "bart@croquemonsieur.be", + "name": "Dudás József", + "homepage": "https://www.drupal.org/user/387119", + "email": "dj@brainsum.com", "role": "Maintainer" }, { - "name": "Bart Vanhoutte", - "homepage": "https://www.drupal.org/user/1133754" + "name": "pedrop", + "homepage": "https://www.drupal.org/user/1043368" }, { - "name": "mandclu", - "homepage": "https://www.drupal.org/user/52136" + "name": "szato", + "homepage": "https://www.drupal.org/user/389677" } ], - "description": "Generates WebP copies of image style derivatives.", - "homepage": "https://www.drupal.org/project/webp", + "description": "Generates jpg copies of webp image style derivatives.", + "homepage": "https://www.drupal.org/project/wpf", "keywords": [ "Drupal" ], "support": { - "source": "http://cgit.drupalcode.org/webp", - "issues": "https://www.drupal.org/project/issues/webp" + "source": "http://cgit.drupalcode.org/wpf", + "issues": "https://www.drupal.org/project/issues/wpf" } }, { @@ -14945,8 +14945,7 @@ "drupal/drupal_test_assertions": 20, "drupal/inline_entity_form": 5, "drupal/potx": 15, - "drupal/ultimate_cron": 15, - "drupal/webp": 5 + "drupal/ultimate_cron": 15 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index cdbad1ea8..f0e534322 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -87,8 +87,8 @@ module: user: 0 username_enumeration_prevention: 0 views_ui: 0 - webp: 0 workflows: 0 + wpf: 0 fast404: 1 menu_link_content: 1 pathauto: 1 diff --git a/config/sync/image.style.card.yml b/config/sync/image.style.card.yml index c27197268..e8558f4a7 100644 --- a/config/sync/image.style.card.yml +++ b/config/sync/image.style.card.yml @@ -15,3 +15,9 @@ effects: width: 410 height: 192 crop_type: focal_point + 346e742d-d17c-4208-b156-5812339ec476: + uuid: 346e742d-d17c-4208-b156-5812339ec476 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_lg_1x.yml b/config/sync/image.style.hero_lg_1x.yml index e0a092c07..ac6944f00 100644 --- a/config/sync/image.style.hero_lg_1x.yml +++ b/config/sync/image.style.hero_lg_1x.yml @@ -15,3 +15,9 @@ effects: width: 1280 height: 400 crop_type: focal_point + 4917daef-1434-4208-bbf7-a5f9e88ed45c: + uuid: 4917daef-1434-4208-bbf7-a5f9e88ed45c + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_lg_2x.yml b/config/sync/image.style.hero_lg_2x.yml index 4992ccc25..a4298636e 100644 --- a/config/sync/image.style.hero_lg_2x.yml +++ b/config/sync/image.style.hero_lg_2x.yml @@ -15,3 +15,9 @@ effects: width: 2560 height: 800 crop_type: focal_point + 4517c920-bb20-40cb-9d8d-2edc4decbbc5: + uuid: 4517c920-bb20-40cb-9d8d-2edc4decbbc5 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_md_1x.yml b/config/sync/image.style.hero_md_1x.yml index d2611645b..377983e0a 100644 --- a/config/sync/image.style.hero_md_1x.yml +++ b/config/sync/image.style.hero_md_1x.yml @@ -15,3 +15,9 @@ effects: width: 1024 height: 320 crop_type: focal_point + 845c67f6-75c7-4321-8f87-577ecdf0d917: + uuid: 845c67f6-75c7-4321-8f87-577ecdf0d917 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_md_2x.yml b/config/sync/image.style.hero_md_2x.yml index 9486d5a52..8df453a22 100644 --- a/config/sync/image.style.hero_md_2x.yml +++ b/config/sync/image.style.hero_md_2x.yml @@ -15,3 +15,9 @@ effects: width: 2048 height: 640 crop_type: focal_point + 2c40eafc-0ff8-4d30-8a57-d90ec3be292a: + uuid: 2c40eafc-0ff8-4d30-8a57-d90ec3be292a + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_mobile_1x.yml b/config/sync/image.style.hero_mobile_1x.yml index caa02e7e3..843e11ccf 100644 --- a/config/sync/image.style.hero_mobile_1x.yml +++ b/config/sync/image.style.hero_mobile_1x.yml @@ -15,3 +15,9 @@ effects: width: 640 height: 200 crop_type: focal_point + 42df8dd1-c7f1-4e71-8935-4f45a0ae016d: + uuid: 42df8dd1-c7f1-4e71-8935-4f45a0ae016d + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_mobile_2x.yml b/config/sync/image.style.hero_mobile_2x.yml index 13291c7ba..f6d176c60 100644 --- a/config/sync/image.style.hero_mobile_2x.yml +++ b/config/sync/image.style.hero_mobile_2x.yml @@ -15,3 +15,9 @@ effects: width: 1280 height: 400 crop_type: focal_point + 56762e47-7354-4f2e-af60-badffc42ed0c: + uuid: 56762e47-7354-4f2e-af60-badffc42ed0c + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_sm_1x.yml b/config/sync/image.style.hero_sm_1x.yml index e80753b1d..16cc13e66 100644 --- a/config/sync/image.style.hero_sm_1x.yml +++ b/config/sync/image.style.hero_sm_1x.yml @@ -15,3 +15,9 @@ effects: width: 768 height: 240 crop_type: focal_point + 5904d9f3-a67c-43d8-bfab-26b10f8f141c: + uuid: 5904d9f3-a67c-43d8-bfab-26b10f8f141c + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_sm_2x.yml b/config/sync/image.style.hero_sm_2x.yml index fa3e839e3..4e2cf4bdd 100644 --- a/config/sync/image.style.hero_sm_2x.yml +++ b/config/sync/image.style.hero_sm_2x.yml @@ -15,3 +15,9 @@ effects: width: 1536 height: 480 crop_type: focal_point + 0843a229-7768-4c41-a90f-c633f2fdf82d: + uuid: 0843a229-7768-4c41-a90f-c633f2fdf82d + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_xl_1x.yml b/config/sync/image.style.hero_xl_1x.yml index c88362da2..4446f64e0 100644 --- a/config/sync/image.style.hero_xl_1x.yml +++ b/config/sync/image.style.hero_xl_1x.yml @@ -15,3 +15,9 @@ effects: width: 1536 height: 466 crop_type: focal_point + 481711d6-f88e-4a03-84ef-ba4314e6ab3f: + uuid: 481711d6-f88e-4a03-84ef-ba4314e6ab3f + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.hero_xl_2x.yml b/config/sync/image.style.hero_xl_2x.yml index 3b0adc7f6..ac0b03603 100644 --- a/config/sync/image.style.hero_xl_2x.yml +++ b/config/sync/image.style.hero_xl_2x.yml @@ -15,3 +15,9 @@ effects: width: 3072 height: 932 crop_type: focal_point + a13fd71a-b8ca-4ef8-bcf9-0b78a732df01: + uuid: a13fd71a-b8ca-4ef8-bcf9-0b78a732df01 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.large.yml b/config/sync/image.style.large.yml index 94b2ef487..1a3468ace 100644 --- a/config/sync/image.style.large.yml +++ b/config/sync/image.style.large.yml @@ -17,3 +17,9 @@ effects: width: 480 height: 480 crop_type: focal_point + e1eb279b-9d91-47ee-a8b0-acf4dafe076b: + uuid: e1eb279b-9d91-47ee-a8b0-acf4dafe076b + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.media_entity_browser_thumbnail.yml b/config/sync/image.style.media_entity_browser_thumbnail.yml index c851a63c9..f0e242786 100644 --- a/config/sync/image.style.media_entity_browser_thumbnail.yml +++ b/config/sync/image.style.media_entity_browser_thumbnail.yml @@ -17,3 +17,9 @@ effects: width: 350 height: 200 crop_type: focal_point + 2e96d10d-25a9-499a-8a56-7b560b81c257: + uuid: 2e96d10d-25a9-499a-8a56-7b560b81c257 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.media_library.yml b/config/sync/image.style.media_library.yml index ffaada986..0f4bfb067 100644 --- a/config/sync/image.style.media_library.yml +++ b/config/sync/image.style.media_library.yml @@ -18,3 +18,9 @@ effects: width: 220 height: 220 upscale: false + a3d694bc-5420-4898-bb2c-d083ca7ab306: + uuid: a3d694bc-5420-4898-bb2c-d083ca7ab306 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.medium.yml b/config/sync/image.style.medium.yml index bfe658637..03140d7d5 100644 --- a/config/sync/image.style.medium.yml +++ b/config/sync/image.style.medium.yml @@ -15,3 +15,9 @@ effects: width: 220 height: 220 upscale: false + 4afe0de5-587c-4c40-813b-23d7fbde9a0e: + uuid: 4afe0de5-587c-4c40-813b-23d7fbde9a0e + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.prose_image.yml b/config/sync/image.style.prose_image.yml index d0de4da3d..67d3333ac 100644 --- a/config/sync/image.style.prose_image.yml +++ b/config/sync/image.style.prose_image.yml @@ -13,3 +13,9 @@ effects: width: 768 height: null upscale: false + 20beb2f0-b7e1-4a35-9d15-ca54bc72a834: + uuid: 20beb2f0-b7e1-4a35-9d15-ca54bc72a834 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.prose_image_x2.yml b/config/sync/image.style.prose_image_x2.yml index cba7ff66b..881cff760 100644 --- a/config/sync/image.style.prose_image_x2.yml +++ b/config/sync/image.style.prose_image_x2.yml @@ -13,3 +13,9 @@ effects: width: 1536 height: null upscale: false + 17b5ae17-edbc-4fe4-aa84-6f1ea5eded91: + uuid: 17b5ae17-edbc-4fe4-aa84-6f1ea5eded91 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_lg_1x.yml b/config/sync/image.style.quote_lg_1x.yml index a4a6ffc89..6e853e889 100644 --- a/config/sync/image.style.quote_lg_1x.yml +++ b/config/sync/image.style.quote_lg_1x.yml @@ -15,3 +15,9 @@ effects: width: 640 height: 400 crop_type: focal_point + 7e0a6e88-4e6b-4c17-9765-b12332a80188: + uuid: 7e0a6e88-4e6b-4c17-9765-b12332a80188 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_lg_2x.yml b/config/sync/image.style.quote_lg_2x.yml index e15706a34..12b18ef4d 100644 --- a/config/sync/image.style.quote_lg_2x.yml +++ b/config/sync/image.style.quote_lg_2x.yml @@ -15,3 +15,9 @@ effects: width: 1280 height: 800 crop_type: focal_point + 9469d166-db60-43a5-9871-7effd378f084: + uuid: 9469d166-db60-43a5-9871-7effd378f084 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_md_1x.yml b/config/sync/image.style.quote_md_1x.yml index a6ee4eaa2..523444011 100644 --- a/config/sync/image.style.quote_md_1x.yml +++ b/config/sync/image.style.quote_md_1x.yml @@ -15,3 +15,9 @@ effects: width: 512 height: 320 crop_type: focal_point + bc7da43a-1fb1-4506-a9f0-00fc8761c147: + uuid: bc7da43a-1fb1-4506-a9f0-00fc8761c147 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_md_2x.yml b/config/sync/image.style.quote_md_2x.yml index 433ab3d43..d8d3af312 100644 --- a/config/sync/image.style.quote_md_2x.yml +++ b/config/sync/image.style.quote_md_2x.yml @@ -15,3 +15,9 @@ effects: width: 1024 height: 640 crop_type: focal_point + 76233d64-0175-465a-9089-15790bb88bbf: + uuid: 76233d64-0175-465a-9089-15790bb88bbf + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_mobile_1x.yml b/config/sync/image.style.quote_mobile_1x.yml index 9d2eaff42..efdd6e96d 100644 --- a/config/sync/image.style.quote_mobile_1x.yml +++ b/config/sync/image.style.quote_mobile_1x.yml @@ -15,3 +15,9 @@ effects: width: 640 height: 200 crop_type: focal_point + 35eaa298-b20f-491c-a58c-d0ad238a0463: + uuid: 35eaa298-b20f-491c-a58c-d0ad238a0463 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_mobile_2x.yml b/config/sync/image.style.quote_mobile_2x.yml index 40c3debfc..ac8f22d79 100644 --- a/config/sync/image.style.quote_mobile_2x.yml +++ b/config/sync/image.style.quote_mobile_2x.yml @@ -15,3 +15,9 @@ effects: width: 1280 height: 400 crop_type: focal_point + 8c08c569-070e-4f47-9eb2-06c8d430a579: + uuid: 8c08c569-070e-4f47-9eb2-06c8d430a579 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_sm_1x.yml b/config/sync/image.style.quote_sm_1x.yml index b2f210288..15565fa43 100644 --- a/config/sync/image.style.quote_sm_1x.yml +++ b/config/sync/image.style.quote_sm_1x.yml @@ -15,3 +15,9 @@ effects: width: 768 height: 240 crop_type: focal_point + 69a9ac01-4511-4276-b66d-914fd4b250f9: + uuid: 69a9ac01-4511-4276-b66d-914fd4b250f9 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_sm_2x.yml b/config/sync/image.style.quote_sm_2x.yml index ac0fdc0a1..6c9539f4a 100644 --- a/config/sync/image.style.quote_sm_2x.yml +++ b/config/sync/image.style.quote_sm_2x.yml @@ -15,3 +15,9 @@ effects: width: 1536 height: 480 crop_type: focal_point + 6aa94ff0-845c-4aca-aa33-6bf7db0b4db3: + uuid: 6aa94ff0-845c-4aca-aa33-6bf7db0b4db3 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_xl_1x.yml b/config/sync/image.style.quote_xl_1x.yml index ffd57a671..3f5c6f67b 100644 --- a/config/sync/image.style.quote_xl_1x.yml +++ b/config/sync/image.style.quote_xl_1x.yml @@ -15,3 +15,9 @@ effects: width: 768 height: 400 crop_type: focal_point + b6573460-ebc9-4bfd-9709-52910cf553bf: + uuid: b6573460-ebc9-4bfd-9709-52910cf553bf + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.quote_xl_2x.yml b/config/sync/image.style.quote_xl_2x.yml index 77716a222..0edc48eed 100644 --- a/config/sync/image.style.quote_xl_2x.yml +++ b/config/sync/image.style.quote_xl_2x.yml @@ -15,3 +15,9 @@ effects: width: 1536 height: 400 crop_type: focal_point + 7f0a3bb1-45c8-42e7-ae08-d39af1890952: + uuid: 7f0a3bb1-45c8-42e7-ae08-d39af1890952 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/image.style.thumbnail.yml b/config/sync/image.style.thumbnail.yml index 1f2c21ff3..1d61e47f9 100644 --- a/config/sync/image.style.thumbnail.yml +++ b/config/sync/image.style.thumbnail.yml @@ -17,3 +17,9 @@ effects: width: 100 height: 100 crop_type: focal_point + 0715213a-db62-426e-9c71-2e0b179af050: + uuid: 0715213a-db62-426e-9c71-2e0b179af050 + id: image_convert + weight: 2 + data: + extension: webp diff --git a/config/sync/webp.settings.yml b/config/sync/webp.settings.yml deleted file mode 100644 index c7061c9a0..000000000 --- a/config/sync/webp.settings.yml +++ /dev/null @@ -1,3 +0,0 @@ -_core: - default_config_hash: 0ube66wBYymHixNiMD-uyY8Tjo8alYV3NII6dv5iBJ8 -quality: 75 diff --git a/config/sync/wpf.settings.yml b/config/sync/wpf.settings.yml new file mode 100644 index 000000000..8d92c59d4 --- /dev/null +++ b/config/sync/wpf.settings.yml @@ -0,0 +1,33 @@ +_core: + default_config_hash: Zz0MiEpGpRsSM81JunRrcLuDDV6mhBGcv-AJwlIzRdY +quality: 75 +styles: + disabled: + card: 0 + hero_lg_1x: 0 + hero_lg_2x: 0 + hero_md_1x: 0 + hero_md_2x: 0 + hero_mobile_1x: 0 + hero_mobile_2x: 0 + hero_sm_1x: 0 + hero_sm_2x: 0 + hero_xl_1x: 0 + hero_xl_2x: 0 + large: 0 + media_entity_browser_thumbnail: 0 + media_library: 0 + medium: 0 + prose_image: 0 + prose_image_x2: 0 + quote_lg_1x: 0 + quote_lg_2x: 0 + quote_md_1x: 0 + quote_md_2x: 0 + quote_mobile_1x: 0 + quote_mobile_2x: 0 + quote_sm_1x: 0 + quote_sm_2x: 0 + quote_xl_1x: 0 + quote_xl_2x: 0 + thumbnail: 0