stx-router 0.2.411 → 0.2.412

package/dist/client.js

@@ -456,7 +456,7 @@ function routerSource() {
   //     whole fix \u2014 the click then goes to the network, where navigate does
   //     the reload properly.
   function readPrefetchResponse(r,wantsFragment){
-    if(r.redirected)return Promise.resolve(null);
+    if(r.redirected||r.headers.get('X-STX-Location'))return Promise.resolve(null);
     if(isBuildSkew(r.headers.get('X-STX-Build')||''))return Promise.resolve(null);
     var isFrag=wantsFragment&&r.headers.get('X-STX-Fragment')==='true';
     var layout=r.headers.get('X-STX-Layout')||'';
@@ -985,6 +985,18 @@ function routerSource() {
   // swap() through pendingCtx, the same way pendingContainerAttrs is.
   var navCtxNext=null;
   var pendingCtx=null;
+  // The page belongs to another origin: the server says so with
+  // X-STX-Location (it cannot redirect a router fetch there, because a
+  // cross-origin redirect of a request carrying X-STX-Router fails CORS), or
+  // a plain fetch was redirected off-origin. Either way the browser goes
+  // there itself; a fragment from another origin is never swapped in.
+  function leaveOrigin(r){
+    var away=r.headers.get('X-STX-Location');
+    if(!away&&r.redirected&&r.url&&new URL(r.url,location.href).origin!==location.origin)away=r.url;
+    if(!away)return false;
+    location.href=away;
+    return true;
+  }
   function routerFetch(url,headers){
     var init={headers:headers};
     if(navAbort)init.signal=navAbort.signal;
@@ -1076,10 +1088,11 @@ function routerSource() {
         // Layout changed \u2014 fetch full page and do full document swap
         log('[router] cache hit but layout changed \u2014 fetching full page');
         return routerFetch(url,{'Accept':'text/html'}).then(function(r){
+          if(leaveOrigin(r))return null;
           if(!r.ok)throw httpError(r.status);
           return r.text();
         }).then(function(html){
-          if(stale())return false;
+          if(html===null||stale())return false;
           log('[router] full page fetched from cache path, len:',html.length);
           pendingLayoutDecl={layout:layoutCache[targetPath]||'',group:layoutGroupCache[targetPath]||''};
           return swapWith(html,targetPath);
@@ -1104,6 +1117,7 @@ else {
       var wantsFragment=shouldUseFragmentResponse();
       return routerFetch(url,wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}).then(function(r){
         if(stale())return null;
+        if(leaveOrigin(r))return null;
         if(!r.ok)throw httpError(r.status);
         // A route guard answered with a redirect and fetch followed it
         // transparently, so r.ok is the DESTINATION's 200 and this markup
@@ -1137,6 +1151,7 @@ else {
           log('[router] layout change \u2014 fetching full page for document swap');
           return routerFetch(url,{'Accept':'text/html'}).then(function(fullRes){
             log('[router] full page fetched:',fullRes.status,'ok:',fullRes.ok);
+            if(leaveOrigin(fullRes))return null;
             if(!fullRes.ok)throw httpError(fullRes.status);
             return fullRes.text().then(function(html){
               log('[router] full page html length:',html.length);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stx-router",
   "type": "module",
-  "version": "0.2.411",
+  "version": "0.2.412",
   "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",