@rebask/core 0.1.5 → 0.2.1

package/dist/lib/server-router/get-router.js

@@ -5,12 +5,14 @@ import { proxyRouter } from "virtual:rebask/proxy-router";
 import { createMatcher } from "virtual:rebask/server-router";
 import { applyCookies, getSetCookieValues } from "../../cookies.js";
 import { handleImageRequest } from "../../handlers/image.js";
+import { handleMarkdownRoute, markdownNotFound } from "../../handlers/markdown.js";
 import { handleRouteHandler } from "../../handlers/route-handler.js";
 import { buildDefaultNotFoundRoute } from "../../handlers/rsc/errors.js";
 import { handlePageRoute } from "../../handlers/rsc/index.js";
 import { handleLayoutRouteRequest } from "../../handlers/segment.js";
 import { getDevServer } from "../dev-server.js";
 import { reinjectFlightHeaders, sanitizeForProxy } from "../flight-headers.js";
+import { getMarkdownPathname, prefersMarkdown } from "../markdown.js";
 import { buildProxy } from "../proxy/build-proxy.js";
 import { proxyExternal } from "../proxy/proxy-external.js";
 import { REWRITE_HEADER, rewriteHeaders } from "../proxy/rewrite.js";
@@ -20,35 +22,64 @@ import { RouteType } from "./types.js";
 function buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes) {
     const appEntries = [];
     const layoutEntries = [];
+    const markdownEntries = [];
+    const hasMarkdownRoutes = pageRoutes.some((route) => route.markdownFilePath);
     // Image optimization route
     if (imageConfig !== null && loadImageHandler !== undefined) {
-        appEntries.push({
+        const imageEntry = {
             type: RouteType.IMAGE,
             methods: ["GET"],
             pattern: imageConfig.path,
             handler: handleImageRequest,
-        });
+        };
+        appEntries.push(imageEntry);
+        if (hasMarkdownRoutes)
+            markdownEntries.push(imageEntry);
     }
     // Page routes — registered for GET and POST:
     // - GET: page loads, RSC requests, segment requests
     // - POST: server functions, form submissions, PPR resume
     for (const route of pageRoutes) {
-        appEntries.push({
-            type: RouteType.APP,
-            methods: ["GET", "POST"],
-            route,
-            handler: (req, params) => handlePageRoute(req, route, params),
-        });
+        if (route.hasPage !== false) {
+            appEntries.push({
+                type: RouteType.APP,
+                methods: ["GET", "POST"],
+                route,
+                handler: (req, params) => handlePageRoute(req, route, params),
+            });
+        }
+        if (!hasMarkdownRoutes)
+            continue;
+        if (route.markdownFilePath) {
+            markdownEntries.push({
+                type: RouteType.APP,
+                methods: ["GET", "HEAD"],
+                route,
+                handler: (req, params) => handleMarkdownRoute(req, route, params),
+            });
+        }
+        else if (route.hasPage !== false) {
+            // A specific page without Markdown still wins negotiation over a Markdown catch-all.
+            markdownEntries.push({
+                type: RouteType.APP,
+                methods: ["GET"],
+                route,
+                handler: (req, params) => handlePageRoute(req, route, params),
+            });
+        }
     }
     // Route handlers — registered for all methods so they can return 405 when the path exists but a
     // specific method is not implemented.
     for (const route of routeHandlerRoutes) {
-        appEntries.push({
+        const entry = {
             type: RouteType.APP,
             methods: [...HTTP_METHODS],
             route,
             handler: (req, params) => handleRouteHandler(req, route, params),
-        });
+        };
+        appEntries.push(entry);
+        if (hasMarkdownRoutes)
+            markdownEntries.push(entry);
     }
     // Layout routes — registered under /_rebask/1/{path}
     for (const route of layoutRoutes) {
@@ -64,14 +95,34 @@ function buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes) {
             handler: (req, params) => handleLayoutRouteRequest(req, route, params),
         });
     }
-    return { appEntries, layoutEntries };
+    return { appEntries, layoutEntries, markdownEntries };
 }
 function createRouter(pageRoutes, routeHandlerRoutes, layoutRoutes, resolvedProxyRouter = proxyRouter) {
-    const { appEntries, layoutEntries } = buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes);
+    const { appEntries, layoutEntries, markdownEntries } = buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes);
     const appMatcher = createMatcher(appEntries);
+    const markdownMatcher = markdownEntries.length > 0 ? createMatcher(markdownEntries) : null;
     const layoutMatcher = layoutEntries.length > 0 ? createMatcher(layoutEntries) : null;
     const app = async (request) => {
-        const isRscRequest = request.headers.get("accept")?.startsWith("text/x-component");
+        const method = request.method;
+        const accept = request.headers.get("accept");
+        const isRscRequest = accept?.startsWith("text/x-component");
+        const isMarkdownMethod = method === "GET" || method === "HEAD";
+        if (!isRscRequest && isMarkdownMethod && markdownMatcher) {
+            const url = new URL(request.url);
+            const markdownPathname = __REBASK_MARKDOWN_URLS ? getMarkdownPathname(url.pathname) : null;
+            if (markdownPathname !== null) {
+                url.pathname = markdownPathname;
+                const markdownHandler = markdownMatcher.find(method, url.href);
+                if (markdownHandler?.route?.type === "page" && markdownHandler.route.markdownFilePath) {
+                    return (await markdownHandler(request));
+                }
+                return markdownNotFound(request);
+            }
+            if (prefersMarkdown(accept)) {
+                const handler = markdownMatcher.find(method, request.url);
+                return handler ? handler(request) : markdownNotFound(request);
+            }
+        }
         const layoutHandler = isRscRequest
             ? layoutMatcher?.find(request.method, request.url)
             : undefined;
@@ -161,11 +212,15 @@ export async function getRouter() {
     if (router)
         return router;
     // Development: build routes from module manifest
-    const { layoutModules, pageModules, proxyModules, routeHandlerModules } = await loadAppManifest();
+    const { layoutModules, pageModules, proxyModules, routeHandlerModules, markdownHandlerModules, markdownSourceModules, } = await loadAppManifest();
     const layouts = Object.keys(layoutModules);
     const pages = Object.keys(pageModules);
-    assertNoPageRouteHandlerConflicts(pages, Object.keys(routeHandlerModules));
-    const routes = buildRoutes(layouts, pages);
+    const markdownFiles = [
+        ...Object.keys(markdownSourceModules),
+        ...Object.keys(markdownHandlerModules),
+    ];
+    assertNoPageRouteHandlerConflicts(pages, Object.keys(routeHandlerModules), markdownFiles);
+    const routes = buildRoutes(layouts, pages, markdownFiles);
     const routeHandlerRoutes = buildRouteHandlerRoutes(Object.keys(routeHandlerModules));
     const layoutRoutes = buildLayoutRoutes(layouts);
     const proxyModule = await Object.values(proxyModules)[0]?.();

package/dist/lib/server-router/types.d.ts

@@ -29,9 +29,12 @@ type ImageEntry = {
 };
 export type RouteEntry = PageRouteEntry | RouteHandlerEntry | LayoutRSCEntry | ProxyEntry | ImageEntry;
 type FindHandler<E extends RouteEntry> = ProxyEntry extends E ? (request: Request) => ReturnType<ProxyHandler> : (request: Request) => Promise<Response>;
+export type MatchedHandler<E extends RouteEntry = RouteEntry> = FindHandler<E> & {
+    route?: Route | RouteHandlerRoute | LayoutRoute;
+};
 /** A compiled route matcher that finds the best matching route for a given method + URL. */
 export interface RouteMatcher<E extends RouteEntry = RouteEntry> {
-    find(method: string, url: string): FindHandler<E> | null;
+    find(method: string, url: string): MatchedHandler<E> | null;
 }
 /**
  * A router plugin provides an implementation of this function via the

package/dist/lib/server-router/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EACX,UAAU,EACV,WAAW,EACX,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,MAAM,qBAAqB,CAAA;AAE5B,oBAAY,SAAS;IACpB,GAAG,IAAA;IACH,KAAK,IAAA;IACL,KAAK,IAAA;CACL;AAED,KAAK,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE3E,KAAK,QAAQ,CAAC,CAAC,IAAI;IAClB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,IAAI,EAAE,SAAS,CAAC,GAAG,CAAA;IACnB,KAAK,EAAE,CAAC,CAAA;IACR,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,KAAK,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;AACrC,KAAK,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAA;AACpD,KAAK,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;AAE3C,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAA;IACrB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,KAAK,UAAU,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAA;IACrB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,UAAU,GACnB,cAAc,GACd,iBAAiB,GACjB,cAAc,GACd,UAAU,GACV,UAAU,CAAA;AAEb,KAAK,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,SAAS,CAAC,GAC1D,CAAC,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC,YAAY,CAAC,GAC9C,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE1C,4FAA4F;AAC5F,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC9D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;CACxD;AAED;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,CAAA;AAErF,MAAM,WAAW,YAAY;IAC5B,sFAAsF;IACtF,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/C,uEAAuE;IACvE,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5C,qFAAqF;IACrF,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;CACrD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EACX,UAAU,EACV,WAAW,EACX,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,MAAM,qBAAqB,CAAA;AAE5B,oBAAY,SAAS;IACpB,GAAG,IAAA;IACH,KAAK,IAAA;IACL,KAAK,IAAA;CACL;AAED,KAAK,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE3E,KAAK,QAAQ,CAAC,CAAC,IAAI;IAClB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,IAAI,EAAE,SAAS,CAAC,GAAG,CAAA;IACnB,KAAK,EAAE,CAAC,CAAA;IACR,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,KAAK,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;AACrC,KAAK,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAA;AACpD,KAAK,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;AAE3C,MAAM,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAA;IACrB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,KAAK,UAAU,GAAG;IACjB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAA;IACrB,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,UAAU,GACnB,cAAc,GACd,iBAAiB,GACjB,cAAc,GACd,UAAU,GACV,UAAU,CAAA;AAEb,KAAK,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,SAAS,CAAC,GAC1D,CAAC,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC,YAAY,CAAC,GAC9C,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE1C,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG;IAChF,KAAK,CAAC,EAAE,KAAK,GAAG,iBAAiB,GAAG,WAAW,CAAA;CAC/C,CAAA;AAED,4FAA4F;AAC5F,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IAC9D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;CAC3D;AAED;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,SAAS,UAAU,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,CAAA;AAErF,MAAM,WAAW,YAAY;IAC5B,sFAAsF;IACtF,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC/C,uEAAuE;IACvE,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC5C,qFAAqF;IACrF,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;CACrD"}

package/dist/lib/write-behind-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-behind-cache.d.ts","sourceRoot":"","sources":["../../src/lib/write-behind-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,KAAK,YAAY,EACjB,MAAM,oBAAoB,CAAA;AAE3B,UAAU,kBAAkB;IAC3B;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB;AAID;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,kBAAuB,GAC9B,YAAY,CAuHd"}
+{"version":3,"file":"write-behind-cache.d.ts","sourceRoot":"","sources":["../../src/lib/write-behind-cache.ts"],"names":[],"mappings":"AACA,OAAO,EAIN,KAAK,YAAY,EACjB,MAAM,oBAAoB,CAAA;AAE3B,UAAU,kBAAkB;IAC3B;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB;AAID;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,kBAAuB,GAC9B,YAAY,CAyHd"}

package/dist/lib/write-behind-cache.js

@@ -62,9 +62,11 @@ export function withWriteBehind(storage, options = {}) {
                 return storage.set(key, entry, setOptions);
             const bytes = entry.type === CacheEntryType.HTML
                 ? entry.html.length + (entry.postponed?.length ?? 0)
-                : entry.type === CacheEntryType.DURABLE_CACHE
-                    ? entry.data.length
-                    : entry.rsc.length;
+                : entry.type === CacheEntryType.MARKDOWN
+                    ? entry.markdown.length
+                    : entry.type === CacheEntryType.DURABLE_CACHE
+                        ? entry.data.length
+                        : entry.rsc.length;
             const queued = pending.get(key);
             if (queued) {
                 pendingBytes += bytes - queued.bytes;

package/dist/plugins/devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../src/plugins/devtools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAmD,MAAM,MAAM,CAAA;AACnF,OAAO,KAAK,EACX,qBAAqB,EAIrB,MAAM,gBAAgB,CAAA;AAQvB,wBAAgB,cAAc,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,GAAG,MAAM,CAwG3F"}
+{"version":3,"file":"devtools.d.ts","sourceRoot":"","sources":["../../src/plugins/devtools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,MAAM,EAAmD,MAAM,MAAM,CAAA;AACnF,OAAO,KAAK,EACX,qBAAqB,EAIrB,MAAM,gBAAgB,CAAA;AAQvB,wBAAgB,cAAc,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,GAAG,MAAM,CA0G3F"}

package/dist/plugins/devtools.js

@@ -61,11 +61,11 @@ export function devtoolsPlugin(cacheFunctions) {
                 await devtoolsModule.setupRebaskDevtools(devtools, {
                     root: projectRoot,
                     async getRoutes() {
-                        const { pages, layouts, routeHandlers } = await scanAppDirectory(join(projectRoot, "app"));
+                        const { pages, layouts, routeHandlers, markdownFiles } = await scanAppDirectory(join(projectRoot, "app"));
                         const proxyPath = await findProjectFile(projectRoot, "proxy");
                         const proxyModule = proxyPath && runner && (await runner.import(proxyPath));
                         return {
-                            pages: buildRoutes(layouts, pages).filter((route) => route.type === "page"),
+                            pages: buildRoutes(layouts, pages, markdownFiles).filter((route) => route.type === "page"),
                             routeHandlers: buildRouteHandlerRoutes(routeHandlers),
                             proxyPatterns: proxyModule ? Object.keys(proxyModule.default ?? proxyModule) : [],
                         };

package/dist/plugins/ppr.d.ts

@@ -2,6 +2,11 @@ import type { Plugin } from "vite";
 /** The `name` of the Vite plugin. */
 export declare const REBASK_PPR_PLUGIN_NAME = "rebask:ppr";
 export interface PprConfig {
+    /**
+     * Whether page responses include `x-rebask-cache`. Platforms that own page cache set this to
+     * `false`.
+     */
+    emitCacheStatus?: boolean;
     /**
      * Rebask only enters the resume path when this header matches `"1"`. Adapters must validate
      * their own transport credential and set this header before the Rebask handler executes.

package/dist/plugins/ppr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ppr.d.ts","sourceRoot":"","sources":["../../src/plugins/ppr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,qCAAqC;AACrC,eAAO,MAAM,sBAAsB,eAAe,CAAA;AAElD,MAAM,WAAW,SAAS;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;;;OAOG;IACH,oBAAoB,EAAE,MAAM,CAAA;IAC5B,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kBAAkB;IAClC,4EAA4E;IAC5E,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,KAAK,IAAI,CAAA;CAC7C;AAKD;;;GAGG;AACH,wBAAgB,SAAS,IAAI,MAAM,CA8BlC"}
+{"version":3,"file":"ppr.d.ts","sourceRoot":"","sources":["../../src/plugins/ppr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,qCAAqC;AACrC,eAAO,MAAM,sBAAsB,eAAe,CAAA;AAElD,MAAM,WAAW,SAAS;IACzB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;;;OAOG;IACH,oBAAoB,EAAE,MAAM,CAAA;IAC5B,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kBAAkB;IAClC,4EAA4E;IAC5E,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,KAAK,IAAI,CAAA;CAC7C;AAKD;;;GAGG;AACH,wBAAgB,SAAS,IAAI,MAAM,CA8BlC"}

package/dist/plugins/prerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prerender.d.ts","sourceRoot":"","sources":["../../src/plugins/prerender.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAOlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AASlE,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAOjD,KAAK,YAAY,GAAG,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAA;AAEhE,KAAK,sBAAsB,GAAG;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,mEAAmE;IACnE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAA;IAC/D,2DAA2D;IAC3D,EAAE,CAAC,EAAE,MAAM,EAAE,CAAA;CACb,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IAC9C,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;IAClG;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC,CAAA;IAC3E,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAChD,CAAA;AA2CD,UAAU,sBAAsB;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,OAAO,GAAE,sBAA2B,GAClC,MAAM,CA6VR"}
+{"version":3,"file":"prerender.d.ts","sourceRoot":"","sources":["../../src/plugins/prerender.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAQlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AASlE,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAOjD,KAAK,YAAY,GAAG,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAA;AAEhE,KAAK,sBAAsB,GAAG;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,mEAAmE;IACnE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAA;IAC/D,2DAA2D;IAC3D,EAAE,CAAC,EAAE,MAAM,EAAE,CAAA;CACb,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IAC9C,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;IAClG;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC,CAAA;IAC3E,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAC/C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAChD,CAAA;AA2CD,UAAU,sBAAsB;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,OAAO,GAAE,sBAA2B,GAClC,MAAM,CA2ZR"}

package/dist/plugins/prerender.js

@@ -63,7 +63,10 @@ export function prerenderPlugin(api, options = {}) {
                 const prerenderOptions = { isBuildPrerender: true };
                 await withFetchCache(() => Promise.all(pageRoutes.map(async (route) => {
                     const isDynamic = route.segments.some(isDynamicSegment);
-                    const paramsResult = isDynamic ? await entryModule.getPrerenderParams(route) : null;
+                    // Static page + Markdown routes load params only to catch conflicting prerenderParams.
+                    const paramsResult = isDynamic || (route.hasPage !== false && route.markdownFilePath)
+                        ? await entryModule.getPrerenderParams(route)
+                        : null;
                     const resolvedParams = paramsResult && paramsResult.params.length > 0 ? paramsResult.params : null;
                     const allowExtraParams = isDynamic ? (paramsResult?.allowExtraParams ?? true) : true;
                     const { filePath, shellParams } = route;
@@ -96,90 +99,131 @@ export function prerenderPlugin(api, options = {}) {
                     if (allowExtraParams !== false) {
                         requests.push({ pathname: getRoutePathname(route), params: {} });
                     }
-                    const requestResults = await Promise.all(requests.map(async ({ pathname, params }) => {
-                        let prerenderMeta;
-                        const isSharedShell = isDynamic && Object.keys(params).length === 0;
-                        const request = new Request(`http://localhost${pathname}`, {
-                            headers: { accept: "text/html" },
-                        });
-                        const response = await entryModule.handlePageRoute(request, route, params, {
-                            ...prerenderOptions,
-                            // The build URL is only a static prefix. Force unresolved params and skip any
-                            // HTML cached at that URL.
-                            ...(isSharedShell && { resolvedParams: new Set() }),
-                            onBuildPrerenderMeta(meta) {
-                                prerenderMeta = meta;
-                            },
-                        });
-                        if (!prerenderMeta) {
-                            throw new Error(`Missing build prerender metadata for "${route.filePath}" at "${pathname}"`);
-                        }
-                        return { pathname, isSharedShell, response, prerenderMeta };
-                    }));
-                    for (const result of requestResults) {
-                        const { pathname, isSharedShell, response, prerenderMeta } = result;
-                        const { hasShell, cacheLife, postponedState, hasPrerenderRequestIO } = prerenderMeta;
-                        if (hasPrerenderRequestIO && !isSharedShell) {
-                            const ioPaths = (prerenderRequestIOPaths[filePath] ??= []);
-                            ioPaths.push(pathname);
-                        }
-                        if (cacheLife) {
-                            // Shared shell pathname is only a static prefix (not a real URL).
-                            if (!isSharedShell) {
-                                cacheControlByPath[pathname] = mergeCacheControl(cacheControlByPath[pathname], cacheLife);
+                    if (route.hasPage !== false) {
+                        const requestResults = await Promise.all(requests.map(async ({ pathname, params }) => {
+                            let prerenderMeta;
+                            const isSharedShell = isDynamic && Object.keys(params).length === 0;
+                            const request = new Request(`http://localhost${pathname}`, {
+                                headers: { accept: "text/html" },
+                            });
+                            const response = await entryModule.handlePageRoute(request, route, params, {
+                                ...prerenderOptions,
+                                // The build URL is only a static prefix. Force unresolved params and skip any
+                                // HTML cached at that URL.
+                                ...(isSharedShell && { resolvedParams: new Set() }),
+                                onBuildPrerenderMeta(meta) {
+                                    prerenderMeta = meta;
+                                },
+                            });
+                            if (!prerenderMeta) {
+                                throw new Error(`Missing build prerender metadata for "${route.filePath}" at "${pathname}"`);
                             }
-                            cacheControlByFilePath[filePath] = mergeCacheControl(cacheControlByFilePath[filePath], cacheLife);
-                        }
-                        if (!hasShell) {
-                            if (isSharedShell) {
-                                noShellRoutes.add(filePath);
+                            return { pathname, params, isSharedShell, response, prerenderMeta };
+                        }));
+                        for (const result of requestResults) {
+                            const { pathname, params, isSharedShell, response, prerenderMeta } = result;
+                            const { hasShell, cacheLife, postponedState, hasPrerenderRequestIO } = prerenderMeta;
+                            if (hasPrerenderRequestIO && !isSharedShell) {
+                                const ioPaths = (prerenderRequestIOPaths[filePath] ??= []);
+                                ioPaths.push(pathname);
                             }
-                            if (allowExtraParams !== false) {
-                                const warning = noPrerenderWarning(pathname);
-                                if (failOnDynamic)
-                                    throw new Error(warning);
-                                else
-                                    console.warn(warning);
+                            if (cacheLife) {
+                                // Shared shell pathname is only a static prefix (not a real URL).
+                                if (!isSharedShell) {
+                                    cacheControlByPath[pathname] = mergeCacheControl(cacheControlByPath[pathname], cacheLife);
+                                }
+                                cacheControlByFilePath[filePath] = mergeCacheControl(cacheControlByFilePath[filePath], cacheLife);
                             }
-                        }
-                        if (hasShell && postponedState) {
-                            const html = await response.text();
-                            if (isSharedShell) {
+                            if (!hasShell) {
+                                if (isSharedShell) {
+                                    noShellRoutes.add(filePath);
+                                }
+                                if (allowExtraParams !== false) {
+                                    const warning = noPrerenderWarning(pathname);
+                                    if (failOnDynamic)
+                                        throw new Error(warning);
+                                    else
+                                        console.warn(warning);
+                                }
+                            }
+                            if (hasShell && postponedState) {
+                                const html = await response.text();
+                                if (isSharedShell) {
+                                    await api.notifyShellPrerender({
+                                        kind: "shared",
+                                        filePath,
+                                        postponedState,
+                                        html,
+                                        notFound: prerenderMeta.notFound,
+                                    });
+                                }
+                                else {
+                                    await api.notifyShellPrerender({
+                                        kind: "static",
+                                        filePath,
+                                        pathname,
+                                        postponedState,
+                                        html,
+                                        notFound: prerenderMeta.notFound,
+                                    });
+                                }
+                            }
+                            else if (hasShell &&
+                                cacheLife?.revalidate !== 0 &&
+                                (!isDynamic || allowExtraParams === false)) {
+                                const html = await response.text();
+                                // Capture the RSC payload so adapters can ship it as a STATIC entry.
+                                // Otherwise every cold RSC request uses the empty pass-through PPR
+                                // entry and chains through the function.
+                                const rscPayload = !hasPrerenderRequestIO && !prerenderMeta.notFound
+                                    ? await entryModule
+                                        .handlePageRoute(new Request(`http://localhost${pathname}`, {
+                                        headers: { accept: "text/x-component" },
+                                    }), route, params, prerenderOptions)
+                                        .then((rscResponse) => rscResponse.text())
+                                    : undefined;
                                 await api.notifyShellPrerender({
-                                    kind: "shared",
+                                    kind: "static-html",
                                     filePath,
-                                    postponedState,
+                                    pathname,
                                     html,
+                                    ...(rscPayload !== undefined && { rscPayload }),
                                     notFound: prerenderMeta.notFound,
                                 });
                             }
                             else {
+                                // HTML is already cached inside handlePageRoute; drop the unused body.
+                                response.body?.cancel().catch(() => { });
+                            }
+                            console.log(`[rebask] ${hasShell ? "✓" : "✗"} ${pathname}`);
+                        }
+                    }
+                    if (route.markdownFilePath) {
+                        for (const { pathname, params } of requests) {
+                            // A dynamic route's empty-params request is only a shared shell, not a real URL.
+                            if (isDynamic && Object.keys(params).length === 0)
+                                continue;
+                            const request = new Request(`http://localhost${pathname}`, {
+                                headers: { accept: "text/markdown" },
+                            });
+                            let markdownMeta;
+                            const response = await entryModule.handleMarkdownRoute(request, route, params, {
+                                isBuildPrerender: true,
+                                onBuildPrerenderMeta(meta) {
+                                    markdownMeta = meta;
+                                },
+                            });
+                            const markdown = await response.text();
+                            if (markdownMeta?.static) {
                                 await api.notifyShellPrerender({
-                                    kind: "static",
-                                    filePath,
+                                    kind: "markdown",
                                     pathname,
-                                    postponedState,
-                                    html,
-                                    notFound: prerenderMeta.notFound,
+                                    markdown,
+                                    cacheLife: markdownMeta.cacheLife,
                                 });
+                                console.log(`[rebask] ✓ ${pathname}.md`);
                             }
                         }
-                        else if (hasShell &&
-                            cacheLife?.revalidate !== 0 &&
-                            (!isDynamic || allowExtraParams === false)) {
-                            await api.notifyShellPrerender({
-                                kind: "static-html",
-                                filePath,
-                                pathname,
-                                html: await response.text(),
-                                notFound: prerenderMeta.notFound,
-                            });
-                        }
-                        else {
-                            // HTML is already cached inside handlePageRoute; drop the unused body.
-                            response.body?.cancel().catch(() => { });
-                        }
-                        console.log(`[rebask] ${hasShell ? "✓" : "✗"} ${pathname}`);
                     }
                     // Prerender intermediate shells from layout `prerenderParams` (closest/richest first).
                     if (shellParams && allowExtraParams !== false) {

package/dist/plugins/router/wint-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wint-router.d.ts","sourceRoot":"","sources":["../../../src/plugins/router/wint-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAsEhG;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,YAAY,CAwDjE"}
+{"version":3,"file":"wint-router.d.ts","sourceRoot":"","sources":["../../../src/plugins/router/wint-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAGN,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,MAAM,kCAAkC,CAAA;AAsEzC;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,YAAY,CA4DjE"}

package/dist/plugins/router/wint-router.js

@@ -1,5 +1,5 @@
 import Wint from "wint-js/turbo";
-import { RouteType } from "../../lib/server-router/types.js";
+import { RouteType, } from "../../lib/server-router/types.js";
 /**
  * Convert a route's segments to Wint-compatible pattern
  * Examples:
@@ -110,7 +110,9 @@ export function createMatcher(entries) {
                 }
                 return (req) => entry.handler(req, params);
             }
-            return (req) => entry.handler(req, extractParams(entry.route.segments, ctx.params ?? {}));
+            const handler = (req) => entry.handler(req, extractParams(entry.route.segments, ctx.params ?? {}));
+            handler.route = entry.route;
+            return handler;
         },
     };
 }

package/dist/router.d.ts

@@ -115,7 +115,7 @@ declare class Router {
      * Refetch any stale (or missing) segments for a URL whose route tree is
      * already known, without ever fetching the route tree itself.
      *
-     * Designed for hover / focus signals like `<Link>` and `<PrefetchLinks>`. If the route tree
+     * Designed for hover / focus signals like `<Link>`. If the route tree
      * hasn't been cached yet this is a no-op, and it's safe to call repeatedly because in-flight
      * fetches dedupe and fully fresh trees do zero work.
      */

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

@@ -320,7 +320,9 @@ class Router {
         const search = segmentLocation.search ?? "";
         const fetchKey = `${segmentPath}?${search}`;
         const { shellable, shellKey } = this.segmentShell(segmentLocation);
-        const cachedShell = import.meta.env.PROD && shellable && !skipShell ? this.cache.getShell(shellKey) : undefined;
+        const cachedShell = import.meta.env.PROD && shellable && !skipShell
+            ? (this.cache.getShell(segmentPath) ?? this.cache.getShell(shellKey))
+            : undefined;
         const reusePolicy = this.cache.getSegmentReusePolicy(segmentLocation, cachedShell);
         const { completeShell, inBackground } = reusePolicy;
         let shell = reusePolicy.showShell ? cachedShell : undefined;
@@ -475,8 +477,11 @@ class Router {
         // constantly, so no stable shell survives to match. Serve the full segment instead.
         if (import.meta.env.DEV)
             return null;
-        const cached = this.cache.getShell(key);
-        if (cached && !cached.stale)
+        const usable = (shell) => shell && !shell.stale && (!shell.staticOnly || shell.path === segmentLocation.path);
+        const concrete = this.cache.getShell(segmentLocation.path);
+        const shared = this.cache.getShell(key);
+        const cached = usable(concrete) ? concrete : usable(shared) ? shared : undefined;
+        if (cached)
             return cached;
         let inFlight = inflightShellCache.get(key);
         if (!inFlight || !inFlight.isCurrent()) {
@@ -499,6 +504,10 @@ class Router {
             inflightShellCache.delete(key);
         if (!shell)
             return null;
+        // Another path answered the shared key with a static page. It cannot serve this one.
+        if (shell.staticOnly && shell.path !== segmentLocation.path) {
+            return this.ensureShell(segmentLocation, key, expectedRoutePrediction);
+        }
         const payload = await shell.payload;
         if (!inFlight.isCurrent())
             return null;
@@ -511,7 +520,7 @@ class Router {
             this.cache.markSegmentStale(segmentLocation);
             throw new RoutePredictionMismatch();
         }
-        this.cache.cacheShell(key, shell);
+        this.cache.cacheShell(shell.staticOnly ? segmentLocation.path : key, shell);
         return shell;
     }
     async fetchSegmentShell(segmentLocation) {
@@ -536,7 +545,8 @@ class Router {
         }));
         const resolvedPayload = await payload;
         const segmentHints = id === null ? await extractSegmentHints(resolvedPayload.seedData.content) : undefined;
-        return { bytes, id, payload, cachedAt, ...segmentHints };
+        const staticOnly = "routePrediction" in resolvedPayload && resolvedPayload.routePrediction?.[3] === true;
+        return { bytes, path: segmentLocation.path, staticOnly, id, payload, cachedAt, ...segmentHints };
     }
     /**
      * Prefetch all missing segments for a route tree and cache them.
@@ -720,7 +730,7 @@ class Router {
      * Refetch any stale (or missing) segments for a URL whose route tree is
      * already known, without ever fetching the route tree itself.
      *
-     * Designed for hover / focus signals like `<Link>` and `<PrefetchLinks>`. If the route tree
+     * Designed for hover / focus signals like `<Link>`. If the route tree
      * hasn't been cached yet this is a no-op, and it's safe to call repeatedly because in-flight
      * fetches dedupe and fully fresh trees do zero work.
      */

package/dist/server-router.d.ts

@@ -1,5 +1,5 @@
 export { RouteType } from "./lib/server-router/types.js";
-export type { CreateMatcherFn, RouteEntry, RouteMatcher } from "./lib/server-router/types.js";
+export type { CreateMatcherFn, MatchedHandler, RouteEntry, RouteMatcher, } from "./lib/server-router/types.js";
 export type { LayoutRoute, NotFoundRoute, Route, RouteSegment, RouteHandlerRoute, } from "./lib/route-matcher.js";
 export { createRouterPlugin, rebaskRouter, type RouterPluginOptions, } from "./plugins/router/router-plugin.js";
 //# sourceMappingURL=server-router.d.ts.map

package/dist/server-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-router.d.ts","sourceRoot":"","sources":["../src/server-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC7F,YAAY,EACX,WAAW,EACX,aAAa,EACb,KAAK,EACL,YAAY,EACZ,iBAAiB,GACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACN,kBAAkB,EAClB,YAAY,EACZ,KAAK,mBAAmB,GACxB,MAAM,mCAAmC,CAAA"}
+{"version":3,"file":"server-router.d.ts","sourceRoot":"","sources":["../src/server-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,YAAY,EACX,eAAe,EACf,cAAc,EACd,UAAU,EACV,YAAY,GACZ,MAAM,8BAA8B,CAAA;AACrC,YAAY,EACX,WAAW,EACX,aAAa,EACb,KAAK,EACL,YAAY,EACZ,iBAAiB,GACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACN,kBAAkB,EAClB,YAAY,EACZ,KAAK,mBAAmB,GACxB,MAAM,mCAAmC,CAAA"}