Start with removing webp checks, since it will be enabled by default

config/filament-media-library.php

@@ -5,7 +5,6 @@
 return [
     'conversion' => LocalConversion::class,
     'enable-format-generate-action' => true,
-    'enable-webp-generation' => true,
     'extensions' => [
         'image' => [
             'jpg',

docs/index.md

@@ -9,7 +9,6 @@
         + [Format definition](#format-definition)
     * [Registering formats](#registering-formats)
         + [Preparing your model](#preparing-your-model)
-    * [Webp formats](#webp-formats)
 - [Attachment model methods and attributes](#attachment-model-methods-and-attributes)
     * [Methods](#methods)
         + [getStorage](#getstorage)
@@ -64,7 +63,6 @@ The basic config file consists of the following contents:
 return [
     'conversion' => \Codedor\MediaLibrary\Conversions\LocalConversion::class,
     'enable-format-generate-action' => true,
-    'enable-webp-generation' => true,
     'extensions' => [
         'image' => [
             'jpg',
@@ -185,11 +183,6 @@ public static function getFormats(Collection $formats): Collection
 }
 ```
 
-#### Webp formats
-
-In the config you can enable webp formats. This will generate a webp versions of the formats and save them seperatly.
-You can fetch a webp format by using `->getWebpFormatOrOriginal($format)` function.
-
 ## Attachment model methods and attributes
 
 ### Methods

resources/views/components/picture.blade.php

@@ -10,33 +10,23 @@
     <picture class="{{ $pictureClass }}">
         @if ($formats)
             @foreach ($formats as $breakpoint => $mobileFormat)
-                @if ($hasWebp)
-                    <source
-                        media="(max-width: {{ $breakpoint ?? '576' }}px)"
-                        type="image/webp"
-                        srcset="{{ $image->getWebpFormatOrOriginal($mobileFormat) }}"
-                    >
-                @endif
-
                 <source
                     media="(max-width: {{ $breakpoint ?? '576' }}px)"
-                    type="{{ $image->mime_type }}"
+                    type="image/webp"
                     srcset="{{ $image->getFormatOrOriginal($mobileFormat) }}"
                 >
             @endforeach
         @endif
 
-        @if ($hasWebp)
-            <source
-                type="image/webp"
-                @if ($lazyload)
-                    srcset="{{ $image->getWebpFormatOrOriginal($lazyloadInitialFormat) }}"
-                    data-srcset="{{ $image->getWebpFormatOrOriginal($format) }}"
-                @else
-                    srcset="{{ $image->getWebpFormatOrOriginal($format) }}"
-                @endif
-            >
-        @endif
+        <source
+            type="image/webp"
+            @if ($lazyload)
+                srcset="{{ $image->getFormatOrOriginal($lazyloadInitialFormat) }}"
+                data-srcset="{{ $image->getFormatOrOriginal($format) }}"
+            @else
+                srcset="{{ $image->getFormatOrOriginal($format) }}"
+            @endif
+        >
 
         <img
             alt="{{ $alt }}"

src/Conversions/LocalConversion.php

@@ -4,7 +4,6 @@
 
 use Codedor\MediaLibrary\Formats\Format;
 use Codedor\MediaLibrary\Models\Attachment;
-use Codedor\MediaLibrary\WebP;
 use Illuminate\Support\Str;
 use Spatie\Image\Image;
 
@@ -36,17 +35,6 @@ public function convert(Attachment $attachment, Format $format, bool $force = fa
                 ->save($savePath);
         }
 
-        if (
-            WebP::isEnabled() && (
-                $force ||
-                ! $attachment->getStorage()->exists(WebP::path($savePath, $attachment->extension))
-            )
-        ) {
-            Image::load($attachment->absolute_file_path)
-                ->manipulate($format->definition())
-                ->save(WebP::path($savePath, $attachment->extension));
-        }
-
         return true;
     }
 }

src/Formats/Format.php

@@ -38,7 +38,7 @@ final public function __construct(protected string $column = '')
 
     public function filename(Attachment $attachment): string
     {
-        return $this->prefix() . $attachment->file_name;
+        return $this->prefix() . Str::replaceLast('jpg', 'webp', $attachment->file_name);
     }
 
     public function prefix(): string

src/Livewire/FormatterModal.php

@@ -5,10 +5,8 @@
 use Codedor\MediaLibrary\Facades\Formats;
 use Codedor\MediaLibrary\Formats\Format;
 use Codedor\MediaLibrary\Models\Attachment;
-use Codedor\MediaLibrary\WebP;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Collection;
-use Intervention\Image\Facades\Image;
 use Livewire\Attributes\On;
 use Livewire\Component;
 
@@ -66,15 +64,6 @@ public function saveCrop($event)
         $crop = base64_decode(str_replace(' ', '+', $crop));
         $this->attachment->getStorage()->put("{$this->attachment->directory}/{$filename}", $crop);
 
-        if (WebP::isEnabled()) {
-            Image::make("{$this->attachment->absolute_directory_path}/{$filename}")
-                ->encode('webp')
-                ->save(WebP::path(
-                    "{$this->attachment->absolute_directory_path}/{$filename}",
-                    $this->attachment->extension
-                ));
-        }
-
         // Save the crop on the attachment, for later adjustments
         $this->attachment->formats()->updateOrCreate([
             'attachment_id' => $this->attachment->id,

src/Models/Traits/HasFormats.php

@@ -5,7 +5,6 @@
 use Codedor\MediaLibrary\Exceptions\FormatNotFound;
 use Codedor\MediaLibrary\Facades\Formats;
 use Codedor\MediaLibrary\Models\AttachmentFormat;
-use Codedor\MediaLibrary\WebP;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 trait HasFormats
@@ -52,17 +51,4 @@ public function generateFormats(bool $force = false)
     {
         Formats::dispatchGeneration($this, $force);
     }
-
-    public function getWebpFormatOrOriginal(?string $format): ?string
-    {
-        if (! $format) {
-            return $this->url;
-        }
-
-        if (! WebP::isEnabled()) {
-            return $this->getFormatOrOriginal($format);
-        }
-
-        return $this->getFormat($format, 'webp') ?? $this->getFormatOrOriginal($format);
-    }
 }

src/Views/Picture.php

@@ -5,15 +5,12 @@
 use Codedor\MediaLibrary\Facades\Formats;
 use Codedor\MediaLibrary\Formats\Format;
 use Codedor\MediaLibrary\Models\Attachment;
-use Codedor\MediaLibrary\WebP;
 use Illuminate\View\Component;
 
 class Picture extends Component
 {
     public ?Format $formatClass = null;
 
-    public bool $hasWebp = false;
-
     public function __construct(
         public Attachment $image,
         public ?string $format = null,
@@ -29,10 +26,6 @@ public function __construct(
         if ($this->format) {
             $this->getFormatClass();
         }
-
-        if ($image->exists) {
-            $this->hasWebp = method_exists($image, 'getWebpFormatOrOriginal') && $image->getWebpFormatOrOriginal($format);
-        }
     }
 
     protected function getFormatClass()
@@ -76,13 +69,6 @@ public function getDimension(string $dimension): ?int
         $filename = $this->formatClass->filename($this->image);
         $path = "{$this->image->absolute_directory_path}/{$filename}";
 
-        if (WebP::isEnabled()) {
-            $path = WebP::path(
-                $path,
-                $this->image->extension
-            );
-        }
-
         if (file_exists($path)) {
             $dimensions = getimagesize($path);
 

tests/Mixins/UploadedFileMixinTest.php

@@ -3,7 +3,6 @@
 use Codedor\MediaLibrary\Jobs\GenerateAttachmentFormat;
 use Codedor\MediaLibrary\Models\Attachment;
 use Codedor\MediaLibrary\Tests\TestFormats\TestHero;
-use Codedor\MediaLibrary\Tests\TestFormats\TestHeroWebp;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Queue;
@@ -20,7 +19,6 @@
 
     \Codedor\MediaLibrary\Facades\Formats::register([
         TestHero::class,
-        TestHeroWebp::class,
     ]);
 
     $file = UploadedFile::fake()->image('test.jpg', 100, 100);
@@ -40,7 +38,6 @@
 
     \Codedor\MediaLibrary\Facades\Formats::register([
         TestHero::class,
-        TestHeroWebp::class,
     ]);
 
     assertDatabaseCount(Attachment::class, 0);
@@ -75,7 +72,6 @@
 
     \Codedor\MediaLibrary\Facades\Formats::register([
         TestHero::class,
-        TestHeroWebp::class,
     ]);
 
     Storage::fake($disk);

tests/TestCase.php

@@ -31,7 +31,6 @@ protected function setUp(): void
     public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
-        config()->set('filament-media-library.enable-webp-generation', false);
     }
 
     protected function getPackageProviders($app)

tests/Unit/Collections/FormatsCollectionTest.php

@@ -3,7 +3,6 @@
 use Codedor\MediaLibrary\Facades\Formats;
 use Codedor\MediaLibrary\Formats\Format;
 use Codedor\MediaLibrary\Tests\TestFormats\TestHero;
-use Codedor\MediaLibrary\Tests\TestFormats\TestHeroWebp;
 use Codedor\MediaLibrary\Tests\TestModels\TestModel;
 
 it('registers model', function () {
@@ -16,7 +15,7 @@
 });
 
 it('returns format if format is registered', function () {
-    Formats::register([TestHero::class, TestHeroWebp::class]);
+    Formats::register([TestHero::class]);
 
     expect(Formats::exists('test-hero'))
         ->toBeInstanceOf(TestHero::class);
@@ -26,16 +25,15 @@
 });
 
 it('returns null if format is not registered', function () {
-    Formats::register([TestHero::class, TestHeroWebp::class]);
+    Formats::register([TestHero::class]);
 
     expect(Formats::exists('format-does-not-exist'))
         ->toBeNull();
 });
 
 it('returns collection with kebab keys', function () {
-    Formats::register([TestHero::class, TestHeroWebp::class]);
+    Formats::register([TestHero::class]);
 
     expect(Formats::mapToKebab())
-        ->toHaveKey('test-hero')
-        ->toHaveKey('test-hero-webp');
+        ->toHaveKey('test-hero');
 });