Fix tracking of eager-loaded block elements

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Blitz
 
+## 4.11.1 - 2024-02-12
+
+### Fixed
+
+- Fixed the tracking of non-cacheable block elements when eager-loaded.
+
 ## 4.11.0 - 2024-02-12
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "putyourlightson/craft-blitz",
   "description": "Intelligent static page caching for creating lightning-fast sites.",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "type": "craft-plugin",
   "homepage": "https://putyourlightson.com/plugins/blitz",
   "license": "proprietary",

src/Blitz.php

@@ -109,7 +109,7 @@ public static function config(): array
     /**
      * @inheritdoc
      */
-    public string $schemaVersion = '4.10.1';
+    public string $schemaVersion = '4.11.1';
 
     /**
      * @inheritdoc

src/migrations/m240212_120000_clear_out_legacy_cached_element_types.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace putyourlightson\blitz\migrations;
+
+use craft\db\Migration;
+
+class m240212_120000_clear_out_legacy_cached_element_types extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        $migration = new m240110_120000_clear_out_legacy_cached_element_types();
+        $migration->safeUp();
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo self::class . " cannot be reverted.\n";
+
+        return true;
+    }
+}

src/services/GenerateCacheService.php

@@ -152,9 +152,12 @@ function(EagerLoadElementsEvent $event) {
                     /** @var ElementInterface|string $elementType */
                     $elementType = $event->elementType;
                     $map = $elementType::eagerLoadingMap($event->elements, $plan->handle);
-                    if (!empty($map['map'])) {
-                        foreach ($map['map'] as $mapping) {
-                            $this->generateData->addElementId($mapping['target']);
+
+                    if (is_array($map)) {
+                        if ($this->_shouldTrackElementsOfType($map['elementType'])) {
+                            foreach ($map['map'] as $mapping) {
+                                $this->generateData->addElementId($mapping['target']);
+                            }
                         }
                     }
                 }