From f61483d19be4bba958514959de5b82f4fa445e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= Date: Sun, 19 Jul 2026 05:37:23 +0200 Subject: [PATCH] fix(sw): repair the service-worker version fallback after the release merge The changelog merge left conflict markers inside the CACHE_VERSION assignment. The version generator only rewrites the version string, so it could not repair the broken structure, and every service-worker test failed while both branches were green on their own. --- public/sw.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/sw.js b/public/sw.js index a034b4c9a..9536f54db 100644 --- a/public/sw.js +++ b/public/sw.js @@ -36,11 +36,7 @@ try { // v1.4.38.4 → v1.4.42. Do not hand-edit; bump `package.json` and rebuild. const CACHE_VERSION = (typeof self !== "undefined" && self.__APP_VERSION__) || -<<<<<<< HEAD /* @sw-version-fallback */ "v1.30.28"; -======= - /* @sw-version-fallback */ "v1.30.27"; ->>>>>>> main const STATIC_CACHE = `healthlog-static-${CACHE_VERSION}`; const PAGE_CACHE = `healthlog-pages-${CACHE_VERSION}`; // v1.18.6 — read-only data cache for a curated allowlist of safe GET `/api/*`