From 8e474bf7fae66b5da6824b631cb1884a442638f7 Mon Sep 17 00:00:00 2001
From: indykoning <15870933+indykoning@users.noreply.github.com>
Date: Wed, 2 Apr 2025 17:07:45 +0200
Subject: [PATCH 1/2] Update nocache map on response

This improves compatibility with frameworks like Vue where Html gets replaced once it has booted
---
 src/StaticCaching/Cachers/FileCacher.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php
index 0a0a594b81..adc666894e 100644
--- a/src/StaticCaching/Cachers/FileCacher.php
+++ b/src/StaticCaching/Cachers/FileCacher.php
@@ -224,6 +224,13 @@ public function getNocacheJs(): string
     })
     .then((response) => response.json())
     .then((data) => {
+        var els = document.getElementsByClassName('nocache');
+        var map = {};
+        for (var i = 0; i < els.length; i++) {
+            var section = els[i].getAttribute('data-nocache');
+            map[section] = els[i];
+        }
+
         const regions = data.regions;
         for (var key in regions) {
             if (map[key]) map[key].outerHTML = regions[key];

From 75284427d1904bfc6bb61fe5538948b10e1addc8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 22 Apr 2025 15:15:39 -0400
Subject: [PATCH 2/2] extract method

---
 src/StaticCaching/Cachers/FileCacher.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php
index adc666894e..78dc3531d2 100644
--- a/src/StaticCaching/Cachers/FileCacher.php
+++ b/src/StaticCaching/Cachers/FileCacher.php
@@ -207,13 +207,18 @@ public function getNocacheJs(): string
 
         $default = <<<EOT
 (function() {
-    var els = document.getElementsByClassName('nocache');
-    var map = {};
-    for (var i = 0; i < els.length; i++) {
-        var section = els[i].getAttribute('data-nocache');
-        map[section] = els[i];
+    function createMap() {
+        var map = {};
+        var els = document.getElementsByClassName('nocache');
+        for (var i = 0; i < els.length; i++) {
+            var section = els[i].getAttribute('data-nocache');
+            map[section] = els[i];
+        }
+        return map;
     }
 
+    var map = createMap();
+
     fetch('/!/nocache', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
@@ -224,12 +229,7 @@ public function getNocacheJs(): string
     })
     .then((response) => response.json())
     .then((data) => {
-        var els = document.getElementsByClassName('nocache');
-        var map = {};
-        for (var i = 0; i < els.length; i++) {
-            var section = els[i].getAttribute('data-nocache');
-            map[section] = els[i];
-        }
+        map = createMap(); // Recreate map in case the DOM changed.
 
         const regions = data.regions;
         for (var key in regions) {