wip

config/minify-html.php

@@ -2,7 +2,8 @@
 
 return [
     'transformers' => [
-        RemoveComments::class,
-        RemoveWhitespace::class,
+        \Vormkracht10\MinifyHtml\Transformers\RemoveComments::class,
+        \Vormkracht10\MinifyHtml\Transformers\RemoveWhitespace::class,
+        \Vormkracht10\MinifyHtml\Transformers\TrimScripts::class,
     ],
 ];

src/Middleware/MinifyHtml.php

@@ -14,32 +14,30 @@ public function handle($request, $next)
 
         $response = $next($request);
 
-        foreach (config('minify-html.transformers') as $x => $transformer) {
-            $response = (new $transformer)->transform($response);
+        $content = $response->getContent();
+
+        foreach (config('minify-html.transformers', []) as $x => $transformer) {
+            $content = (new $transformer)->transform($content);
         }
 
-        return $response;
+        return $response->setContent($content);
     }
 
     public function shouldMinifyHtml(Request $request)
     {
-        if (! config('minify-html.enabled')) {
-            return false;
-        }
-
         if (! in_array($request->method(), ['GET', 'HEAD'])) {
             return false;
         }
 
-        if ($request->isJson() || $request->isXml()) {
+        if ($request->isJson()) {
             return false;
         }
 
         if (! str_contains($request->header('Accept'), 'html')) {
             return false;
         }
 
-        if ($request->ajax()) {
+        if ($request->isPrecognitive() || $request->isXmlHttpRequest()) {
             return false;
         }
 

src/Transformers/RemoveComments.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Vormkracht10\MinifyHtml\Transformers;
+
 class RemoveComments
 {
     public function transform(string $html): string

src/Transformers/RemoveWhitespace.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Vormkracht10\MinifyHtml\Transformers;
+
 class RemoveWhitespace
 {
     protected array $hiddenElements = [];

src/Transformers/TrimScripts.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Vormkracht10\MinifyHtml\Transformers;
+
+class TrimScripts
+{
+    public function transform(string $html): string
+    {
+        if (preg_match_all('~<script[^>]*>(.*)</script>~Uuis', $html, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $replace = trim(preg_replace('~^\p{Z}+|\p{Z}+$|^\s+~m', '', $match[1]));
+
+                $html = str_replace($match[1], $replace, $html);
+            }
+        }
+
+        return $html;
+    }
+}