@rebask/core 0.1.3 → 0.1.5

package/dist/lib/prefetch-utils.d.ts

@@ -3,6 +3,9 @@ type PrefetchStrategy = PrefetchToken | {
     desktop?: PrefetchToken;
     mobile?: PrefetchToken;
 };
+/** Remember a URL whose route tree request returned something other than a page. */
+export declare function markDocumentUrl(url: string): void;
+export declare function isDocumentUrl(url: string): boolean;
 export interface PrefetchProps {
     /**
      * Controls how early the full segment is prefetched.

package/dist/lib/prefetch-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefetch-utils.d.ts","sourceRoot":"","sources":["../../src/lib/prefetch-utils.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEnD,KAAK,gBAAgB,GAAG,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAC;IAAC,MAAM,CAAC,EAAE,aAAa,CAAA;CAAE,CAAA;AAe3F,MAAM,WAAW,aAAa;IAC7B;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,gBAAgB,CAAA;CAC3B;AAMD,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,GAAG,aAAa,CAc9E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,iBAAiB,WAUrD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,iBAAiB,WAGpD;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,iCAsBjE"}
+{"version":3,"file":"prefetch-utils.d.ts","sourceRoot":"","sources":["../../src/lib/prefetch-utils.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEnD,KAAK,gBAAgB,GAAG,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAC;IAAC,MAAM,CAAC,EAAE,aAAa,CAAA;CAAE,CAAA;AAS3F,oFAAoF;AACpF,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,QAE1C;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,WAExC;AAgBD,MAAM,WAAW,aAAa;IAC7B;;;;;;;;;;;;;;;OAeG;IACH,QAAQ,CAAC,EAAE,gBAAgB,CAAA;CAC3B;AAMD,wBAAgB,mBAAmB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,GAAG,aAAa,CAc9E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,iBAAiB,WAUrD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,iBAAiB,WAGpD;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,UAAU,iCAsBjE"}

package/dist/lib/prefetch-utils.js

@@ -1,8 +1,21 @@
+const documentUrls = new Set();
+function documentKey(url) {
+    const target = new URL(url, location.href);
+    return target.origin + target.pathname + target.search;
+}
+/** Remember a URL whose route tree request returned something other than a page. */
+export function markDocumentUrl(url) {
+    documentUrls.add(documentKey(url));
+}
+export function isDocumentUrl(url) {
+    return documentUrls.has(documentKey(url));
+}
 function isClientNavigable(link) {
     if (!link.href ||
         (link.target && link.target !== "_self") ||
         link.origin !== location.origin ||
-        link.hasAttribute("download")) {
+        link.hasAttribute("download") ||
+        isDocumentUrl(link.href)) {
         return false;
     }
     return true;

package/dist/router.d.ts

@@ -28,16 +28,12 @@ type CacheInvalidation = {
     tags: string[];
     paths: string[];
 };
-/**
- * Router class for programmatic navigation and RSC data management.
- */
+/** Router class for programmatic navigation and RSC data management. */
 declare class Router {
     private cache;
     private segment;
     constructor(cache: RouterCache, segment?: Segment | null);
-    /**
-     * Navigate to a URL using pushState.
-     */
+    /** Navigate to a URL using pushState. */
     push: (url: string | URL, options?: NavigateOptions) => void;
     /**
      * Set client-side cache hints for the segment provided by the nearest

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}

package/dist/router.js

@@ -12,6 +12,7 @@ import { reloadForDeploymentMismatch } from "./lib/deployment-reload.js";
 import { DocumentNavigation, HandledDeploymentMismatch, DeploymentMismatchError, } from "./lib/errors.js";
 import { extractSegmentHints } from "./lib/extract-segment-hints.js";
 import { REBASK_SHELL_HEADER, REBASK_TAIL_HEADER, REBASK_TRAILER_HEADER, REBASK_TREE_HEADER, } from "./lib/ppr/headers.js";
+import { isDocumentUrl, markDocumentUrl } from "./lib/prefetch-utils.js";
 import { getRouteTreeUrl, } from "./lib/route-prediction.js";
 import { segmentEntryKey } from "./lib/router-cache.js";
 import { captureNavigationIntent, isCurrentNavigation, setNextNavigationScroll, } from "./lib/scroll.js";
@@ -179,9 +180,7 @@ function splitUsedSearch(response) {
         used: promise,
     };
 }
-/**
- * Router class for programmatic navigation and RSC data management.
- */
+/** Router class for programmatic navigation and RSC data management. */
 class Router {
     cache;
     segment;
@@ -189,12 +188,15 @@ class Router {
         this.cache = cache;
         this.segment = segment;
     }
-    /**
-     * Navigate to a URL using pushState.
-     */
+    /** Navigate to a URL using pushState. */
     push = (url, options) => {
+        const target = getUrl(url);
+        if (isDocumentUrl(target.href)) {
+            window.location.assign(target.href);
+            return;
+        }
         setNextNavigationScroll(options?.scroll !== false);
-        window.history.pushState({}, "", getUrl(url).href);
+        window.history.pushState({}, "", target.href);
     };
     /**
      * Set client-side cache hints for the segment provided by the nearest
@@ -217,8 +219,13 @@ class Router {
      * Navigate to a URL using replaceState.
      */
     replace = (url, options) => {
+        const target = getUrl(url);
+        if (isDocumentUrl(target.href)) {
+            window.location.replace(target.href);
+            return;
+        }
         setNextNavigationScroll(options?.scroll !== false);
-        window.history.replaceState({}, "", getUrl(url).href);
+        window.history.replaceState({}, "", target.href);
     };
     /**
      * Fetch the route tree for a URL.
@@ -246,6 +253,7 @@ class Router {
             if (response.headers.get(REBASK_TREE_HEADER) !== "1") {
                 if (response.body)
                     await response.body.cancel();
+                markDocumentUrl(url);
                 throw new DocumentNavigation();
             }
             this.cache.handleDeploymentMismatch(response, url, "tree");
@@ -561,6 +569,8 @@ class Router {
      *   Set to `false` to bypass dedup and force a fresh request.
      */
     prefetchRouteTree = async (url, cache = true, dedupe = true) => {
+        if (isDocumentUrl(url))
+            throw new DocumentNavigation();
         const isCurrent = this.cache.captureRouteTransaction();
         if (cache) {
             // Check if already fully cached

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebask/core",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Vite plugin and runtime for React Server Components",
   "homepage": "https://github.com/lfades/vext#readme",
   "license": "MIT",