@rebask/core 0.1.4 → 0.2.0

package/dist/lib/lru-cache.js

@@ -103,6 +103,8 @@ function defaultCalculateSize(entry) {
     if (entry.type === CacheEntryType.HTML) {
         return entry.html.length + (entry.postponed?.length ?? 0);
     }
+    if (entry.type === CacheEntryType.MARKDOWN)
+        return entry.markdown.length;
     if (entry.type === CacheEntryType.DURABLE_CACHE) {
         return entry.data.length;
     }

package/dist/lib/markdown.d.ts

@@ -0,0 +1,5 @@
+/** Whether the request explicitly prefers Markdown over HTML. */
+export declare function prefersMarkdown(accept: string | null): boolean;
+/** The page pathname for a `.md` URL, or `null` when it is not one. */
+export declare function getMarkdownPathname(pathname: string): string | null;
+//# sourceMappingURL=markdown.d.ts.map

package/dist/lib/markdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/lib/markdown.ts"],"names":[],"mappings":"AAiBA,iEAAiE;AACjE,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,WA6BpD;AAED,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,iBAKnD"}

package/dist/lib/markdown.js

@@ -0,0 +1,53 @@
+function parseQuality(params) {
+    for (const param of params) {
+        const [rawName, rawValue] = param.split("=");
+        if (rawName?.trim().toLowerCase() !== "q")
+            continue;
+        const value = rawValue?.trim();
+        if (!value)
+            return 1;
+        const q = Number(value);
+        if (!Number.isFinite(q))
+            return 1;
+        return Math.min(1, Math.max(0, q));
+    }
+    return 1;
+}
+/** Whether the request explicitly prefers Markdown over HTML. */
+export function prefersMarkdown(accept) {
+    if (!accept)
+        return false;
+    let markdown;
+    let exactHtml;
+    let typeWildcardHtml;
+    let wildcardHtml;
+    for (const part of accept.split(",")) {
+        const [range, ...params] = part.split(";");
+        const [type, subtype] = (range ?? "").trim().toLowerCase().split("/");
+        if (!type || !subtype)
+            continue;
+        const q = parseQuality(params);
+        if (type === "text" && subtype === "markdown") {
+            markdown = Math.max(markdown ?? 0, q);
+        }
+        else if (type === "text" && subtype === "html") {
+            exactHtml = Math.max(exactHtml ?? 0, q);
+        }
+        else if (type === "text" && subtype === "*") {
+            typeWildcardHtml = Math.max(typeWildcardHtml ?? 0, q);
+        }
+        else if (type === "*" && subtype === "*") {
+            wildcardHtml = Math.max(wildcardHtml ?? 0, q);
+        }
+    }
+    if (!markdown)
+        return false;
+    return markdown >= (exactHtml ?? typeWildcardHtml ?? wildcardHtml ?? 0);
+}
+/** The page pathname for a `.md` URL, or `null` when it is not one. */
+export function getMarkdownPathname(pathname) {
+    if (!pathname.endsWith(".md"))
+        return null;
+    const stripped = pathname.slice(0, -3).replace(/\/+$/, "");
+    return stripped || "/";
+}

package/dist/lib/page-exports.d.ts

@@ -0,0 +1,9 @@
+export type PageExports = {
+    default: boolean;
+    notFound: boolean;
+};
+export declare function readPageExports(filePath: string): Promise<{
+    default: boolean;
+    notFound: boolean;
+}>;
+//# sourceMappingURL=page-exports.d.ts.map

package/dist/lib/page-exports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-exports.d.ts","sourceRoot":"","sources":["../../src/lib/page-exports.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM;;;GAiDrD"}

package/dist/lib/page-exports.js

@@ -0,0 +1,47 @@
+import { readFile } from "node:fs/promises";
+import { parseSync } from "vite";
+export async function readPageExports(filePath) {
+    const source = await readFile(filePath, "utf8");
+    const { program } = parseSync(filePath, source);
+    let hasDefault = false;
+    let hasNotFound = false;
+    for (const statement of program.body) {
+        if (statement.type === "ExportDefaultDeclaration") {
+            hasDefault = true;
+            continue;
+        }
+        if (statement.type === "ExportAllDeclaration") {
+            const exported = statement.exported;
+            if (exported?.type === "Identifier" && exported.name === "default") {
+                hasDefault = true;
+            }
+            continue;
+        }
+        if (statement.type !== "ExportNamedDeclaration")
+            continue;
+        const declaration = statement.declaration;
+        if (declaration?.type === "VariableDeclaration") {
+            for (const declarator of declaration.declarations) {
+                if (declarator.id.type !== "Identifier")
+                    continue;
+                if (declarator.id.name === "notFound") {
+                    let init = declarator.init;
+                    while (init &&
+                        (init.type === "TSAsExpression" ||
+                            init.type === "TSSatisfiesExpression" ||
+                            init.type === "ParenthesizedExpression")) {
+                        init = init.expression;
+                    }
+                    hasNotFound = init?.type === "Literal" && init.value === true;
+                }
+            }
+        }
+        for (const specifier of statement.specifiers ?? []) {
+            if (specifier.exported.type !== "Identifier")
+                continue;
+            if (specifier.exported.name === "default")
+                hasDefault = true;
+        }
+    }
+    return { default: hasDefault, notFound: hasNotFound };
+}

package/dist/lib/ppr/cache-status.d.ts

@@ -0,0 +1,3 @@
+import { type RebaskCacheStatus } from "./headers.js";
+export declare function cacheStatusHeader(cacheStatus: RebaskCacheStatus): Record<string, string>;
+//# sourceMappingURL=cache-status.d.ts.map

package/dist/lib/ppr/cache-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-status.d.ts","sourceRoot":"","sources":["../../../src/lib/ppr/cache-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAE1E,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAExF"}

package/dist/lib/ppr/cache-status.js

@@ -0,0 +1,5 @@
+import { pprConfig } from "virtual:rebask/ppr-config";
+import { REBASK_CACHE_HEADER } from "./headers.js";
+export function cacheStatusHeader(cacheStatus) {
+    return pprConfig?.emitCacheStatus === false ? {} : { [REBASK_CACHE_HEADER]: cacheStatus };
+}

package/dist/lib/ppr/headers.d.ts

@@ -15,7 +15,7 @@ export declare const REBASK_TAIL_HEADER = "x-rebask-tail";
  * This indicates the response is a cached static shell + streamed dynamic content.
  */
 export declare const REBASK_PRERENDER_HEADER = "x-rebask-prerender";
-/** Header to know whether the response body came from cache. */
+/** The origin cache outcome. Omitted when the adapter owns page caching. */
 export declare const REBASK_CACHE_HEADER = "x-rebask-cache";
 /**
  * Boundary between a segment's Flight stream and the trailer carrying the search params the segment

package/dist/lib/ppr/headers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/ppr/headers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,4CAA4C;AAC5C,eAAO,MAAM,oBAAoB,iBAAiB,CAAA;AAElD,6FAA6F;AAC7F,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,gEAAgE;AAChE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAA;AAEvD,eAAO,MAAM,uBAAuB,0BAAkC,CAAA;AAEtE,eAAO,MAAM,sBAAsB,yDAAiF,CAAA;AAEpH,oBAAY,iBAAiB;IAC5B,mCAAmC;IACnC,GAAG,QAAQ;IACX,wEAAwE;IACxE,KAAK,UAAU;IACf,8BAA8B;IAC9B,IAAI,SAAS;CACb;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAoBtF;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/E"}
+{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/lib/ppr/headers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE9C,4CAA4C;AAC5C,eAAO,MAAM,oBAAoB,iBAAiB,CAAA;AAElD,6FAA6F;AAC7F,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD,uEAAuE;AACvE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,4EAA4E;AAC5E,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAA;AAEvD,eAAO,MAAM,uBAAuB,0BAAkC,CAAA;AAEtE,eAAO,MAAM,sBAAsB,yDAAiF,CAAA;AAEpH,oBAAY,iBAAiB;IAC5B,mCAAmC;IACnC,GAAG,QAAQ;IACX,wEAAwE;IACxE,KAAK,UAAU;IACf,8BAA8B;IAC9B,IAAI,SAAS;CACb;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,UAAQ,GAAG,MAAM,CAoBtF;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/E"}

package/dist/lib/ppr/headers.js

@@ -14,7 +14,7 @@ export const REBASK_TAIL_HEADER = "x-rebask-tail";
  * This indicates the response is a cached static shell + streamed dynamic content.
  */
 export const REBASK_PRERENDER_HEADER = "x-rebask-prerender";
-/** Header to know whether the response body came from cache. */
+/** The origin cache outcome. Omitted when the adapter owns page caching. */
 export const REBASK_CACHE_HEADER = "x-rebask-cache";
 /**
  * Boundary between a segment's Flight stream and the trailer carrying the search params the segment

package/dist/lib/prerender-params.d.ts

@@ -5,7 +5,7 @@ type IntermediateShellEntry = {
     keys: string[];
     encoded: string;
 };
-/** Page `prerenderParams`. */
+/** Page or Markdown route `prerenderParams`. */
 export declare function getPrerenderParams(route: PageRoute): Promise<PrerenderParamsResult | null>;
 /**
  * Returns intermediate shells from ancestor layouts. Richest shells are listed first for runtime

package/dist/lib/prerender-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prerender-params.d.ts","sourceRoot":"","sources":["../../src/lib/prerender-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE1E,OAAO,EAEN,KAAK,SAAS,EAEd,KAAK,WAAW,EAChB,MAAM,oBAAoB,CAAA;AAG3B,KAAK,sBAAsB,GAAG;IAC7B,MAAM,EAAE,WAAW,CAAA;IACnB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAwCD,8BAA8B;AAC9B,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,SAAS,yCAExD;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,KAAK,EAAE,SAAS,qCA2ChE"}
+{"version":3,"file":"prerender-params.d.ts","sourceRoot":"","sources":["../../src/lib/prerender-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE1F,OAAO,EAEN,KAAK,SAAS,EAEd,KAAK,WAAW,EAChB,MAAM,oBAAoB,CAAA;AAG3B,KAAK,sBAAsB,GAAG;IAC7B,MAAM,EAAE,WAAW,CAAA;IACnB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AA6CD,gDAAgD;AAChD,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,SAAS,yCAyBxD;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,KAAK,EAAE,SAAS,qCA2ChE"}

package/dist/lib/prerender-params.js

@@ -1,4 +1,4 @@
-import { layoutModules, pageModules } from "./app-manifest.js";
+import { layoutModules, markdownHandlerModules, pageModules } from "./app-manifest.js";
 import { getDynamicSegmentNames, parseSegment, } from "./route-matcher.js";
 import { collectShellParamParts } from "./shell-params.js";
 const prerenderParamsByFile = new Map();
@@ -29,8 +29,23 @@ function loadPrerenderParams(filePath, loader) {
     }
     return pending;
 }
-/** Page `prerenderParams`. */
+/** Page or Markdown route `prerenderParams`. */
 export async function getPrerenderParams(route) {
+    if (route.hasPage === false && route.markdownFilePath) {
+        return loadPrerenderParams(route.markdownFilePath, markdownHandlerModules[route.markdownFilePath]);
+    }
+    if (route.markdownFilePath && !route.markdownFilePath.endsWith(".md")) {
+        const [pageParams, markdownParams] = await Promise.all([
+            loadPrerenderParams(route.filePath, pageModules[route.filePath]),
+            loadPrerenderParams(route.markdownFilePath, markdownHandlerModules[route.markdownFilePath]),
+        ]);
+        if (pageParams && markdownParams) {
+            throw new Error(`Cannot define prerenderParams in both "${route.filePath}" and ` +
+                `"${route.markdownFilePath}". Remove it from the Markdown file; ` +
+                `the page's prerenderParams takes priority.`);
+        }
+        return pageParams ?? markdownParams;
+    }
     return loadPrerenderParams(route.filePath, pageModules[route.filePath]);
 }
 /**

package/dist/lib/project-files.d.ts

@@ -1,10 +1,11 @@
 export declare const PAGE_EXTENSIONS: string[];
 export declare const CONFIG_EXTENSIONS: string[];
 /** Scan directory recursively for pages, layouts, and not-found components */
-export declare function scanAppDirectory(appDir: string): Promise<{
+export declare function scanAppDirectory(appDir: string, markdownUrls?: boolean): Promise<{
     pages: string[];
     layouts: string[];
     routeHandlers: string[];
+    markdownFiles: string[];
 }>;
 export declare function findProjectFile(root: string, name: string): Promise<string | undefined>;
 //# sourceMappingURL=project-files.d.ts.map

package/dist/lib/project-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-files.d.ts","sourceRoot":"","sources":["../../src/lib/project-files.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,UAA6B,CAAA;AACzD,eAAO,MAAM,iBAAiB,UAA6B,CAAA;AAS3D,8EAA8E;AAC9E,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/D,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;CACvB,CAAC,CA6CD;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAU/D"}
+{"version":3,"file":"project-files.d.ts","sourceRoot":"","sources":["../../src/lib/project-files.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,UAA6B,CAAA;AACzD,eAAO,MAAM,iBAAiB,UAA6B,CAAA;AAS3D,8EAA8E;AAC9E,wBAAsB,gBAAgB,CACrC,MAAM,EAAE,MAAM,EACd,YAAY,UAAQ,GAClB,OAAO,CAAC;IACV,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,aAAa,EAAE,MAAM,EAAE,CAAA;CACvB,CAAC,CAuDD;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,+BAU/D"}

package/dist/lib/project-files.js

@@ -1,5 +1,6 @@
 import { readdir, stat } from "node:fs/promises";
 import { join, relative } from "node:path";
+import { assertNoMarkdownRoutePath } from "./route-builder.js";
 export const PAGE_EXTENSIONS = ["jsx", "js", "tsx", "ts"];
 export const CONFIG_EXTENSIONS = ["ts", "mts", "mjs", "js"];
 function absolutePathToGlobKey(absolutePath) {
@@ -8,10 +9,11 @@ function absolutePathToGlobKey(absolutePath) {
     return `/${relativePath.replace(/\\/g, "/")}`;
 }
 /** Scan directory recursively for pages, layouts, and not-found components */
-export async function scanAppDirectory(appDir) {
+export async function scanAppDirectory(appDir, markdownUrls = false) {
     const pages = [];
     const layouts = [];
     const routeHandlers = [];
+    const markdownFiles = [];
     async function scanDirectory(dir) {
         try {
             const entries = await readdir(dir, { withFileTypes: true });
@@ -22,22 +24,30 @@ export async function scanAppDirectory(appDir) {
                     await scanDirectory(fullPath);
                 }
                 else if (entry.isFile()) {
-                    // Check if it's a page, layout, or route file
+                    const globKey = absolutePathToGlobKey(fullPath);
+                    if (markdownUrls)
+                        assertNoMarkdownRoutePath(globKey);
+                    // Check if it's a page, layout, route, or Markdown file.
                     for (const ext of PAGE_EXTENSIONS) {
                         if (entry.name === `page.${ext}`) {
-                            pages.push(absolutePathToGlobKey(fullPath));
+                            pages.push(globKey);
                             break;
                         }
                         if (entry.name === `layout.${ext}`) {
-                            layouts.push(absolutePathToGlobKey(fullPath));
+                            layouts.push(globKey);
                             break;
                         }
                         if (entry.name === `route.${ext}`) {
-                            const globKey = absolutePathToGlobKey(fullPath);
                             routeHandlers.push(globKey);
                             break;
                         }
+                        if (entry.name === `markdown.${ext}`) {
+                            markdownFiles.push(globKey);
+                            break;
+                        }
                     }
+                    if (entry.name === "markdown.md")
+                        markdownFiles.push(globKey);
                 }
             }
         }
@@ -50,7 +60,7 @@ export async function scanAppDirectory(appDir) {
         }
     }
     await scanDirectory(appDir);
-    return { pages, layouts, routeHandlers };
+    return { pages, layouts, routeHandlers, markdownFiles };
 }
 export async function findProjectFile(root, name) {
     for (const ext of CONFIG_EXTENSIONS) {

package/dist/lib/route-builder.d.ts

@@ -1,7 +1,8 @@
-import { type LayoutRoute, type Route, type RouteHandlerRoute } from "./route-matcher.js";
-export declare function buildRoutes(layouts: string[], pages: string[]): Route[];
+import { type LayoutRoute, type PageRoute, type RouteHandlerRoute } from "./route-matcher.js";
+export declare function assertNoMarkdownRoutePath(filePath: string): void;
+export declare function buildRoutes(layouts: string[], pages: string[], markdownFiles?: string[]): PageRoute[];
 /** Build internal layout routes. These routes use the /_rebask/1/{path} URL pattern. */
 export declare function buildLayoutRoutes(layouts: string[]): LayoutRoute[];
 export declare function buildRouteHandlerRoutes(routeHandlers: string[]): RouteHandlerRoute[];
-export declare function assertNoPageRouteHandlerConflicts(pages: string[], routeHandlers: string[]): void;
+export declare function assertNoPageRouteHandlerConflicts(pages: string[], routeHandlers: string[], markdownFiles?: string[]): void;
 //# sourceMappingURL=route-builder.d.ts.map

package/dist/lib/route-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-builder.d.ts","sourceRoot":"","sources":["../../src/lib/route-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,KAAK,WAAW,EAChB,KAAK,KAAK,EACV,KAAK,iBAAiB,EAEtB,MAAM,oBAAoB,CAAA;AAyJ3B,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAgDvE;AAsDD,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAgBlE;AAED,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAYpF;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,QAmBzF"}
+{"version":3,"file":"route-builder.d.ts","sourceRoot":"","sources":["../../src/lib/route-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAKN,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EAEtB,MAAM,oBAAoB,CAAA;AAS3B,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,QASzD;AA6JD,wBAAgB,WAAW,CAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,GAAE,MAAM,EAAO,GAC1B,SAAS,EAAE,CAwEb;AAsDD,wFAAwF;AACxF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,CAgBlE;AAED,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAYpF;AAED,wBAAgB,iCAAiC,CAChD,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,EAAE,EACvB,aAAa,GAAE,MAAM,EAAO,QA6C5B"}

package/dist/lib/route-builder.js

@@ -3,6 +3,15 @@ const PAGE_EXTENSIONS = ["jsx", "js", "tsx", "ts"];
 const pageSuffixRegex = new RegExp(`\\/page\\.(${PAGE_EXTENSIONS.join("|")})$`);
 const layoutSuffixRegex = new RegExp(`\\/layout\\.(${PAGE_EXTENSIONS.join("|")})$`);
 const routeSuffixRegex = new RegExp(`\\/route\\.(${PAGE_EXTENSIONS.join("|")})$`);
+const markdownSuffixRegex = new RegExp(`\\/markdown\\.(md|${PAGE_EXTENSIONS.join("|")})$`);
+const markdownDirectoryRegex = /([^/]*\.md)\//;
+export function assertNoMarkdownRoutePath(filePath) {
+    const segment = markdownDirectoryRegex.exec(filePath)?.[1];
+    if (segment) {
+        throw new Error(`Route "${filePath}" contains the reserved "${segment}" path segment. ` +
+            `Use a markdown.md or markdown.ts file instead, or set markdownUrls: false.`);
+    }
+}
 /**
  * Build a directory-to-file map. e.g: "/app/blog/layout.tsx" -> Map { "/app/blog" => RouteFile }
  */
@@ -52,6 +61,9 @@ function normalizeRouteFile(filePath, suffixRegex) {
     const pathSegments = relativePath.split("/").filter(Boolean);
     const segments = pathSegments.map(parseSegment);
     const urlSegments = segments.filter((segment) => segment.type !== "group");
+    if (typeof __REBASK_MARKDOWN_URLS !== "undefined" && __REBASK_MARKDOWN_URLS) {
+        assertNoMarkdownRoutePath(filePath);
+    }
     for (const [index, segment] of segments.entries()) {
         if (segment.type === "group")
             continue;
@@ -71,6 +83,7 @@ function normalizeRouteFile(filePath, suffixRegex) {
     return {
         filePath,
         dir,
+        hasPage: false,
         segments,
         urlSegments,
         signature: "/" + urlSegments.map(segmentToSignaturePart).filter(Boolean).join("/"),
@@ -97,26 +110,46 @@ function computeShellParams(layouts) {
     }
     return result.size > 0 ? [...result] : undefined;
 }
-export function buildRoutes(layouts, pages) {
-    const pageFiles = pages.map((filePath) => normalizeRouteFile(filePath, pageSuffixRegex));
+export function buildRoutes(layouts, pages, markdownFiles = []) {
+    const pageBySignature = new Map();
+    const routeFiles = pages.map((filePath) => {
+        const file = normalizeRouteFile(filePath, pageSuffixRegex);
+        file.hasPage = true;
+        pageBySignature.set(file.signature, file);
+        return file;
+    });
+    for (const filePath of markdownFiles) {
+        const file = normalizeRouteFile(filePath, markdownSuffixRegex);
+        const pageFile = pageBySignature.get(file.signature);
+        if (pageFile) {
+            pageFile.markdownFilePath = file.filePath;
+        }
+        else {
+            file.markdownFilePath = file.filePath;
+            routeFiles.push(file);
+        }
+    }
     const layoutFiles = layouts.map((filePath) => normalizeRouteFile(filePath, layoutSuffixRegex));
     const layoutMap = buildFileMap(layoutFiles);
-    const routeTree = buildRouteTree(pageFiles, (file) => file.segments);
-    const urlTree = buildRouteTree(pageFiles, (file) => file.urlSegments);
-    assertNoDuplicateRouteSignatures(pageFiles, "page");
+    const routeTree = buildRouteTree(routeFiles, (file) => file.segments);
+    const urlTree = buildRouteTree(routeFiles, (file) => file.urlSegments);
+    assertNoDuplicateRouteSignatures(routeFiles, "page");
     const routes = [];
     function walk(node, segments) {
         if (node.page) {
-            const staticSiblings = getStaticSiblings(node.page, urlTree);
+            const { hasPage, markdownFilePath } = node.page;
+            const staticSiblings = hasPage ? getStaticSiblings(node.page, urlTree) : {};
             const dynamicSegmentNames = getDynamicSegmentNames(segments);
             const pageLayouts = collectAncestorFiles(node.page, layoutMap);
-            const shellParams = computeShellParams(pageLayouts);
+            const shellParams = hasPage ? computeShellParams(pageLayouts) : undefined;
             const shellParamCount = shellParams?.length ?? 0;
             // Intermediate shells only when layout dynamics are a proper subset of the page's dynamics.
             const hasIntermediateShell = shellParamCount > 0 && shellParamCount < dynamicSegmentNames.length;
             routes.push({
                 type: "page",
                 filePath: node.page.filePath,
+                ...(!hasPage && { hasPage: false }),
+                ...(markdownFilePath && { markdownFilePath }),
                 // We always add an empty segment at the end for the page leaf.
                 // This ensures layouts at the same level as the page are properly rendered.
                 // For example, /app/products/layout.tsx + /app/products/page.tsx:
@@ -166,7 +199,7 @@ function getStaticSiblings(file, node) {
         if (segment.type !== "static") {
             const siblings = [];
             for (const child of node.children.values()) {
-                if (child.segment?.type === "static" && child.page) {
+                if (child.segment?.type === "static" && child.page?.hasPage) {
                     siblings.push({ name: child.segment.value, filePath: child.page.filePath });
                 }
             }
@@ -200,18 +233,33 @@ export function buildRouteHandlerRoutes(routeHandlers) {
         segments: file.segments,
     }));
 }
-export function assertNoPageRouteHandlerConflicts(pages, routeHandlers) {
+export function assertNoPageRouteHandlerConflicts(pages, routeHandlers, markdownFiles = []) {
     const pageBySignature = new Map();
     for (const pagePath of pages) {
         const pageFile = normalizeRouteFile(pagePath, pageSuffixRegex);
         pageBySignature.set(pageFile.signature, pageFile.filePath);
     }
+    const markdownBySignature = new Map();
+    for (const markdownPath of markdownFiles) {
+        const markdownFile = normalizeRouteFile(markdownPath, markdownSuffixRegex);
+        const existing = markdownBySignature.get(markdownFile.signature);
+        if (existing) {
+            throw new Error(`Cannot define both markdown.md and markdown.ts for the same route signature: ` +
+                `${existing} and ${markdownPath}.`);
+        }
+        markdownBySignature.set(markdownFile.signature, markdownPath);
+    }
     for (const routePath of routeHandlers) {
         const routeFile = normalizeRouteFile(routePath, routeSuffixRegex);
         const pagePath = pageBySignature.get(routeFile.signature);
-        if (!pagePath)
-            continue;
-        throw new Error(`Cannot define both page and route handler for the same route signature: ` +
-            `${pagePath} and ${routePath}.`);
+        if (pagePath) {
+            throw new Error(`Cannot define both page and route handler for the same route signature: ` +
+                `${pagePath} and ${routePath}.`);
+        }
+        const markdownPath = markdownBySignature.get(routeFile.signature);
+        if (markdownPath) {
+            throw new Error(`Cannot define both markdown and route handler for the same route signature: ` +
+                `${markdownPath} and ${routePath}.`);
+        }
     }
 }

package/dist/lib/route-matcher.d.ts

@@ -28,6 +28,10 @@ export type PageRoute = RouteBase & {
     filePath: string;
     /** Dynamic segment names from layout paths (params baked into intermediate shells). */
     shellParams?: string[];
+    /** Whether the route has a `page.tsx` module. */
+    hasPage?: boolean;
+    /** The Markdown source file, relative to the app root. */
+    markdownFilePath?: string;
 };
 export type NotFoundRoute = RouteBase & {
     type: "not-found";

package/dist/lib/route-matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-matcher.d.ts","sourceRoot":"","sources":["../../src/lib/route-matcher.ts"],"names":[],"mappings":"AAEA,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AACtD,KAAK,cAAc,GAAG;IAAE,IAAI,EAAE,SAAS,GAAG,WAAW,GAAG,oBAAoB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAC5F,KAAK,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,YAAY,CAAA;AAExE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;AAEvE,eAAO,MAAM,YAAY,YAAI,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAA;AAEjG,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAA;AAEtD,KAAK,SAAS,GAAG;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,oFAAoF;IACpF,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,uFAAuF;IACvF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAA;AAE7D,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAEtD,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,KAAK,CAAA;IACZ;;;OAGG;IACH,MAAM,EAAE,WAAW,CAAA;CACnB,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CA0B1D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAElE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,IAAI,cAAc,CAEzE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAMzE"}
+{"version":3,"file":"route-matcher.d.ts","sourceRoot":"","sources":["../../src/lib/route-matcher.ts"],"names":[],"mappings":"AAEA,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AACtD,KAAK,cAAc,GAAG;IAAE,IAAI,EAAE,SAAS,GAAG,WAAW,GAAG,oBAAoB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AAC5F,KAAK,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,YAAY,CAAA;AAExE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;AAEvE,eAAO,MAAM,YAAY,YAAI,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAA;AAEjG,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAA;AAEtD,KAAK,SAAS,GAAG;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;IACxB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,oFAAoF;IACpF,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,uFAAuF;IACvF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,iDAAiD;IACjD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAA;AAE7D,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAEtD,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,YAAY,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,aAAa,GAAG,UAAU,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,KAAK,CAAA;IACZ;;;OAGG;IACH,MAAM,EAAE,WAAW,CAAA;CACnB,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CA0B1D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAElE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,IAAI,cAAc,CAEzE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAMzE"}

package/dist/lib/rsc-request.d.ts.map

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

package/dist/lib/rsc-request.js

@@ -8,11 +8,11 @@ import { CacheKeyTag } from "./cache-key-tags.js";
 import { getCacheKey } from "./cache-keys.js";
 import { streamFromCachePayload, streamToCachePayload } from "./cache-payload.js";
 import { CacheEntryType, STATIC } from "./cache-storage.js";
-import { getCacheHandler } from "./config.js";
+import { cacheStatusHeader, getCacheHandler } from "./config.js";
 import { getDeploymentIdHeader } from "./deployment-id.js";
 import { renderChannel, rscChannel } from "./devtools-channels.js";
 import { isHangingPromiseError, isPrerenderAbortError, SERVER_RENDER_ERROR_DIGEST, } from "./errors.js";
-import { getCacheControlHeader, REBASK_CACHE_HEADER, REBASK_RSC_VARY_HEADER, REBASK_TAIL_HEADER, REBASK_TRAILER_HEADER, RebaskCacheStatus, } from "./ppr/headers.js";
+import { getCacheControlHeader, REBASK_RSC_VARY_HEADER, REBASK_TAIL_HEADER, REBASK_TRAILER_HEADER, RebaskCacheStatus, } from "./ppr/headers.js";
 import { RenderStorage } from "./render-context.js";
 import { MicrotaskStorage } from "./scheduler-patch.js";
 import { recordRenderDuration } from "./telemetry.js";
@@ -77,7 +77,7 @@ export function createRscResponse(rscStream, options = {}) {
         headers: mergeResponseHeaders({
             ...(contentType && { "content-type": contentType }),
             vary: REBASK_RSC_VARY_HEADER,
-            [REBASK_CACHE_HEADER]: cacheStatus,
+            ...cacheStatusHeader(cacheStatus),
             ...(cacheControl && { "cache-control": cacheControl }),
             ...(tagHeader && tags?.length && { [tagHeader]: tags.join(",") }),
             ...(tailId && { [REBASK_TAIL_HEADER]: tailId }),

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

@@ -1 +1 @@
-{"version":3,"file":"get-router.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/get-router.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAoL9C,yDAAyD;AACzD,wBAAsB,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,CAiBvD"}
+{"version":3,"file":"get-router.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/get-router.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA6O9C,yDAAyD;AACzD,wBAAsB,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,CA4BvD"}