work

Author: fballiano

app/code/core/Maho/SpeculationRules/Helper/Data.php

@@ -32,7 +32,7 @@ public function isEnabled(int|string|null $store = null): bool
     /**
      * Get speculation rules configuration
      *
-     * @return array<string, array<int, array{where: array{selector_matches: string}, eagerness: string}>>
+     * @return array<string, array<int, array{where: array{selector_matches: string|string[]}, eagerness: string}>>
      */
     public function getSpeculationRules(int|string|null $store = null): array
     {
@@ -56,6 +56,9 @@ public function getSpeculationRules(int|string|null $store = null): array
             ['eagerness' => 'conservative', 'mode' => 'prerender', 'path' => self::XML_PATH_CONSERVATIVE_PRERENDER_SELECTORS],
         ];
 
+        // Group selectors by mode and eagerness
+        $groupedSelectors = [];
+
         foreach ($configurations as $config) {
             $selectorsConfig = (string) Mage::getStoreConfig($config['path'], $store);
 
@@ -71,16 +74,40 @@ public function getSpeculationRules(int|string|null $store = null): array
                 continue;
             }
 
-            // Create rule for each selector
-            foreach ($selectors as $selector) {
-                if (!empty($selector)) {
-                    $rules[$config['mode']][] = [
-                        'where' => [
-                            'selector_matches' => $selector,
-                        ],
-                        'eagerness' => $config['eagerness'],
-                    ];
-                }
+            // Group selectors by mode and eagerness
+            $key = $config['mode'] . '_' . $config['eagerness'];
+            if (!isset($groupedSelectors[$key])) {
+                $groupedSelectors[$key] = [
+                    'mode' => $config['mode'],
+                    'eagerness' => $config['eagerness'],
+                    'selectors' => [],
+                ];
+            }
+
+            $groupedSelectors[$key]['selectors'] = array_merge(
+                $groupedSelectors[$key]['selectors'],
+                $selectors
+            );
+        }
+
+        // Create rules from grouped selectors
+        foreach ($groupedSelectors as $group) {
+            if (count($group['selectors']) === 1) {
+                // Single selector
+                $rules[$group['mode']][] = [
+                    'where' => [
+                        'selector_matches' => $group['selectors'][0],
+                    ],
+                    'eagerness' => $group['eagerness'],
+                ];
+            } else {
+                // Multiple selectors - use array
+                $rules[$group['mode']][] = [
+                    'where' => [
+                        'selector_matches' => $group['selectors'],
+                    ],
+                    'eagerness' => $group['eagerness'],
+                ];
             }
         }
 

app/code/core/Maho/SpeculationRules/etc/config.xml

@@ -44,12 +44,12 @@
         <dev>
             <speculation_rules>
                 <enabled>0</enabled>
-                <eager_prefetch_selectors></eager_prefetch_selectors>
-                <eager_prerender_selectors></eager_prerender_selectors>
-                <moderate_prefetch_selectors></moderate_prefetch_selectors>
-                <moderate_prerender_selectors></moderate_prerender_selectors>
-                <conservative_prefetch_selectors></conservative_prefetch_selectors>
-                <conservative_prerender_selectors></conservative_prerender_selectors>
+                <moderate_prefetch_selectors>a.logo
+.nav-primary a
+.product-name a
+.product-image a
+.toolbar .pager a
+.footer a</moderate_prefetch_selectors>
             </speculation_rules>
         </dev>
     </default>