Changeset 3412704

Timestamp:

12/06/2025 12:41:22 AM (2 months ago)

Author:

codealfa

Message:

Changes for version 5.1.1

Location:

jch-optimize/trunk

Files:

• jch-optimize.php (modified) (4 diffs)
• lib/src/Admin/Ajax/Ajax.php (modified) (2 diffs)
• lib/src/Cdn/Cdn.php (modified) (1 diff)
• lib/src/Css/Callbacks/AbstractCallback.php (modified) (5 diffs)
• lib/src/Css/Callbacks/CorrectUrls.php (modified) (8 diffs)
• lib/src/Css/Callbacks/ExtractCriticalCss.php (modified) (2 diffs)
• lib/src/Css/Components/CssRule.php (modified) (2 diffs)
• lib/src/Css/Components/CssSelector.php (modified) (3 diffs)
• lib/src/Css/Components/CssSelectorList.php (modified) (1 diff)
• lib/src/Css/Components/CssUrl.php (modified) (1 diff)
• lib/src/Css/Components/NestingAtRule.php (modified) (4 diffs)
• lib/src/Css/CssProcessor.php (modified) (4 diffs)
• lib/src/Css/Parser.php (modified) (2 diffs)
• lib/src/Css/Xpath/CssSelector.php (modified) (3 diffs)
• lib/src/Css/Xpath/PseudoClassSelector.php (modified) (1 diff)
• lib/src/FileInfo.php (modified) (1 diff)
• lib/src/FileUtils.php (modified) (2 diffs)
• lib/src/Html/AttributesCollection.php (modified) (2 diffs)
• lib/src/Html/BuildHtmlElement.php (modified) (7 diffs)
• lib/src/Html/CacheManager.php (modified) (9 diffs)
• lib/src/Html/Callbacks/AbstractCallback.php (modified) (1 diff)
• lib/src/Html/Callbacks/CombineJsCss.php (modified) (2 diffs)
• lib/src/Html/CssLayout/CssItem.php (modified) (1 diff)
• lib/src/Html/CssLayout/CssLayoutPlanner.php (modified) (1 diff)
• lib/src/Html/CssLayout/CssPlacementItem.php (modified) (1 diff)
• lib/src/Html/CssLayout/CssPlacementPlan.php (modified) (1 diff)
• lib/src/Html/Elements/BaseElement.php (modified) (1 diff)
• lib/src/Html/FilesManager.php (modified) (16 diffs)
• lib/src/Html/HtmlElementBuilder.php (modified) (1 diff)
• lib/src/Html/HtmlManager.php (modified) (15 diffs)
• lib/src/Html/HtmlProcessor.php (modified) (8 diffs)
• lib/src/Html/JsLayout/JsItem.php (modified) (1 diff)
• lib/src/Html/JsLayout/JsLayoutPlanner.php (modified) (1 diff)
• lib/src/Html/JsLayout/JsPlacementItem.php (modified) (1 diff)
• lib/src/Html/Parser.php (modified) (8 diffs)
• lib/src/Optimize.php (modified) (5 diffs)
• lib/src/PageCache/PageCache.php (modified) (1 diff)
• lib/src/Preloads/Http2Preload.php (modified) (1 diff)
• lib/src/Preloads/Preconnector.php (modified) (4 diffs)
• lib/src/Preloads/PreloadsCollection.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• src/Html/Renderer/Setting.php (modified) (4 diffs)
• src/Html/TabSettings.php (modified) (2 diffs)
• src/Plugin/Installer.php (modified) (2 diffs)
• src/Plugin/Loader.php (modified) (1 diff)
• src/View/OptimizeImageHtml.php (modified) (3 diffs)
• tmpl/pagecache_filters.php (modified) (3 diffs)
• vendor/composer/installed.php (modified) (2 diffs)
• version.php (modified) (1 diff)

jch-optimize/trunk/jch-optimize.php

@@ -5 +5 @@
  * Plugin URI: http://www.jch-optimize.net/
  * Description: Boost your WordPress site's performance with JCH Optimize as measured on PageSpeed
- * Version: 5.1.0
+ * Version: 5.1.1
  * Author: Samuel Marshall
  * License: GNU/GPLv3
@@ -11 +11 @@
  * Domain Path: /languages
  * Requires PHP: 8.0
- * Requires at least: 5.0
+ * Requires at least: 6.5.0
  */
 
@@ -33 +33 @@
         $message = sprintf(
             __(
-                'JCH Optimize requires at least PHP 8.0. You current version is %s. Please update your PHP version or deactivate the plugin.',
+                'JCH Optimize requires at least PHP 8.0.'
+                . ' Your current version is %s. Please update your PHP version or deactivate the plugin.',
                 'jch-optimize'
             ),
@@ -86 +87 @@
     {
         $message = __(
-            'An error occurred while trying to initialize the JCH Optimize plugin. Please deactivate the plugin and report all errors to the developer.',
+            'An error occurred while trying to initialize the JCH Optimize plugin.'
+            . ' Please deactivate the plugin and report all errors to the developer.',
             'jch-optimize'
         );

jch-optimize/trunk/lib/src/Admin/Ajax/Ajax.php

@@ -23 +23 @@
 use JchOptimize\Core\Admin\AdminHelper;
 use JchOptimize\Core\Admin\Json;
+use JchOptimize\Core\Optimize;
 use JchOptimize\Core\Platform\PathsInterface;
 use JchOptimize\Core\Platform\UtilityInterface;
@@ -56 +57 @@
     protected function __construct()
     {
-        ini_set('pcre.backtrack_limit', '1000000');
-        ini_set('pcre.recursion_limit', '1000000');
+        Optimize::setPcreLimits();
 
         if (!JCH_DEVELOP) {
             error_reporting(0);
             @ini_set('display_errors', 'Off');
-        }
-
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            ini_set('pcre.jit', '0');
         }
 

jch-optimize/trunk/lib/src/Cdn/Cdn.php

@@ -122 +122 @@
                 $staticFiles1Array = array_merge($staticFiles1Array, $customExtArray);
 
-                $this->domains->attach(new CdnDomain($domain1, $staticFiles1Array, $this->getScheme()));
+                $this->domains->offsetSet(new CdnDomain($domain1, $staticFiles1Array, $this->getScheme()));
             }
 

jch-optimize/trunk/lib/src/Css/Callbacks/AbstractCallback.php

@@ -37 +37 @@
 
     protected array $conditionalAtRules = [
-        'media' => true,
-        'supports' => true,
-        'layer' => true,
-        'scope' => true,
-        'container' => true,
-        'document' => true
+        'media',
+        'supports',
+        'layer',
+        'scope',
+        'container',
+        'document',
     ];
 
@@ -60 +60 @@
 
     private ?CriticalCssDomainProfiler $profiler = null;
+
+    private string $conditionalAtRulesRegex;
 
     public function __construct(Container $container, protected Registry $params)
@@ -66 +68 @@
         $this->cacheObject = new CacheObject();
         $this->supportedComponents = $this->supportedCssComponents();
+        $this->conditionalAtRulesRegex = '^@(?:' . implode('|', $this->conditionalAtRules) . ')';
     }
 
@@ -100 +103 @@
         }
 
-        try {
+        if (preg_match("#{$this->conditionalAtRulesRegex}#", $matches[0])) {
             $n = 'nesting_at_rule_load';
             $this->profiler?->start($n);
-            $nestingAtRule = NestingAtRule::load($matches[0]);
+            $nestingAtRule = NestingAtRule::loadFromMatch($matches);
             $this->profiler?->stop($n);
 
-            if (isset($this->conditionalAtRules[$nestingAtRule->getIdentifier()])) {
-                $this->incrementRecursion();
-                $processedContent = $this->getParser()->processMatchesWithCallback(
-                    $nestingAtRule->getCssRuleList(),
-                    $this
-                );
-                $this->decrementRecursion($nestingAtRule);
-
-                return $nestingAtRule->setCssRuleList($processedContent)->render();
-            }
-        } catch (InvalidArgumentException) {
+            $this->incrementRecursion();
+            $processedContent = $this->getParser()->processMatchesWithCallback(
+                $nestingAtRule->getCssRuleList(),
+                $this
+            );
+            $this->decrementRecursion($nestingAtRule);
+
+            return $nestingAtRule->setCssRuleList($processedContent)->render();
         }
 
@@ -123 +123 @@
                 $d = 'component_load';
                 $this->profiler?->start($d);
-                $cssComponent = $component::load($matches[0]);
+                if (method_exists($component, 'loadFromMatch')) {
+                    $cssComponent = $component::loadFromMatch($matches);
+                } else {
+                    $cssComponent = $component::load($matches[0]);
+                }
                 $this->profiler?->stop($d);
             } catch (InvalidArgumentException) {

jch-optimize/trunk/lib/src/Css/Callbacks/CorrectUrls.php

@@ -103 +103 @@
     {
         if (
-            $originalUri->getScheme() !== 'data'
-            && $originalUri->getPath() != ''
-            && $originalUri->getPath() != '/'
-        ) {
-            $imageUri = $this->resolveImageToFileUrl($originalUri);
-            $paths = $this->getContainer()->get(PathsInterface::class);
-
-            if (UriComparator::existsLocally($imageUri, $this->cdn, $paths)) {
-                $this->cacheImageForAdminUsers($imageUri);
-                $imageUri = $this->cdn->loadCdnResource($imageUri);
-            } elseif ($this->params->get('pro_preconnect_domains_enable', '0')) {
-                $this->prefetchExternalDomains($imageUri);
-            }
-
-            if ($this->context == 'css-rule') {
-                $imageUri = $this->applyFeatureHelpers($imageUri);
-            }
-
-            $this->addHttpPreloadsToCacheObject($imageUri);
-
-            return $imageUri;
-        }
-
-        return $originalUri;
+            $originalUri->getScheme() === 'data'
+            || trim($originalUri->getPath(), " \n\r\t\v\x00/") === ''
+        ) {
+            return $originalUri;
+        }
+
+        $imageUri = $this->resolveImageToFileUrl($originalUri);
+        $paths = $this->getContainer()->get(PathsInterface::class);
+
+        if (UriComparator::existsLocally($imageUri, $this->cdn, $paths)) {
+            $this->cacheImageForAdminUsers($imageUri);
+            $imageUri = $this->cdn->loadCdnResource($imageUri);
+        } elseif ($this->params->get('pro_preconnect_domains_enable', '0')) {
+            $this->prefetchExternalDomains($imageUri);
+        }
+
+        if ($this->context == 'css-rule') {
+            $imageUri = $this->applyFeatureHelpers($imageUri);
+        }
+
+        $this->addHttpPreloadsToCacheObject($imageUri);
+
+        return $imageUri;
     }
 
@@ -134 +133 @@
         $cssFileUri = $this->getCssInfo()->hasUri() ? $this->getCssInfo()->getUri() : new Uri();
         $cssFileUri = UriResolver::resolve(SystemUri::currentUri(), $cssFileUri);
+
         return UriResolver::resolve($cssFileUri, $originalUri);
     }
@@ -165 +165 @@
             $responsiveImages = $this->getContainer()->get(ResponsiveImages::class)
                 /** @see ResponsiveImages::getResponsiveImages() */
-                ->getResponsiveImages($imageUri);
+                                     ->getResponsiveImages($imageUri);
         }
 
@@ -184 +184 @@
             $this->getContainer()->get(LCPImages::class)
                 /** @see LCPImages::prepareBackgroundLcpImages() */
-                ->prepareBackgroundLcpImages($imageUri, $this->cacheObject);
+                 ->prepareBackgroundLcpImages($imageUri, $this->cacheObject);
         }
 
@@ -200 +200 @@
             $this->getContainer()->get(LazyLoadExtended::class)
                 /** @see LazyLoadExtended::handleCssBgImages() */
-                ->handleCssBgImages(
-                    $this,
-                    $cssRule,
-                    $lazyLoaded
-                );
+                 ->handleCssBgImages(
+                     $this,
+                     $cssRule,
+                     $lazyLoaded
+                 );
         }
     }
@@ -230 +230 @@
                 [
                     'src' => $imageUri,
-                    'as' => $fileType
+                    'as'  => $fileType
                 ]
             ];
@@ -236 +236 @@
                 $cacheItems = $this->getContainer()->get(ResponsiveImages::class)
                     /** @see ResponsiveImages::mergeResponsiveImageCacheItems() */
-                    ->mergeResponsiveImageCacheItems($cacheItems);
+                                   ->mergeResponsiveImageCacheItems($cacheItems);
             }
             foreach ($cacheItems as $cacheItem) {
@@ -261 +261 @@
             $this->getContainer()->get(ResponsiveImages::class)
                 /** @see ResponsiveImages::makeCssRuleResponsive() */
-                ->makeCssRuleResponsive($cssRule);
+                 ->makeCssRuleResponsive($cssRule);
         }
     }

jch-optimize/trunk/lib/src/Css/Callbacks/ExtractCriticalCss.php

@@ -169 +169 @@
         $r = 'xpath_render';
         $profiler?->start($r);
-        $xPath = $cssSelectorXpath->render();
+        $xPath = $cssSelectorXpath->renderFirstPerBranch();
         $profiler?->stop($r);
 
@@ -253 +253 @@
         $profiler = $this->dependencies->getProfiler();
         $profiler?->start($normal = 'selector_normalize');
-        $normalized = preg_replace('#\s+#', '', strtolower($selectorList));
+        $normalized = preg_replace('#\s*([,>+~])\s*#', '\1', strtolower($selectorList));
         $profiler?->stop($normal);
 

jch-optimize/trunk/lib/src/Css/Components/CssRule.php

@@ -52 +52 @@
         }
 
-        $selectorList = $matches['selectorlist'];
-        $declarationList = $matches['declarationlist'];
+        return self::loadFromMatch($matches);
+    }
+
+    public static function loadFromMatch(array $matches): static
+    {
+        // Fallback to old behaviour if groups are missing.
+        if (!isset($matches['selectorList'], $matches['declarationList'])) {
+            return static::load($matches[0]);
+        }
+
+        $selectorList = $matches['selectorList'];
+        $declarationList = $matches['declarationList'];
 
         return new static($selectorList, $declarationList);
@@ -67 +77 @@
     }
 
-    private static function cssRuleWithCaptureValueToken(): string
+    public static function cssRuleWithCaptureValueToken(): string
     {
         $selectors = self::cssSelectorListToken();
-
-        return "(?<selectorlist>{$selectors}){(?<declarationlist>.*)}";
+        $declarations = self::cssDeclarationListToken();
+
+        return "(?<selectorList>{$selectors}){(?<declarationList>{$declarations})}";
     }
 

jch-optimize/trunk/lib/src/Css/Components/CssSelector.php

@@ -190 +190 @@
             $classes = new ClassCollection();
             foreach ($this->classes as $class) {
-                $classes->attach(clone $class);
+                $classes->offsetSet(clone $class);
             }
             $this->classes = $classes;
@@ -198 +198 @@
             $attributes = new AttributeCollection();
             foreach ($this->attributes as $attribute) {
-                $attributes->attach(clone $attribute);
+                $attributes->offsetSet(clone $attribute);
             }
             $this->attributes = $attributes;
@@ -206 +206 @@
             $pseudoClasses = new PseudoClassCollection();
             foreach ($this->pseudoClasses as $pseudoSelector) {
-                $pseudoClasses->attach(clone $pseudoSelector);
+                $pseudoClasses->offsetSet(clone $pseudoSelector);
             }
             $this->pseudoClasses = $pseudoClasses;

jch-optimize/trunk/lib/src/Css/Components/CssSelectorList.php

@@ -67 +67 @@
 
         foreach ($this->selectors as $selector) {
-            $selectors->attach(clone $selector);
+            $selectors->offsetSet(clone $selector);
         }
 

jch-optimize/trunk/lib/src/Css/Components/CssUrl.php

@@ -80 +80 @@
 
         return "url\(\s*+(?<delimiter>['\"]?)(?<url>"
-         . "(?<=\")(?>[^\"\\\\]++|{$esc})++|(?<=')(?>[^'\\\\]++|{$esc})++|(?>[^)\\\\]++|{$esc})++"
+         . "(?<=\")(?>[^\"\\\\]++|{$esc})++|(?<=')(?>[^'\\\\]++|{$esc})++|(?>[^)\\\\]++|{$esc})*?"
         . ")['\"]?\s*+\)";
     }

jch-optimize/trunk/lib/src/Css/Components/NestingAtRule.php

@@ -4 +4 @@
  * JCH Optimize - Performs several front-end optimizations for fast downloads
  *
- *  @package   jchoptimize/core
- *  @author    Samuel Marshall <[email protected]>
- *  @copyright Copyright (c) 2024 Samuel Marshall / JCH Optimize
- *  @license   GNU/GPLv3, or later. See LICENSE file
+ * @package   jchoptimize/core
+ * @author    Samuel Marshall <[email protected]>
+ * @copyright Copyright (c) 2024 Samuel Marshall / JCH Optimize
+ * @license   GNU/GPLv3, or later. See LICENSE file
  *
  *  If LICENSE file missing, see <http://www.gnu.org/licenses/>.
@@ -50 +50 @@
         }
 
+        return self::loadFromMatch($matches);
+    }
+
+    public static function loadFromMatch(array $matches): static
+    {
+        // If for some reason we didn't get the groups, fall back.
+        if (!isset($matches['identifier'], $matches['rule'], $matches['cssRuleList'])) {
+            return static::load($matches[0]);
+        }
+
         $identifier = $matches['identifier'];
-        $vendor = $matches['vendor'];
+        $vendor = $matches['vendor'] ?? '';
         $rule = $matches['rule'];
         $cssRuleList = $matches['cssRuleList'];
@@ -63 +73 @@
     }
 
-
-    private static function cssNestingAtRuleWithCaptureGroupToken(): string
+    public static function cssNestingAtRuleWithCaptureGroupToken(): string
     {
         $esc = self::cssEscapedString();
@@ -73 +82 @@
 
         return "@(?<vendor>(?:-[^-]++-)?)(?<identifier>[a-zA-Z-]++)\s*+"
-        . "(?<rule>(?>[^{}@/\\\\'\";\su]++|{$bc}|{$esc}|{$dqStr}|{$sqStr}|{$url}|[/u]|\s++)*?)\s*+"
-        . "(?P<cssBlock>{(?<cssRuleList>(?>(?:[^{}/\\\\'\"]++|{$bc}|{$esc}|{$dqStr}|{$sqStr}|/)++|(?&cssBlock))*+)})";
+            . "(?<rule>(?>[^{}@/\\\\'\";\su]++|{$bc}|{$esc}|{$dqStr}|{$sqStr}|{$url}|[/u]|\s++)*?)\s*+"
+            . "(?P<cssBlock>{"
+            . "(?<cssRuleList>(?>(?:[^{}/\\\\'\"]++|{$bc}|{$esc}|{$dqStr}|{$sqStr}|/)++|(?&cssBlock))*+)"
+            . "})";
     }
 

jch-optimize/trunk/lib/src/Css/CssProcessor.php

@@ -24 +24 @@
 use JchOptimize\Core\Css\Callbacks\HandleAtRules;
 use JchOptimize\Core\Css\Callbacks\PostProcessCriticalCss;
+use JchOptimize\Core\Css\Components\CssRule;
+use JchOptimize\Core\Css\Components\NestingAtRule;
 use JchOptimize\Core\Css\Sprite\Generator;
 use JchOptimize\Core\Exception;
@@ -131 +133 @@
         $oParser = new Parser();
         $cssRule = new CssSearchObject();
-        $cssRule->setCssMatch(Parser::cssRuleToken());
+        $cssRule->setCssMatch(CssRule::cssRuleWithCaptureValueToken());
         $oParser->setCssSearchObject($cssRule);
 
         $nestedAtRule = new CssSearchObject();
-        $nestedAtRule->setCssMatch(Parser::cssNestingAtRulesToken());
+        $nestedAtRule->setCssMatch(NestingAtRule::cssNestingAtRuleWithCaptureGroupToken());
         $oParser->setCssSearchObject($nestedAtRule);
 
@@ -261 +263 @@
         $oParser = new Parser();
         $oCssSearchObject = new CssSearchObject();
-        $oCssSearchObject->setCssMatch(Parser::cssRuleToken());
+        $oCssSearchObject->setCssMatch(CssRule::cssRuleWithCaptureValueToken());
         $oParser->setCssSearchObject($oCssSearchObject);
 
         $atRuleSearchObject = new CssSearchObject();
-        $atRuleSearchObject->setCssMatch(Parser::cssNestingAtRulesToken());
+        $atRuleSearchObject->setCssMatch(NestingAtRule::cssNestingAtRuleWithCaptureGroupToken());
         $oParser->setCssSearchObject($atRuleSearchObject);
 
@@ -306 +308 @@
         $parser = new Parser();
         $atRuleSearchObject = new CssSearchObject();
-        $atRuleSearchObject->setCssMatch(Parser::cssNestingAtRulesToken());
+        $atRuleSearchObject->setCssMatch(NestingAtRule::cssNestingAtRuleWithCaptureGroupToken());
         $parser->setCssSearchObject($atRuleSearchObject);
 

jch-optimize/trunk/lib/src/Css/Parser.php

@@ -59 +59 @@
 
         $sProcessedCss = preg_replace_callback(
-            '#' . $regex . '#six',
+            '#' . $regex . '#siJ',
             [$callback, 'processMatches'],
             $sCss
@@ -82 +82 @@
     public function replaceMatches(string $css, string $replace): string
     {
-        $processedCss = preg_replace('#' . $this->getCssSearchRegex() . '#i', $replace, $css);
+        $processedCss = preg_replace('#' . $this->getCssSearchRegex() . '#iJ', $replace, $css);
 
         self::throwExceptionOnPregError();

jch-optimize/trunk/lib/src/Css/Xpath/CssSelector.php

@@ -17 +17 @@
 
 use function in_array;
+use function preg_match;
 
 class CssSelector extends XpathCssSelector
@@ -23 +24 @@
     {
         return $this->type
-               || $this->id
-               || (int)$this->classes?->count() > 0
-               || (int)$this->attributes?->count() > 0
-               || (int)$this->pseudoClasses?->count() > 0
-               || $this->pseudoElement
-               || $this->descendant !== null;
+            || $this->id
+            || (int)$this->classes?->count() > 0
+            || (int)$this->attributes?->count() > 0
+            || (int)$this->pseudoClasses?->count() > 0
+            || $this->pseudoElement
+            || $this->descendant !== null;
     }
 
@@ -59 +60 @@
     }
 
-    public function render(?string $axis = null, ?string $indexPredicate = null): string
+    /**
+     * Render each top-level CSS selector as XPath, optionally restricted to
+     * the first match of each branch by appending [1].
+     *
+     * Pseudo-selectors inside the branch stay unchanged because we only
+     * post-process the top-level branch string returned by CssSelector::render().
+     */
+    public function renderFirstPerBranch(?string $axis = null): string
     {
-        $indexPredicate = $indexPredicate ?? '[1]';
+        // This will always be your CssSelector subclass, but keep it generic.
+        $xpath = $this->render($axis);
 
-        return parent::render() . $indexPredicate;
+        return $this->appendFirstPredicate($xpath);
+    }
+
+    /**
+     * Append [1] to the end of the branch if it’s not already there.
+     *
+     * Because CssSelector::render() always returns something of the form:
+     *   <axis>::<node>[pred][pred]...
+     * this "[1]" applies to the whole node-set for that branch.
+     */
+    private function appendFirstPredicate(string $xpath): string
+    {
+        // Be defensive: don’t double-up if some other caller already did this.
+        if ($xpath === '' || preg_match('/\[\s*1\s*]$/', $xpath)) {
+            return $xpath;
+        }
+
+        return $xpath . '[1]';
     }
 }

jch-optimize/trunk/lib/src/Css/Xpath/PseudoClassSelector.php

@@ -97 +97 @@
         return $rendered !== '' ? $rendered : "[false()]";
     }
-
-    /**
-     * Critical CSS tweak on top of the base :not(...) transform:
-     * drop a trailing [1] that can accidentally over-restrict a NOT predicate.
-     */
-    protected function renderNotSelectorList(): string
-    {
-        return $this->getSelectorList()?->render('self', '');
-    }
 }

jch-optimize/trunk/lib/src/FileInfo.php

@@ -40 +40 @@
     private ?bool $aboveFold = null;
 
-    public function __construct(protected HtmlElementInterface|CssComponents $element)
-    {
+    public function __construct(
+        protected HtmlElementInterface|CssComponents $element,
+        protected ?bool $isSensitive = false
+    ) {
         $this->applyParts($element);
     }

jch-optimize/trunk/lib/src/FileUtils.php

@@ -62 +62 @@
         $path = $newUri->getPath();
 
+        if ($path === '/' && ($query = $newUri->getQuery()) !== '') {
+            $queryLen = strlen($query);
+            if ($queryLen > $length - 1) {
+                $query = substr($query, 0, -($queryLen - $length + 4)) . '...';
+            }
+
+            $path .= '?' . $query;
+        }
+
         if (UriComparator::isCrossOrigin($newUri)) {
             $domain  = $newUri->withPort(null)->withPath('')->withQuery('')->withFragment('');
@@ -102 +111 @@
         }
 
-         return (string) $uri->withQuery('')->withFragment('');
+        $query = '';
+        if ($uri->getPath() === '/' && ($query = $uri->getQuery()) !== '') {
+            $queryLen = strlen($query);
+            $query = substr($query, 0, -($queryLen - 60));
+        }
+
+        return (string) $uri->withQuery($query)->withFragment('');
     }
 

jch-optimize/trunk/lib/src/Html/AttributesCollection.php

@@ -94 +94 @@
         $attribute = new Attribute($name, $value, $delimiter);
 
-        $this->attach($attribute);
+        $this->offsetSet($attribute);
     }
 
@@ -136 +136 @@
 
             if ($attribute->getName() == $name) {
-                $this->detach($attribute);
+                $this->offsetUnset($attribute);
 
                 return;

jch-optimize/trunk/lib/src/Html/BuildHtmlElement.php

@@ -15 +15 @@
 
 use JchOptimize\Core\Exception\PregErrorException;
+use JchOptimize\Core\Exception\RuntimeException;
 use JchOptimize\Core\Html\Elements\BaseElement;
+use LogicException;
 
 use function preg_match;
@@ -26 +28 @@
     protected string $regex = '';
 
-    protected BaseElement $element;
+    protected ?BaseElement $element = null;
 
     /**
@@ -34 +36 @@
     {
         $elementRegex = self::htmlElementWithCaptureValueToken();
-        preg_match("#^{$elementRegex}$#s", $html, $matches);
+        $result = preg_match("#^{$elementRegex}$#s", $html, $matches);
+
+        if ($result === false) {
+            throw new RuntimeException('Failed to parse HTML string');
+        }
+
+        $this->buildFromMatch($matches);
+    }
+
+    /**
+     * @throws PregErrorException
+     */
+    public function buildFromMatch(array $matches): void
+    {
+        if (!isset($matches['name'])) {
+            $this->build($matches[0]);
+
+            return;
+        }
 
         $name = strtolower($matches['name']);
         $this->element = HtmlElementBuilder::$name();
 
+        $attrsText = $matches['attributes'] ?? '';
+        if ($attrsText !== '') {
+            $this->loadAttributesFromText($attrsText);
+        }
+
+        if (!empty($matches['content'])) {
+            $this->loadChildren($matches['content']);
+        }
+
+        if (empty($matches['endTag'])) {
+            $this->element->setOmitClosingTag(true);
+        }
+    }
+
+    private function loadAttributesFromText(string $attributesText): void
+    {
         $attributesRegex = self::htmlAttributeWithCaptureValueToken();
+
         preg_match_all(
             '#' . $attributesRegex . '#ix',
-            $matches['attributes'] ?? '',
+            $attributesText,
             $attributes,
             PREG_SET_ORDER
@@ -52 +89 @@
             $delimiter = $attribute['delimiter'] ?? '"';
 
-            $this->element->attribute($name, $value, $delimiter);
-        }
-
-        if (isset($matches['content'])) {
-            $this->loadChildren($matches['content']);
-        } else {
-            $this->element->setOmitClosingTag(true);
+            $this->element?->attribute($name, $value, $delimiter);
         }
     }
 
-    public function getElement(): HtmlElementInterface
+
+    public function getElement(): BaseElement
     {
+        if ($this->element === null) {
+            throw new LogicException('Element not set');
+        }
+
         return $this->element;
     }
@@ -73 +109 @@
         $endTag = Parser::htmlEndTagToken(Parser::htmlGenericElementNameToken());
 
-        return "<(?<name>{$name})\b(\s++(?<attributes>{$attributes}+))?/?>(?:(?<content>.*){$endTag})?";
+        return "<(?<name>{$name})\b(?:\s++(?<attributes>{$attributes}+))?/?>(?:(?<content>.*)(?<endTag>{$endTag}))?";
     }
 
@@ -104 +140 @@
         $lc = Parser::lineCommentToken();
         //Regular expression literal
-        $rx =  '/(?![/*])(?>(?(?=\\\\)\\\\.|\[(?>(?:\\\\.)?[^\]\r\n]*+)+?\])?[^\\\\/\r\n\[]*+)+?/';
+        $rx = '/(?![/*])(?>(?(?=\\\\)\\\\.|\[(?>(?:\\\\.)?[^\]\r\n]*+)+?\])?[^\\\\/\r\n\[]*+)+?/';
 
         $htmlElementRegex = "(?:{$voidElement}|{$textElement})";
         $regex = "(?<string>(?>[^<'\"/`]++|{$bc}|{$lc}|{$rx}|{$dqStr}|{$sqStr}|{$btStr}|/|(?!{$htmlElementRegex})<)++)"
-        . "|(?<element>(?:{$voidElement}|{$textElementMatch}))";
+            . "|(?<element>(?:{$voidElement}|{$textElementMatch}))";
 
         preg_match_all(
@@ -118 +154 @@
 
         foreach ($matches as $match) {
-            if (!empty($match['element'])) {
+            if (isset($match['element'])) {
                 $child = HtmlElementBuilder::load($match['element']);
-                $child->setParent($this->element->getElementName());
-                $this->element->addChild($child);
-            } elseif (!empty($match['string'])) {
-                $this->element->addChild($match['string']);
+                $child->setParent($this->getElement()->getElementName());
+                $this->getElement()->addChild($child);
+            } elseif (isset($match['string'])) {
+                $this->getElement()->addChild($match['string']);
             }
         }

jch-optimize/trunk/lib/src/Html/CacheManager.php

@@ -130 +130 @@
         $combinedByGroup = [];
         $cacheObjByGroup = [];
+        $sensitiveCacheObjByOrds = [];
         $belowFoldFontsEl = null;
         $reducedBundleEl = null;
@@ -136 +137 @@
         $reduceUnusedCss = $this->params->get('pro_reduce_unused_css', '0');
 
-        $layoutPlanner = $this->cssLayoutPlanner->plan(
-            $this->filesManager->cssTimeLine,
-            $optimizeDelivery,
-            $reduceUnusedCss
-        );
+        $cssTimeLine = $this->filesManager->cssTimeLine;
+        $layoutPlanner = $this->cssLayoutPlanner->plan($cssTimeLine, $optimizeDelivery, $reduceUnusedCss);
+
+        if ($optimizeDelivery) {
+            foreach ($cssTimeLine as $item) {
+                if ($item->isSensitive) {
+                    $fileInfo = new FileInfo(clone $item->node);
+                    $cacheObj = $this->getCombinedFiles([$fileInfo], $id, 'css', false, $hit);
+                    $this->updateOptimizeCssDelivery($cacheObj, $item->node, $hit, false);
+                    $sensitiveCacheObjByOrds[$item->ordinal] = $cacheObj;
+                }
+            }
+        }
 
         /**
-         * @var  int        $cssLinksKey
+         * @var  int $cssLinksKey
          * @var  FileInfo[] $cssInfosArray
          */
@@ -195 +204 @@
             $combinedByGroup,
             $cacheObjByGroup,
+            $sensitiveCacheObjByOrds,
             $belowFoldFontsEl,
             $reducedBundleEl
@@ -214 +224 @@
         $combinedByGroup = [];
         /**
-         * @var int        $aJsLinksKey
+         * @var int $aJsLinksKey
          * @var FileInfo[] $jsInfosArray
          */
@@ -278 +288 @@
 
             return $results;
-        } catch (Exception|LaminasCacheExceptionInterface $e) {
+        } catch (Exception | LaminasCacheExceptionInterface $e) {
             throw new RuntimeException('Error creating cache files: ' . $e->getMessage());
         }
@@ -374 +384 @@
 
                     if (
-                        in_array($name, ['id', 'integrity', 'crossorigin', 'referrerpolicy', 'nonce'])
+                        in_array($name, ['id', 'class', 'nonce'])
                         || (str_starts_with('data-', $name))
                     ) {
@@ -472 +482 @@
             if ($criticalCssAlreadyExisted) {
                 $this->getContainer()->get(CriticalCssDependencies::class)
-                     ->addToCriticalCssAggregate($criticalCssObj->getCriticalCss())
-                     ->addToDynamicCriticalCssAggregate($criticalCssObj->getDynamicCriticalCss())
-                     ->addToPotentialCriticalCssAtRules($criticalCssObj->getPotentialCriticalCssAtRules());
+                    ->addToCriticalCssAggregate($criticalCssObj->getCriticalCss())
+                    ->addToDynamicCriticalCssAggregate($criticalCssObj->getDynamicCriticalCss())
+                    ->addToPotentialCriticalCssAtRules($criticalCssObj->getPotentialCriticalCssAtRules());
             }
 
@@ -496 +506 @@
         $cssProcessor->setCssInfos(new FileInfo($element));
         $this->getContainer()->get(CriticalCssDependencies::class)
-             ->addToPotentialCriticalCssAtRules($cssProcessor->getCacheObj()->getPotentialCriticalCssAtRules());
+            ->addToPotentialCriticalCssAtRules($cssProcessor->getCacheObj()->getPotentialCriticalCssAtRules());
         $cssProcessor->optimizeCssDelivery();
 
@@ -516 +526 @@
     {
         $style = HtmlElementBuilder::style()
-                                   ->addChild($cssCacheObj->getBelowFoldFontsKeyFrame());
+            ->addChild($cssCacheObj->getBelowFoldFontsKeyFrame());
         $fileInfo = new FileInfo($style);
         $fileInfo->setAlreadyProcessed(true);

jch-optimize/trunk/lib/src/Html/Callbacks/AbstractCallback.php

@@ -58 +58 @@
 
         try {
-            $element = HtmlElementBuilder::load($matches[0]);
+            $element = HtmlElementBuilder::loadFromMatch($matches);
         } catch (PregErrorException) {
             return $matches[0];

jch-optimize/trunk/lib/src/Html/Callbacks/CombineJsCss.php

@@ -178 +178 @@
         if ($element instanceof Script && $element->hasAttribute('src')) {
             if (Helper::uriInvalid($element->getSrc())) {
-                return $element->render();
+                return '';
             }
         }
@@ -184 +184 @@
         if ($element instanceof Link && $element->hasAttribute('href')) {
             if (Helper::uriInvalid($element->getHref())) {
-                return $element->render();
+                return '';
             }
         }

jch-optimize/trunk/lib/src/Html/CssLayout/CssItem.php

@@ -26 +26 @@
         public bool $isInline,      // <style> vs <link>
         public bool $isMarker,
+        public bool $isSensitive,
         public ?string $media,      // media attr, if any
         public Link|Style|null $node     // original element

jch-optimize/trunk/lib/src/Html/CssLayout/CssLayoutPlanner.php

@@ -34 +34 @@
                 isMarker: $item->isMarker,
                 groupIndex: $item->groupIndex,
+                isSensitive: $item->isSensitive,
                 item: $item,
             );
 
+            // 1) Head-blocking list
             // IEO / removed CSS is handled by FilesManager and never enters the plan.
             // Excluded (non-processed) CSS still participates in "headBlocking" layout.
             if ((!$optimizeDelivery && !$reduceUnusedCss) || $item->isExcluded) {
                 $plan->headBlocking[] = $placement;
-            } elseif ($optimizeDelivery && !$reduceUnusedCss && $item->isProcessed) {
+
+                continue;
+            }
+
+            // 2) Sensitive CSS handling
+            if ($item->isSensitive) {
+                // Optimize OFF: they just behave as head-blocking CSS already (above).
+                if ($optimizeDelivery) {
+                    // Optimize Delivery ON:
+                    // - use them for critical & dynamic-critical
+                    $plan->headInlineCritical[] = $placement;
+                    $plan->bodyInlineDynamicCritical[] = $placement;
+
+                    // Reduce-unused OFF: also load the original file asynchronously.
+                    if (!$reduceUnusedCss) {
+                        $plan->bodyAsync[] = $placement;
+                    } else {
+                        $plan->bodySensitiveDynamic[] = $placement;
+                    }
+                }
+
+                // Don't fall through into "processed group" logic
+                continue;
+            }
+
+            // 3) Normal (non-sensitive) CSS handling
+            if ($optimizeDelivery && !$reduceUnusedCss && $item->isProcessed) {
                 // Optimize CSS Delivery ON, Reduce Unused OFF:
                 // - critical CSS in head

jch-optimize/trunk/lib/src/Html/CssLayout/CssPlacementItem.php

@@ -20 +20 @@
         public bool $isMarker,
         public ?int $groupIndex,     // group index in aCss
+        public bool $isSensitive,
         public ?CssItem $item     // original element (for inline/excluded cases)
     ) {

jch-optimize/trunk/lib/src/Html/CssLayout/CssPlacementPlan.php

@@ -46 +46 @@
     public array $bodyInlineDynamicCritical = [];
 
-        /**
+    /**
+     * Sensitive items that should be loaded dynamically
+     *
+     * @var CssPlacementItem[];
+     */
+    public array $bodySensitiveDynamic = [];
+
+    /**
      * Whether we should append a “below the fold fonts” CSS block in the body.
      * The actual element is created in CacheManager and passed to HtmlManager.

jch-optimize/trunk/lib/src/Html/Elements/BaseElement.php

@@ -265 +265 @@
 
             $newAttribute = new Attribute($name, $value, $delimiter);
-            $attributes->attach($newAttribute);
+            $attributes->offsetSet($newAttribute);
         }
 

jch-optimize/trunk/lib/src/Html/FilesManager.php

@@ -78 +78 @@
 
     /**
+     * @var bool Flagged when a sensitive CSS file is encountered
+     */
+    protected bool $cssSensitive = false;
+
+    /**
+     * @var bool Flagged when a sensitive JS file is encountered
+     */
+    protected bool $jsSensitive = false;
+    /**
      * @var array $aCss Multidimensional array of css files to combine
      */
@@ -256 +265 @@
         }
 
-        if ($this->isDuplicated($uri)) {
-            $this->replacement = '';
-            $this->excludeCssIEO();
+        if ($this->isSensitiveExternal($link, $uri)) {
+            $this->recordSensitiveCss($link, $media);
+
+            // No PEO/IEO excludes, no adding to $aCss; planner will later:
+            // - use it for critical CSS extraction
+            // - schedule original href async/dynamic
+            return;
         }
 
@@ -340 +353 @@
     private function excludeCssPEO(Link|Style $element, ?string $media = null)
     {
-        //if previous file was not excluded increment css index
-        if (!$this->cssExcludedPeo && !empty($this->cssReplacements[0])) {
-            $this->iIndex_css++;
-        }
-
         $this->cssExcludedPeo = true;
         $this->sCssExcludeType = 'peo';
@@ -357 +365 @@
             isInline: $element instanceof Style,
             isMarker: $ordinal === 0,
+            isSensitive: false,
             media: $media,
             node: $element
@@ -386 +395 @@
     private function updateIndex(): void
     {
-        if (!$this->params->get('combine_files', '0')) {
-            $element = $this->getElement();
-
-            if ($element instanceof Script) {
-                // Don't increase index if we're in an exclude. Index already incremented.
-                if (!$this->jsExcludedPeo && !empty($this->aJs[$this->iIndex_js] ?? [])) {
-                    $this->iIndex_js++;
-                }
-            } elseif ($element instanceof Link || $element instanceof Style) {
-                // Same logic for CSS
-                if (!$this->cssExcludedPeo && !empty($this->aCss[$this->iIndex_css] ?? [])) {
-                    $this->iIndex_css++;
-                }
+        $combineFiles = $this->params->get('combine_files', '0');
+        $element = $this->getElement();
+
+        if ($element instanceof Script && !empty($this->aJs[$this->iIndex_js] ?? [])) {
+            if (!$combineFiles) {
+                $this->iIndex_js++;
+            } elseif ($this->jsExcludedPeo || $this->jsSensitive) {
+                $this->iIndex_js++;
+            }
+        } elseif (
+            ($element instanceof Link || $element instanceof Style)
+            && !empty($this->aCss[$this->iIndex_css] ?? [])
+        ) {
+            // Same logic for CSS
+            if (!$combineFiles) {
+                $this->iIndex_css++;
+            } elseif ($this->cssExcludedPeo || $this->cssSensitive) {
+                $this->iIndex_css++;
             }
         }
@@ -439 +453 @@
         if ($this->isDuplicated($uri)) {
             $this->replacement = '';
-            $this->excludeJsIEO($script);
+            return;
+        }
+
+        // --- sensitivity check for external JS ---
+        if ($this->isSensitiveExternal($script, $uri)) {
+            $this->recordSensitiveJs($script);
+
+            // We don't process or exclude it; just keep it in the timeline for the planner.
+            return;
         }
 
@@ -483 +505 @@
             isIeo: true,
             isDeferred: Helper::isScriptDeferred($script),
+            isSensitive: false,
             node: $script
         );
@@ -506 +529 @@
             isIeo: false,
             isDeferred: Helper::isScriptDeferred($script),
+            isSensitive: false,
             node: $script
         );
@@ -518 +542 @@
     {
         $content = $script->getChildren()[0];
+
+        //Exclude all scripts if options set
+        if (
+            !$this->params->get('inlineScripts', '0')
+            || $this->params->get('excludeAllScripts', '0')
+        ) {
+            $this->excludeJsPEO($script);
+        }
 
         if ($this->sectionExcludes !== null) {
@@ -536 +568 @@
         }
 
-        //Exclude all scripts if options set
-        if (
-            !$this->params->get('inlineScripts', '0')
-            || $this->params->get('excludeAllScripts', '0')
-        ) {
-            $this->excludeJsPEO($script);
-        }
-
         $this->maybeProcessScript($script);
-    }
-
-    private function responseToPreviousExclude(): void
-    {
-        //If previous file was excluded PEO, update index
-        if ($this->jsExcludedPeo) {
-            $this->iIndex_js++;
-        }
     }
 
@@ -572 +588 @@
         if (!$isDeferred) {
             $this->updateIndex();
-            $this->responseToPreviousExclude();
-            $this->jsExcludedPeo = false;
-            $this->jsExcludedIeo = false;
             $this->aJs[$this->iIndex_js][] = new FileInfo(clone $script);
             $this->jsReplacements[$this->iIndex_js][] = $script;
@@ -580 +593 @@
             $groupIndex = $this->iIndex_js;
         }
+
+        //These properties must only be set after index is (maybe) updated
+        $this->jsExcludedPeo = false;
+        $this->jsExcludedIeo = false;
+        $this->cssSensitive = false;
 
         $existingGroupIndexes = array_filter(
@@ -595 +613 @@
                 isIeo: false,
                 isDeferred: $isDeferred,
+                isSensitive: false,
                 node: !$this->params->get('combine_files', 0) ? clone $script : null
             );
@@ -603 +622 @@
     {
         $this->updateIndex();
+        //These properties must be set only after index is updated
         $this->cssExcludedPeo = false;
         $this->cssExcludedIeo = false;
+        $this->cssSensitive = false;
+
         $this->aCss[$this->iIndex_css][] = new FileInfo(clone $element);
         $this->cssReplacements[$this->iIndex_css][] = $element;
@@ -623 +645 @@
                 isInline: false,
                 isMarker: $ordinal === 0,
+                isSensitive: false,
                 media: $media,
                 node: !$this->params->get('combine_files', 0) ? clone $element : null
@@ -628 +651 @@
         }
     }
+
+    private function hasSensitiveAttributes(HtmlElementInterface $element): bool
+    {
+        return $element->hasAttribute('integrity')
+            || $element->hasAttribute('crossorigin')
+            || $element->hasAttribute('referrerpolicy');
+    }
+
+    private function isExternal(UriInterface $uri): bool
+    {
+        $resolvedUri = UriResolver::resolve(SystemUri::currentUri(), $uri);
+
+        $cdn = $this->getContainer()->get(Cdn::class);
+        $path = $this->getContainer()->get(PathsInterface::class);
+
+        return !UriComparator::existsLocally($resolvedUri, $cdn, $path);
+    }
+
+    private function isSensitiveExternal(HtmlElementInterface $element, UriInterface $uri): bool
+    {
+        return $this->hasSensitiveAttributes($element) && $this->isExternal($uri);
+    }
+
+    private function recordSensitiveJs(Script $script): void
+    {
+        $this->jsSensitive = true;
+        $this->replacement = '';
+
+        $this->jsTimeLine[] = new JsItem(
+            ordinal: count($this->jsTimeLine),
+            groupIndex: null,               // not part of any processed group
+            isProcessed: false,
+            isExcluded: false,
+            isGate: false,
+            isIeo: false,
+            isDeferred: Helper::isScriptDeferred($script),
+            isSensitive: true,
+            node: clone $script
+        );
+    }
+
+    private function recordSensitiveCss(Link $link, ?string $media): void
+    {
+        $this->cssSensitive = true;
+        $this->replacement = '';
+        $ordinal = count($this->cssTimeLine);
+
+        $this->cssTimeLine[] = new CssItem(
+            ordinal: $ordinal,
+            groupIndex: null,               // not part of any processed group
+            isProcessed: false,
+            isExcluded: false,
+            isInline: false,
+            isMarker: $ordinal === 0,
+            isSensitive: true,
+            media: $media,
+            node: clone $link
+        );
+    }
 }

jch-optimize/trunk/lib/src/Html/HtmlElementBuilder.php

@@ -82 +82 @@
     {
         $builder = new BuildHtmlElement();
+        $builder->build($html);
 
-        $builder->build($html);
+        return $builder->getElement();
+    }
+
+    /**
+     * @throws PregErrorException
+     */
+    public static function loadFromMatch(array $matches): HtmlElementInterface
+    {
+        $builder = new BuildHtmlElement();
+        $builder->buildFromMatch($matches);
 
         return $builder->getElement();

jch-optimize/trunk/lib/src/Html/HtmlManager.php

@@ -107 +107 @@
     {
         return HtmlElementBuilder::style()
-                                 ->class('jchoptimize-critical-css')
-                                 ->data('id', $id)
-                                 ->addChild(PHP_EOL . $criticalCss . PHP_EOL)
-                                 ->render();
+            ->class('jchoptimize-critical-css')
+            ->data('id', $id)
+            ->addChild(PHP_EOL . $criticalCss . PHP_EOL)
+            ->render();
     }
 
@@ -211 +211 @@
     {
         return ($this->params->get('gzip', 0) && extension_loaded('zlib') && !ini_get('zlib.output_compression')
-                && (ini_get('output_handler') != 'ob_gzhandler'));
+            && (ini_get('output_handler') != 'ob_gzhandler'));
     }
 
@@ -263 +263 @@
         if ($element instanceof Link) {
             $attr = [
-                'rel'    => 'preload',
-                'as'     => 'style',
+                'rel' => 'preload',
+                'as' => 'style',
                 'onload' => 'this.rel=\'stylesheet\'',
             ];
@@ -271 +271 @@
             $attr = [
                 'onload' => "this.media='{$media}'",
-                'media'  => 'print'
+                'media' => 'print'
             ];
         }
@@ -290 +290 @@
     {
         return HtmlElementBuilder::style()
-                                 ->class('jchoptimize-dynamic-critical-css')
-                                 ->data('id', $id)
-                                 ->addChild(PHP_EOL . $css . PHP_EOL)
-                                 ->render();
+            ->class('jchoptimize-dynamic-critical-css')
+            ->data('id', $id)
+            ->addChild(PHP_EOL . $css . PHP_EOL)
+            ->render();
     }
 
     /**
-     * @param   CssPlacementPlan  $plan
-     * @param   (Link|Style)[]    $combinedByGroup
-     * @param   CacheObject[]     $cacheObjectByGroup
-     * @param   Link|null         $belowFoldFontsEl
-     * @param   Link|null         $reducedBundleEl
+     * @param CssPlacementPlan $plan
+     * @param (Link|Style)[] $combinedByGroup
+     * @param CacheObject[] $cacheObjectByGroup
+     * @param CacheObject[] $sensitiveCacheObjByOrds
+     * @param Link|null $belowFoldFontsEl
+     * @param Link|null $reducedBundleEl
      *
      * @return void
@@ -309 +310 @@
         array $combinedByGroup,
         array $cacheObjectByGroup,
+        array $sensitiveCacheObjByOrds,
         ?Link $belowFoldFontsEl,
         ?Link $reducedBundleEl
@@ -372 +374 @@
 
             foreach ($plan->headInlineCritical as $placement) {
+                if ($placement->isSensitive) {
+                    $sCacheObj = $sensitiveCacheObjByOrds[$placement->item->ordinal] ?? null;
+                    if ($sCacheObj !== null && ($sCss = $sCacheObj->getCriticalCss()) !== '') {
+                        $insertion .= "\t" . $this->getCriticalCssHtml($sCss, $sCacheObj->getCriticalCssId()) . PHP_EOL;
+                    }
+                    continue;
+                }
+
                 $cacheObj = $cacheObjectByGroup[$placement->groupIndex] ?? null;
                 if ($cacheObj !== null && ($css = $cacheObj->getCriticalCss()) !== '') {
@@ -386 +396 @@
 
             foreach ($plan->bodyInlineDynamicCritical as $placement) {
+                if ($placement->isSensitive) {
+                    $sCacheObj = $sensitiveCacheObjByOrds[$placement->item->ordinal] ?? null;
+                    if ($sCacheObj !== null && ($sCss = $sCacheObj->getDynamicCriticalCss()) !== '') {
+                        $insertion .= "\t" . $this->getDynamicCriticalCssHtml(
+                            $sCss,
+                            $sCacheObj->getCriticalCssId()
+                        ) . PHP_EOL;
+                    }
+                    continue;
+                }
+
                 $cacheObj = $cacheObjectByGroup[$placement->groupIndex] ?? null;
                 if ($cacheObj !== null && ($css = $cacheObj->getDynamicCriticalCss()) !== '') {
                     $insertion .= "\t" . $this->getDynamicCriticalCssHtml(
-                            $css,
-                            $cacheObj->getCriticalCssId()
-                        ) . PHP_EOL;
+                        $css,
+                        $cacheObj->getCriticalCssId()
+                    ) . PHP_EOL;
                 }
             }
@@ -408 +429 @@
 
             foreach ($plan->bodyAsync as $placement) {
+                if ($placement->isSensitive) {
+                    $el = $placement->item->node;
+                    $this->preloadStyleSheet($el, 'low');
+                    $insertion .= "\t" . $el->render() . PHP_EOL;
+
+                    continue;
+                }
+
                 $cssEl = $combinedByGroup[$placement->groupIndex] ?? null;
                 if ($cssEl) {
@@ -442 +471 @@
         }
 
+        if (!empty($plan->bodySensitiveDynamic)) {
+            $insertion = '';
+
+            foreach ($plan->bodySensitiveDynamic as $placement) {
+                $el = $placement->item->node->type('jchoptimize-text/css');
+                $insertion .= "\t" . $el->render() . PHP_EOL;
+            }
+
+            $html = preg_replace(
+                '#' . Parser::htmlClosingBodyTagToken() . '#si',
+                $insertion . '\0',
+                $html,
+                1
+            );
+        }
+
         $this->processor->setFullHtml($html);
     }
@@ -512 +557 @@
                     JCH_PRO
                     && $this->params->get('pro_reduce_unused_js_enable', '0')
-                    && (
-                        ($section === 'body' && $placement->isProcessed && $placement->isDeferable)
-                        || ($placement->isDeferred && !$placement->isExcluded)
-                    )
+                    && $section === 'body'
+                    && ($placement->isDeferable || $placement->isDeferred)
+                    && !$placement->isExcluded
                     && $dynamicJs instanceof DynamicJs
                 ) {
@@ -522 +566 @@
                         $insertion .= "\t" . (string)$script . PHP_EOL;
                     }
+                } elseif (
+                    $this->params->get('loadAsynchronous', '0')
+                    && $section === 'body'
+                    && $placement->isDeferable && !$placement->isExcluded
+                ) {
+                    if ($placement->isProcessed) {
+                        $script = $combinedByGroup[$placement->groupIndex] ?? null;
+                    } else {
+                        $script = $placement->item->node;
+                    }
+
+                    if ($script) {
+                        // Add defer/async if loadAsynchronous & bottom_js logic apply
+                        $this->deferScript($script);
+                        $insertion .= "\t" . $script->render() . PHP_EOL;
+                    }
                 } elseif ($placement->isProcessed) {
                     $script = $combinedByGroup[$placement->groupIndex] ?? null;
                     if ($script) {
-                        // Add defer/async if loadAsynchronous & bottom_js logic apply
-                        if (
-                            $section === 'body'
-                            && $this->params->get('loadAsynchronous', '0')
-                            && $placement->isDeferable
-                        ) {
-                            $this->deferScript($script);
-                        }
                         $insertion .= "\t" . $script->render() . PHP_EOL;
                     }
@@ -577 +629 @@
     {
         return HtmlElementBuilder::link()
-                                 ->rel('modulepreload')
-                                 ->href($url)
-                                 ->fetchpriority('low')
-                                 ->render();
+            ->rel('modulepreload')
+            ->href($url)
+            ->fetchpriority('low')
+            ->render();
     }
 
@@ -643 +695 @@
         if ($css !== '') {
             $style = HtmlElementBuilder::style()
-                                       ->id('jchoptimize-custom-css')
-                                       ->addChild($css)
-                                       ->render();
+                ->id('jchoptimize-custom-css')
+                ->addChild($css)
+                ->render();
 
             $this->appendChildToHead($style);
@@ -666 +718 @@
      * @template T of Link|Script
      *
-     * @param   T         $element   The HTML element to add the data-file attribute to.
-     * @param   FileInfo  $fileInfo  The file information.
+     * @param T $element The HTML element to add the data-file attribute to.
+     * @param FileInfo $fileInfo The file information.
      *
      * @return T Returns the same type as the $element input (Link or Script).

jch-optimize/trunk/lib/src/Html/HtmlProcessor.php

@@ -32 +32 @@
 use JchOptimize\Core\Html\Elements\Img;
 use JchOptimize\Core\Html\Elements\Source;
+use JchOptimize\Core\Optimize;
 use JchOptimize\Core\Platform\ProfilerInterface;
 use JchOptimize\Core\Registry;
@@ -316 +317 @@
             !JCH_DEBUG ?: $this->profiler->start('LazyLoadImages');
 
-            $html = $this->getBodyHtml();
-
-            $aboveFoldBody = $this->getAboveFoldHtml($html);
-            $belowFoldHtml = substr($html, strlen($aboveFoldBody));
-            $fullHtml = $this->getFullHtml();
-            $aboveFoldHtml = substr($fullHtml, 0, strlen($fullHtml) - strlen($belowFoldHtml)) . $this->regexMarker;
+            $bodyHtml = $this->getBodyHtml();
+
+            $aboveFoldBody = $this->getAboveFoldHtml($bodyHtml);
+            $aboveFoldBodyLen = strlen($aboveFoldBody);
+            $belowFoldBody = substr($bodyHtml, $aboveFoldBodyLen);
+
+            $headHtml = $this->getHeadHtml();
 
             try {
@@ -336 +338 @@
                 $http2Callback = $this->getContainer()->get(LazyLoad::class);
                 $http2Callback->setLazyLoadArgs($http2Args);
-                $processedAboveFoldHtml = $aboveFoldParser->processMatchesWithCallback(
-                    $aboveFoldHtml,
-                    $http2Callback
-                );
+                $processedHeadHtml = $aboveFoldParser->processMatchesWithCallback($headHtml, $http2Callback);
+                $this->setHeadHtml($processedHeadHtml);
+                $processedAboveFoldBody = $aboveFoldParser->processMatchesWithCallback($aboveFoldBody, $http2Callback);
 
                 $belowFoldParser = new Parser();
@@ -353 +354 @@
                 $lazyLoadCallback->setLazyLoadArgs($lazyLoadArgs);
                 $processedBelowFoldHtml = $belowFoldParser->processMatchesWithCallback(
-                    $belowFoldHtml,
+                    $belowFoldBody,
                     $lazyLoadCallback
                 );
@@ -366 +367 @@
                 }
 
-                $this->setFullHtml(
-                    $this->cleanRegexMarker($processedAboveFoldHtml) . $marker . $processedBelowFoldHtml
+                $this->setBodyHtml(
+                    $this->cleanRegexMarker($processedAboveFoldBody) . $marker . $processedBelowFoldHtml
                 );
             } catch (PregErrorException $oException) {
@@ -443 +444 @@
         if (
             !$this->params->get('cookielessdomain_enable', '0') ||
-            (trim($this->params->get('cookielessdomain', '')) == '' &&
+            (
+                trim($this->params->get('cookielessdomain', '')) == '' &&
                 trim($this->params->get('pro_cookielessdomain_2', '')) == '' &&
-                trim($this->params->get('pro_cookieless_3', '')) == '')
+                trim($this->params->get('pro_cookieless_3', '')) == ''
+            )
         ) {
             return;
@@ -687 +690 @@
         } catch (PregErrorException $e) {
             $this->logger?->error('RemoveScriptsFromHtml failed ' . $e->getMessage());
+
             return $html;
         }
@@ -693 +697 @@
     public function processJavaScriptForConfigureHelper(): array
     {
+        Optimize::setPcreLimits();
         $dynamicScripts = [];
 

jch-optimize/trunk/lib/src/Html/JsLayout/JsItem.php

@@ -26 +26 @@
         public bool $isIeo,       // ignore execution order (IEO)
         public bool $isDeferred,  // deferred/module etc
+        public bool $isSensitive,
         public ?Script $node       // HTML element for this script
     ) {

jch-optimize/trunk/lib/src/Html/JsLayout/JsLayoutPlanner.php

@@ -57 +57 @@
             $placement = new JsPlacementItem(
                 isProcessed: $item->isProcessed,
-                isDeferable: $item->isProcessed && $item->ordinal > $lastPEOExcludeOrdinal,
+                isDeferable: ($item->isProcessed || $item->isSensitive) && $item->ordinal > $lastPEOExcludeOrdinal,
                 isDeferred: $item->isDeferred,
                 isExcluded: $item->isExcluded,
+                isSensitive: $item->isSensitive,
                 groupIndex: $item->groupIndex,
                 item: $item

jch-optimize/trunk/lib/src/Html/JsLayout/JsPlacementItem.php

@@ -21 +21 @@
         public bool $isDeferred,
         public bool $isExcluded,
+        public bool $isSensitive,
         public ?int $groupIndex, //For processed items
         public JsItem $item

jch-optimize/trunk/lib/src/Html/Parser.php

@@ -27 +27 @@
 use function preg_replace;
 use function preg_replace_callback;
-use function str_contains;
 
 defined('_JCH_EXEC') or die('Restricted access');
@@ -50 +49 @@
     public static function htmlBodyElementToken(): string
     {
-        $htmlHead = self::htmlHeadElementToken();
-
-        return "{$htmlHead}\K.*+$";
+        $bodyStartTag = self::htmlStartTagToken('body');
+        $htmlString = self::htmlStringToken(['script', 'style', 'template']);
+        $bodyEndTag = self::htmlEndTagToken('body');
+
+        return "{$bodyStartTag}{$htmlString}?{$bodyEndTag}";
     }
 
@@ -108 +109 @@
 
         $sProcessedHtml = (string)preg_replace_callback(
-            '#' . $regex . '#si',
+            '#' . $regex . '#siJ',
             [$callbackObject, 'processMatches'],
             $html
@@ -209 +210 @@
     {
         $regex = $this->getHtmlSearchRegex();
-        preg_match_all('#' . $regex . '#si', $sHtml, $aMatches, $flags);
+        preg_match_all('#' . $regex . '#siJ', $sHtml, $aMatches, $flags);
 
         self::throwExceptionOnPregError();
@@ -233 +234 @@
     {
         $regex = $this->getHtmlSearchRegex();
-        $result = preg_replace("#{$regex}#si", "", $html);
+        $result = preg_replace("#{$regex}#siJ", "", $html);
 
         self::throwExceptionOnPregError();
@@ -246 +247 @@
 
         foreach ($attrCriteria as $criterion) {
-            if (str_contains($criterion, '!=')) {
-                list($name, $value) = explode('!=', $criterion);
-                $criterionRegexArray[] = "{$name}\s*+=\s*+(?!\"{$value}\"|'{$value}'|(?<=[=])(?!['\"]){$value}[\s/> ])";
-            } elseif (str_contains($criterion, '==')) {
-                list($name, $value) = explode('==', $criterion);
-
-                $criterionRegexArray[] = "$name\s*+=\s*+(?:\"{$value}\"|'{$value}'|(?<=[=])(?!['\"]){$value}[\s/> ])";
-            } elseif (str_contains($criterion, '~=')) {
-                list($name, $value) = explode('~=', $criterion);
-
-                $criterionRegexArray[] = "{$name}\s*+=\s*+(?:\"[^\"]*?(?<=[\" ]){$value}[\" ]|"
-                    . "'[^']*?(?<=[' ]){$value}[ ']|(?<==)(?!['\"]){$value}[ />])";
-            } elseif (str_contains($criterion, '*=')) {
-                list($name, $value) = explode('*=', $criterion);
-
-                $criterionRegexArray[] = "{$name}\s*+=\s*+(?:\"[^\"]*?{$value}|'[^']*?{$value}|(?<==)(?!['\"])[^\s]*?{$value})";
-            } else {
-                $criterionRegexArray[] = $criterion;
-            }
+            $criterionRegexArray[] = $this->buildCriterionRegex($criterion);
         }
 
@@ -270 +253 @@
 
         return "(?:$criterionRegexString)";
+    }
+
+    private function buildCriterionRegex(string $criterion): string
+    {
+        // Find the operator once
+        if (!preg_match('#(==|!=|~=|\*=)#', $criterion, $m)) {
+            // No operator we care about → return as-is
+            return $criterion;
+        }
+
+        $op = $m[1];
+
+        // Split on the operator (only once)
+        [$name, $value] = explode($op, $criterion, 2);
+
+        return match ($op) {
+            '!=' => $this->buildNotEqualsRegex($name, $value),
+            '==' => $this->buildEqualsRegex($name, $value),
+            '~=' => $this->buildContainsWordRegex($name, $value),
+            '*=' => $this->buildContainsSubstringRegex($name, $value),
+        };
+    }
+
+    private function buildNotEqualsRegex(string $name, string $value): string
+    {
+        return "{$name}\s*+=\s*+(?!\"{$value}\"|'{$value}'|(?<=[=])(?!['\"]){$value}[\s/> ])";
+    }
+
+    private function buildEqualsRegex(string $name, string $value): string
+    {
+        return "{$name}\s*+=\s*+(?:\"{$value}\"|'{$value}'|(?<=[=])(?!['\"]){$value}[\s/> ])";
+    }
+
+    private function buildContainsWordRegex(string $name, string $value): string
+    {
+        return "{$name}\s*+=\s*+(?:\"[^\"]*?(?<=[\" ]){$value}[\" ]"
+            . "|"
+            . "'[^']*?(?<=[' ]){$value}[ ']"
+            . "|"
+            . "(?<==)(?!['\"]){$value}[ />])";
+    }
+
+    private function buildContainsSubstringRegex(string $name, string $value): string
+    {
+        return "{$name}\s*+=\s*+(?:\"[^\"]*?{$value}|'[^']*?{$value}|(?<==)(?!['\"])[^\s]*?{$value})";
     }
 
@@ -299 +327 @@
             foreach ($names as $name) {
                 $matches[] = self::htmlNestedElementToken($name);
-
-                return implode('|', $matches);
-            }
-        }
-
-        $namesRegex = '(?:' . implode('|', $names) . ')';
-
-        return $elementObject->voidElementOrStartTagOnly ?
-            '(?:' . self::htmlVoidElementToken($namesRegex) . '|' . self::htmlStartTagToken($namesRegex) . ')' :
-            self::htmlElementsToken($names);
+            }
+
+            return implode('|', $matches);
+        }
+
+        return self::htmlElementMatchForBuilder(
+            $names,
+            $elementObject->voidElementOrStartTagOnly ?? false
+        );
+    }
+
+    // in Parser
+    private static function htmlElementMatchForBuilder(array $names, bool $voidOrStartTagOnly): string
+    {
+        $nameRegex = '(?:' . implode('|', $names) . ')';
+        $attrsToken = self::htmlAttributesListToken();
+        $endTagRegex = self::htmlEndTagToken($nameRegex);
+        $contentRegex = self::htmlTextContentToken($nameRegex);
+
+        if ($voidOrStartTagOnly) {
+            // e.g. <link ...>, <meta ...>, <img ...>
+            return "<(?<name>{$nameRegex})\b(?:\s++(?<attributes>{$attrsToken}+))?/?>";
+        }
+
+        // Non-void element: capture inner content
+        $startTag = "<(?<name>{$nameRegex})\b(?:\s++(?<attributes>{$attrsToken}+))?>";
+        $content = "(?<content>{$contentRegex})";
+        $endTag = "(?<endTag>{$endTagRegex})";
+
+        return $startTag . $content . $endTag;
     }
 

jch-optimize/trunk/lib/src/Optimize.php

@@ -31 +31 @@
 use function ini_get;
 use function ini_set;
-use function preg_replace;
 use function version_compare;
 
@@ -45 +44 @@
     use ContainerAwareTrait;
 
-    private string $jit = '1';
+    private string $jit;
 
     /**
@@ -59 +58 @@
         private UtilityInterface $utility
     ) {
+        $this->jit = ini_get('pcre.jit');
+
+        self::setPcreLimits();
+
+        if (version_compare(PHP_VERSION, '8.0', '<')) {
+            throw new Exception\RuntimeException('PHP Version less than 8.0, Exiting plugin...');
+        }
+    }
+
+    public static function setPcreLimits(): void
+    {
         ini_set('pcre.backtrack_limit', '1000000');
         ini_set('pcre.recursion_limit', '1000000');
-
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            $this->jit = ini_get('pcre.jit');
-            ini_set('pcre.jit', '0');
-        }
-
-        if (version_compare(PHP_VERSION, '7.3', '<')) {
-            throw new Exception\RuntimeException('PHP Version less than 7.3, Exiting plugin...');
-        }
-
-        $pcre_version = preg_replace('#(^\d++\.\d++).++$#', '$1', PCRE_VERSION);
-
-        if (version_compare($pcre_version, '7.2', '<')) {
-            throw new Exception\RuntimeException('PCRE Version less than 7.2. Exiting plugin...');
-        }
+        ini_set('pcre.jit', '0');
     }
 
@@ -107 +103 @@
         }
 
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            ini_set('pcre.jit', (string)$this->jit);
-        }
+        ini_set('pcre.jit', (string)$this->jit);
 
         return $optimizedHtml;
@@ -118 +112 @@
      * Inline CSS and JS will also be minified if respective parameters are set
      *
-     * @param string $html
+     * @param   string  $html
      *
      * @return string                       Optimized HTML

jch-optimize/trunk/lib/src/PageCache/PageCache.php

@@ -399 +399 @@
 
         if ($this->input->server->get('REQUEST_METHOD') == 'POST') {
-            if ($this->params->get('page_cache_exclude_form_users', '1')) {
+            if ($this->params->get('page_cache_exclude_form_users', '1') && !empty($_POST)) {
                 $this->hooks->onUserPostForm();
 

jch-optimize/trunk/lib/src/Preloads/Http2Preload.php

@@ -314 +314 @@
             case 'font':
                 if ($this->fontPreloads->count() < 2) {
-                    $this->fontPreloads->attach($preload);
+                    $this->fontPreloads->offsetSet($preload);
                 }
                 break;
             case 'image':
                 if ($this->imagePreloads->count() < 4 || $preload->getFetchPriority() == 'high') {
-                    $this->imagePreloads->attach($preload);
+                    $this->imagePreloads->offsetSet($preload);
                 }
                 break;
             case 'style':
-                $this->stylePreloads->attach($preload);
+                $this->stylePreloads->offsetSet($preload);
                 break;
             case 'script':
-                $this->scriptPreloads->attach($preload);
+                $this->scriptPreloads->offsetSet($preload);
                 break;
             default:
-                $this->otherPreloads->attach($preload);
+                $this->otherPreloads->offsetSet($preload);
                 break;
         }

jch-optimize/trunk/lib/src/Preloads/Preconnector.php

@@ -75 +75 @@
         //If google fonts were optimized then add the fonts domain to preconnects if necessary
         if ($this->googleFontsOptimized) {
-            $this->preconnects->attach(
+            $this->preconnects->offsetSet(
                 new Preconnect(Utils::uriFor('https://fonts.gstatic.com'), 'anonymous')
             );
@@ -137 +137 @@
                 }
 
-                $this->preconnects->attach(new Preconnect($uri, $crossorigin));
+                $this->preconnects->offsetSet(new Preconnect($uri, $crossorigin));
             }
         }
@@ -148 +148 @@
 
             if (Uri::isAbsolute($uri) || Uri::isNetworkPathReference($uri)) {
-                $this->prefetches->attach(new DnsPrefetch($uri));
+                $this->prefetches->offsetSet(new DnsPrefetch($uri));
             }
         }
@@ -182 +182 @@
                     $linkObj = HtmlElementBuilder::load($preconnect);
 
-                    $this->preconnects->attach(
+                    $this->preconnects->offsetSet(
                         new Preconnect(
                             $linkObj->getHref(),

jch-optimize/trunk/lib/src/Preloads/PreloadsCollection.php

@@ -33 +33 @@
      * @psalm-suppress ParamNameMismatch
      */
-    public function attach(object $object, mixed $info = null): void
+    public function offsetSet(mixed $object, mixed $info = null): void
     {
         $this->rewind();
@@ -53 +53 @@
                 ) {
                     if ($newExt == 'woff2') {
-                        $this->detach($preload);
+                        $this->offsetUnset($preload);
                         break;
                     }
@@ -65 +65 @@
 
                     if ($newExt == 'woff' && $existingExt == 'ttf') {
-                        $this->detach($preload);
+                        $this->offsetUnset($preload);
                         break;
                     }
@@ -79 +79 @@
         }
 
-        parent::attach($object, $info);
+        parent::offsetSet($object, $info);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function attach(object $object, mixed $info = null): void
+    {
+        $this->offsetSet($object, $info);
+    }
+
+    public function current(): Preload
+    {
+        return parent::current();
     }
 }

jch-optimize/trunk/readme.txt

@@ -3 +3 @@
 Contributors: codealfa
 Tags: performance, pagespeed, cache, optimize, seo
-Tested up to: 6.8.3
-Stable tag: 5.1.0
+Tested up to: 6.9
+Stable tag: 5.1.1
 License: GPLv3 or later
-Requires at least: 5.0
+Requires at least: 6.5.0
 Requires PHP: 8.0
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -80 +80 @@
 
 == Changelog ==
+
+= 5.1.1 =
+* Add icons to Admin menu
+* Remove unused lazy load settings
+* Update WordPress required version to 6.5.0
+* Added additional LCP settings
+* [HIGH] Fix error on Optimize Image tab
+* [MEDIUM] Fix bug with handling invalid image URLs
+* Improve Optimize CSS Delivery
+* [MEDIUM] Files with integrity attribute were broken
+* [LOW] Fix PHP 8.5 deprecations
+
 = 5.1.0 =
 * Added support for AVIF images

jch-optimize/trunk/src/Html/Renderer/Setting.php

@@ -177 +177 @@
         $options = [
             '0'          => __('Disabled', 'jch-optimize'),
+            '1'          => __('On save only', 'jch-optimize'),
             'hourly'     => __('Hourly', 'jch-optimize'),
             'twicedaily' => __('Twice Daily', 'jch-optimize'),
@@ -182 +183 @@
         ];
 
-        Helper::_('select.pro', __FUNCTION__, 0, $options);
+        Helper::_('select.pro', __FUNCTION__, '1', $options);
     }
 
@@ -580 +581 @@
     {
         Helper::_('switch', __FUNCTION__, '0');
-    }
-
-    public static function lazyload_autosize(): void
-    {
-        Helper::_('switch', __FUNCTION__, '1');
-    }
-
-    public static function pro_lazyload_effects(): void
-    {
-        Helper::_('switch.pro', __FUNCTION__, '0');
     }
 
@@ -699 +690 @@
 
     public static function pro_lcp_images(): void
+    {
+        Helper::_('multiselect.pro', __FUNCTION__, [], 'lazyload', 'file');
+    }
+
+    public static function pro_lcp_identifiers(): void
+    {
+        Helper::_('multiselect.pro', __FUNCTION__, [], 'lazyload', 'file');
+    }
+
+    public static function lcp_images_mobile(): void
+    {
+        Helper::_('multiselect.pro', __FUNCTION__, [], 'lazyload', 'file');
+    }
+
+    public static function lcp_images_desktop(): void
     {
         Helper::_('multiselect.pro', __FUNCTION__, [], 'lazyload', 'file');

jch-optimize/trunk/src/Html/TabSettings.php

@@ -678 +678 @@
                     __('Enable', 'jch-optimize'),
                 ],
-                'lazyload_autosize'          => [
-                    __('Autosize images', 'jch-optimize'),
-                    __(
-                        'This setting attempts to maintain aspect ratio of images being lazy-loaded to prevent blank spaces under the images after they\'re loaded or distortions in rendering.'
-                    )
-                ],
-                'pro_lazyload_effects'       => [
-                    __('Enable effects', 'jch-optimize'),
-                    __('Enable to use fade-in effects when images are scrolled into view.', 'jch-optimize')
-                ],
                 'pro_lazyload_iframe'        => [
                     __('Lazy load iframes', 'jch-optimize'),
@@ -804 +794 @@
                     __('LCP images', 'jch-optimize'),
                     __(
-                        'Add your LCP images here to have them preloaded with a high priority on whichever page they appear.'
-                    )
+                        'Add your LCP images here to have them preloaded with a high priority on whichever page they appear.',
+                        'jch-optimize'
+                    )
+                ],
+                'pro_lcp_identifiers' => [
+                    __('LCP id/class', 'jch-optimize'),
+                    __(
+                        'Add the id or class of your LCP images here. Ensure the class is only shared by other LCP images, you only need one per page.',
+                        'jch-optimize'
+                    )
+                ],
+                'lcp_images_mobile' => [
+                    __('Mobile only', 'jch-optimize'),
+                    __('Add images here that will only be preloaded on mobile.', 'jch-optimize')
+                ],
+                'lcp_images_desktop' => [
+                    __('Desktop only', 'jch-optimize'),
+                    __('Add images here that will only be preloaded on desktop.', 'jch-optimize')
                 ]
             ],

jch-optimize/trunk/src/Plugin/Installer.php

@@ -103 +103 @@
 /**
  * Plugin Name: JCH Optimize Mode Switcher
- * Plugin URI: http://www.jch-optimize.net/
+ * Plugin URI: https://www.jch-optimize.net/
  * Description: Boost your WordPress site's performance with JCH Optimize as measured on PageSpeed
  * Version: {VERSION}
@@ -266 +266 @@
 
         if (
-            file_exists($installedMU) && md5_file(
-                                             JCH_PLUGIN_DIR . 'mu-plugins/jch-optimize-mode-switcher.php'
-                                         ) !== md5_file($installedMU)
+            file_exists($installedMU)
+            && md5_file(
+                JCH_PLUGIN_DIR . 'mu-plugins/jch-optimize-mode-switcher.php'
+            ) !== md5_file($installedMU)
         ) {
             $this->installMUPlugin();

jch-optimize/trunk/src/Plugin/Loader.php

@@ -164 +164 @@
 
             $reCacheModel = $this->getContainer()->get(ReCache::class);
-            /** @see ReCache::reCache() */
-            add_action(ReCache::RECACHE_CRON_HOOK, [$reCacheModel, 'reCache']);
-            /** @see ReCache::reSchedule() */
-            add_action('update_option_jch-optimize_settings', [$reCacheModel, 'reSchedule']);
+            if ($this->params->get('recache_frequency') != '0') {
+                /** @see ReCache::reCache() */
+                add_action(ReCache::RECACHE_CRON_HOOK, [$reCacheModel, 'reCache']);
+                /** @see ReCache::reSchedule() */
+                add_action('update_option_jch-optimize_settings', [$reCacheModel, 'reSchedule']);
+            }
         }
     }

jch-optimize/trunk/src/View/OptimizeImageHtml.php

@@ -55 +55 @@
         wp_add_inline_script('jch-platform-wordpress', $js, 'before');
 
-        wp_register_script('jch-uuid', JCH_PLUGIN_URL . 'media/uuid/uuidv4.js');
-        wp_enqueue_script('jch-uuid');
-
         if (JCH_PRO) {
-            wp_register_script_module('jch-optimize-image', JCH_PLUGIN_URL . 'media/core/js/optimize-image.js', [
-                'jquery',
-                'jch-admin-utility',
-                'jch-platform-wordpress',
-                'jch-bootstrap',
-                'jch-uuid'
-            ], JCH_VERSION, true);
-
+            wp_register_script_module(
+                'jch-optimize-image',
+                JCH_PLUGIN_URL . 'media/core/js/optimize-image.js',
+                [],
+                JCH_VERSION
+            );
             wp_enqueue_script_module('jch-optimize-image');
         }
 
         wp_enqueue_style('jch-file-tree');
-
         wp_enqueue_script('jch-file-tree');
 
         $params = json_encode([
-                'auth' => [
-                    'dlid' => $this->params->get('pro_downloadid', ''),
-                    'secret' => '11e603aa',
-                ],
-                'resize_mode' => $this->params->get('pro_api_resize_mode', '1') ? 'auto' : 'manual',
-                'webp' => (bool)$this->params->get('pro_next_gen_images', '1'),
-                'avif' => (bool)$this->params->get('gen_avif_images', '1'),
-                'lossy' => (bool)$this->params->get('lossy', '1'),
-                'save_metadata' => (bool)$this->params->get('save_metadata', '0'),
-                'quality' => $this->params->get('quality', '85'),
-                'cropgravity' => $this->params->get('cropgravity', []),
-                'responsive' => (bool)$this->params->get('pro_gen_responsive_images', '1')
-            ]);
+            'auth'          => [
+                'dlid' => $this->params->get('pro_downloadid', ''),
+                'secret' => '11e603aa',
+            ],
+            'resize_mode'   => $this->params->get('pro_api_resize_mode', '1') ? 'auto' : 'manual',
+            'webp'          => (bool)$this->params->get('pro_next_gen_images', '1'),
+            'avif'          => (bool)$this->params->get('gen_avif_images', '1'),
+            'lossy'         => (bool)$this->params->get('lossy', '1'),
+            'save_metadata' => (bool)$this->params->get('save_metadata', '0'),
+            'quality'       => $this->params->get('quality', '85'),
+            'cropgravity'   => $this->params->get('cropgravity', []),
+            'responsive'    => (bool)$this->params->get('pro_gen_responsive_images', '1')
+        ]);
 
 
@@ -93 +87 @@
         $noProID = __('Please enter your Download ID on the Configurations tab.', 'jch-optimize');
 
-        $script =  <<<JS
+        $script = <<<JS
 window.jchOptimizeImageData ={
     message : '{$message}',
@@ -101 +95 @@
 JS;
         wp_add_inline_script('jch-platform-wordpress', $script, 'before');
-
     }
 }

jch-optimize/trunk/tmpl/pagecache_filters.php

@@ -26 +26 @@
         </button>
         <button id="recache-button" type="submit" name="action" value="recache" class="btn btn-outline-dark ms-1"
-            <?php if (!JCH_PRO): ?>
+            <?php if (!JCH_PRO) : ?>
                 disabled
             <?php endif; ?>
         >
             <span class="fa fa-refresh"></span> Recache
-            <?php if (!JCH_PRO): ?>
-                <span style="font-size: 0.6em; display: inline; padding-left: 5px;"><span class="fa fa-lock"></span> Pro</span>
+            <?php if (!JCH_PRO) : ?>
+                <span style="font-size: 0.6em; display: inline; padding-left: 5px;">
+                    <span class="fa fa-lock"></span>
+                    Pro
+                </span>
             <?php endif; ?>
         </button>
@@ -48 +51 @@
             <i>Storage: <span class="badge bg-primary"><?= $adapter ?></span> </i>
             <i class="ms-2">Http Request:
-                <?php if ($httpRequest == 'yes'): ?>
+                <?php if ($httpRequest == 'yes') : ?>
                     <span class="badge bg-success">On</span>
-                <?php else: ?>
+                <?php else : ?>
                     <span class="badge bg-danger">Off</span>
                 <?php endif; ?>
@@ -77 +80 @@
     <?= $filterAdapterSelectHtml ?>
     <?php if (JCH_PRO) : ?>
-    <?= $filterHttpRequestSelectHtml ?>
+        <?= $filterHttpRequestSelectHtml ?>
     <?php endif; ?>
     <button id="clear-search" type="submit" class="btn btn-secondary ms-2">Clear Filters</button>
     <script>
         document.getElementById('clear-search').addEventListener('click', function (event) {
-            document.getElementById('filter_search').value = '';
-            document.getElementById('filter_time-1').value = '';
-            document.getElementById('filter_time-2').value = '';
-            document.getElementById('filter_device').value = '';
-            document.getElementById('filter_adapter').value = '';
-            document.getElementById('filter_http-request').value = '';
-            document.getElementById('list_limit').value = '';
-            document.getElementById('list_fullordering').value = '';
+            document.getElementById('filter_search').value = ''
+            document.getElementById('filter_time-1').value = ''
+            document.getElementById('filter_time-2').value = ''
+            document.getElementById('filter_device').value = ''
+            document.getElementById('filter_adapter').value = ''
+            document.getElementById('filter_http-request').value = ''
+            document.getElementById('list_limit').value = ''
+            document.getElementById('list_fullordering').value = ''
         })
     </script>

jch-optimize/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '4541b13d2299de32ec35f80a1b6ae3a4f2ed960a',
+        'reference' => '781c9a7e436505de7b07b7f0532d685389ad31db',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '4541b13d2299de32ec35f80a1b6ae3a4f2ed960a',
+            'reference' => '781c9a7e436505de7b07b7f0532d685389ad31db',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',

jch-optimize/trunk/version.php

@@ -15 +15 @@
 defined('_JCH_EXEC') or die;
 
-const JCH_VERSION  = '5.1.0';
-const JCH_DATE     = '2025-11-25';
+const JCH_VERSION  = '5.1.1';
+const JCH_DATE     = '2025-12-06';
 const JCH_PRO      = '0';
 const JCH_DEVELOP  = '0';