@geogirafe/lib-geoportal 1.3.0-dev.2966299016 → 1.3.0-dev.2970850799

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.3.0-dev.2966299016",
+  "version": "1.3.0-dev.2970850799",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.3.0-dev.2966299016", "build":"2966299016", "date":"20/10/2026"}
+{"version":"1.3.0-dev.2970850799", "build":"2970850799", "date":"21/10/2026"}

package/tools/app/geogirafeapp.js

@@ -230,17 +230,6 @@ export default class GeoGirafeApp {
             console.warn(`The current page is outside of the service worker scope (${registration.scope}), it won't be controlled by the service worker.`);
             return this.waitForServiceWorkerActivation(registration);
         }
-        // The page is not currently controlled by a service worker.
-        // This can happen, for example, after a force refresh (Ctrl+F5), even though
-        // an active service worker already exists. In that case, the service worker's
-        // `activate` event is not triggered again, so the `clients.claim()` call from
-        // the activation phase cannot take control of this newly loaded page.
-        // If an active service worker already exists, explicitly ask it to claim the
-        // current page. The service worker handles this message by calling `clients.claim()`.
-        const active = registration.active;
-        if (active) {
-            active.postMessage({ type: 'claim' });
-        }
         // Wait until the service worker takes control of the current page.
         // Once `clients.claim()` succeeds, the browser updates `sw.controller` and
         // dispatches the `controllerchange` event.
@@ -251,6 +240,23 @@ export default class GeoGirafeApp {
                     resolve(controller);
                 }
             }, { once: true });
+            // The page is not currently controlled by a service worker.
+            // This can happen, for example, after a force refresh (Ctrl+F5), even though
+            // an active service worker already exists. In that case, the service worker's
+            // `activate` event is not triggered again, so the `clients.claim()` call from
+            // the activation phase cannot take control of this newly loaded page.
+            // If an active service worker already exists, explicitly ask it to claim the
+            // current page. The service worker handles this message by calling `clients.claim()`.
+            const active = registration.active;
+            if (active) {
+                active.postMessage({ type: 'claim' });
+            }
+            // Safety check: This is exactly the same test as the begining of the method
+            // but the worker may have claimed the page before the listener
+            // above was registered, in which case `controllerchange` never fires.
+            if (sw.controller) {
+                resolve(sw.controller);
+            }
         });
     }
     async registerServiceWorker() {