fix: minify only html pages

Author: octoper

.github/workflows/tests.yaml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.0, 7.4 ]
+        php: [ 8.0, 8.1 ]
         dependency-version: [ prefer-stable ]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

src/HtmlMinifyMiddleware.php

@@ -21,12 +21,23 @@ public function handle(Request $request, \Closure $next)
     {
         $response = $next($request);
 
-        if ($response instanceof Response && $response->headers->contains('Content-Type', 'text/html')) {
+        if ($response instanceof StreamedResponse || $response instanceof JsonResponse) {
+            return $next($request);
+        }
+
+        if ($response instanceof Response && $this->isValidHTMLResponse($response)) {
             $html = (new HtmlMinify($response->getContent()))->minifiedHtml();
 
             return $response->setContent($html);
         }
 
         return $next($request);
     }
+
+    protected function isValidHTMLResponse($response)
+    {
+        $contentType = $response->headers->get('Content-Type');
+
+        return stripos($contentType, 'text/html') !== false;
+    }
 }

tests/TestCase.php

@@ -72,11 +72,15 @@ protected function defineEnvironment($app): void
             Statamic::pushWebRoutes(function () {
                 Route::namespace('\\Octoper\\HtmlMinify\\\Http\\Controllers')->group(function () {
                     Route::get('/html-minify/test', function () {
-                        return file_get_contents(__DIR__.'/testPages/simpleMinify.html');
+                        return response(file_get_contents(__DIR__.'/testPages/simpleMinify.html'), '200', [
+                                'Content-Type' => 'text/html'
+                            ]);
                     })->middleware(HtmlMinifyMiddleware::class);
 
                     Route::get('/html-minify/test/remove-comments', function () {
-                        return file_get_contents(__DIR__.'/testPages/removeComments.html');
+                        return response(file_get_contents(__DIR__.'/testPages/removeComments.html'), '200', [
+                            'Content-Type' => 'text/html'
+                        ]);
                     })->middleware(HtmlMinifyMiddleware::class);
                 });
             });