stx-router 0.2.393 → 0.2.395

package/dist/client.js

@@ -87,6 +87,10 @@ function routerSource() {
   // there. sessionStorage is per tab and dies with it, same as the history.
   var SCROLL_TOKEN='__stxScroll';
   var SCROLL_STORE='stx:scroll:';
+  // On every entry the router pushes, never on the one the app opened with
+  // (which carries a scroll token too): going back from a pushed entry stays
+  // in the app, from the first it leaves it (or, in a phone app, does nothing).
+  var PUSHED_MARK='__stxPushed';
   var scrollSeq=0;
   var pendingScroll=null;
   var restoreScroll=!!o.scrollRestoration;
@@ -870,9 +874,18 @@ function routerSource() {
     // The position belongs to the entry being left, and scrollToken still
     // names it here.
     rememberScroll();
-    if(mode==='replace'){history.replaceState(tokenState(),'',href);return}
+    if(mode==='replace'){
+      // A replaced entry is still the one it replaces: pushed by the app or
+      // the one the app opened with.
+      var replaced=tokenState();
+      if(history.state&&history.state[PUSHED_MARK])replaced[PUSHED_MARK]=true;
+      history.replaceState(replaced,'',href);
+      return;
+    }
     scrollToken=newScrollToken();
-    history.pushState(tokenState(),'',href);
+    var pushed=tokenState();
+    pushed[PUSHED_MARK]=true;
+    history.pushState(pushed,'',href);
   }
   function tokenState(){var state={};state[SCROLL_TOKEN]=scrollToken;return state}
 
@@ -2179,6 +2192,22 @@ else {
     navigate(location.pathname+location.search+location.hash,false);
   });
 
+  // \u2500\u2500 Offline stand-in \u2500\u2500
+  // Without a network the offline worker answers a screen it has not kept
+  // whole with the app's first screen, marked. A screen reached inside the
+  // app was kept as a fragment, so ask for that and show it in place. Only
+  // when it is there: a failed navigate reloads, and the reload would be
+  // answered with the stand-in again.
+  var standIn=document.querySelector('meta[name="stx-offline-fallback"]');
+  if(standIn&&shouldUseFragmentResponse()){
+    standIn.remove();
+    var wanted=location.pathname+location.search;
+    fetch(wanted,{headers:{'X-STX-Router':'true','Accept':'text/html'}}).then(function(r){
+      if(r.ok&&r.headers.get('X-STX-Fragment')==='true'&&location.pathname+location.search===wanted)
+        navigate(wanted+location.hash,false,true);
+    }).catch(function(){});
+  }
+
   // \u2500\u2500 Prefetch \u2500\u2500
   // A link's page, fetched before it is followed into the cache navigate
   // reads, so following it is a swap rather than a round trip.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stx-router",
   "type": "module",
-  "version": "0.2.393",
+  "version": "0.2.395",
   "description": "File-based router for STX — .stx template discovery, nested layouts, typed route params, middleware, and client-side SPA navigation.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",