@rebask/core 0.2.0 → 0.3.0

package/dist/vite.d.ts

@@ -1,7 +1,8 @@
 import { type Plugin } from "vite";
+import { REBASK_PLUGIN_NAME } from "./lib/plugin-names.js";
 import type { LayoutRoute, Route, RouteHandlerRoute } from "./lib/route-matcher.js";
-/** The `name` of the Vite plugin. */
-export declare const REBASK_PLUGIN_NAME = "rebask:app-config";
+import type { MatcherEntry } from "./lib/server-router/types.js";
+export { REBASK_PLUGIN_NAME };
 type ShellPrerenderBase = {
     filePath: string;
     postponedState: string;
@@ -58,6 +59,11 @@ export interface RebaskPluginApi {
     getLayoutRoutes: () => LayoutRoute[];
     /** Get route handler routes (available after RSC build) */
     getRouteHandlerRoutes: () => RouteHandlerRoute[];
+    /**
+     * Get the entries used to build a compiled router. Their order matches the entries passed to
+     * `createMatcher` at runtime, so compiled indexes resolve correctly. Scans routes on first use.
+     */
+    getMatcherEntries: () => Promise<MatcherEntry[]>;
     /** Whether routes with a Markdown representation are also served at `.md` URLs. */
     hasMarkdownUrls: () => boolean;
     /** Get the built RSC entry, which a platform can move out of `dist` (available after config resolution) */
@@ -138,5 +144,4 @@ export interface RebaskPluginOptions {
     shellPrerenderTimeout?: number;
 }
 export declare function rebask(options?: RebaskPluginOptions): Plugin[];
-export {};
 //# sourceMappingURL=vite.d.ts.map

package/dist/vite.d.ts.map

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

package/dist/vite.js

@@ -1,22 +1,28 @@
 import { randomBytes } from "node:crypto";
 import { rm, stat } from "node:fs/promises";
+import { createRequire } from "node:module";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parse } from "vite";
 import { notifyRscUpdate, setDevServer } from "./lib/dev-server.js";
 import { SCOPED_CACHE_DIR } from "./lib/file-system-cache.js";
 import { headPlugin } from "./lib/head/head-plugin.js";
+import { REBASK_IMAGE_PLUGIN_NAME, } from "./lib/image-optimization/image-plugin.js";
+import { REBASK_PLUGIN_NAME } from "./lib/plugin-names.js";
+import { getPluginApi } from "./lib/plugin-utils.js";
 import { CONFIG_EXTENSIONS, findProjectFile, PAGE_EXTENSIONS, scanAppDirectory, } from "./lib/project-files.js";
 import { assertNoPageRouteHandlerConflicts, buildLayoutRoutes, buildRouteHandlerRoutes, buildRoutes, } from "./lib/route-builder.js";
+import { buildRouteEntries } from "./lib/server-router/route-entries.js";
 import { useCachePlugin } from "./lib/use-cache-plugin.js";
 import { devtoolsPlugin } from "./plugins/devtools.js";
 import { pprPlugin } from "./plugins/ppr.js";
-import { prerenderPlugin } from "./plugins/prerender.js";
+import { prerenderPlugin, routeMetadataPlugin } from "./plugins/prerender.js";
 import { proxyPlugin } from "./plugins/proxy.js";
-import { rebaskRouter } from "./plugins/router/router-plugin.js";
+import { defaultRouterPlugin } from "./plugins/router/router-plugin.js";
 import { serverOnlyPlugin } from "./plugins/server-only-plugin.js";
-/** The `name` of the Vite plugin. */
-export const REBASK_PLUGIN_NAME = "rebask:app-config";
+const require = createRequire(import.meta.url);
+const rebaskVersion = require("../package.json").version;
+export { REBASK_PLUGIN_NAME };
 const BROWSER_ENTRY = fileURLToPath(new URL("./entry.browser.js", import.meta.url));
 const APP_CONFIG_MODULE_ID = "\0virtual:rebask/config";
 async function hasUseClientDirective(code, id) {
@@ -92,9 +98,18 @@ export function rebask(options = {}) {
     let routes = [];
     let layoutRoutes = [];
     let routeHandlerRoutes = [];
+    let routesScan = null;
+    let imageApi;
     const rscClientModules = new Set();
     const shellPrerenders = [];
     const cacheFunctions = new Map();
+    const stubHandler = async () => new Response();
+    const stubHandlers = {
+        page: () => stubHandler,
+        markdown: () => stubHandler,
+        routeHandler: () => stubHandler,
+        layout: () => stubHandler,
+    };
     const api = {
         getRoutes: () => routes,
         getLayoutRscRoutes: () => layoutRoutes.map((route) => ({
@@ -108,6 +123,13 @@ export function rebask(options = {}) {
         })),
         getLayoutRoutes: () => layoutRoutes,
         getRouteHandlerRoutes: () => routeHandlerRoutes,
+        async getMatcherEntries() {
+            await ensureRoutes();
+            const imagePattern = imageApi && (await imageApi.hasHandler()) ? imageApi.getImageConfig().path : null;
+            const imageEntry = imagePattern ? { pattern: imagePattern, handler: stubHandler } : null;
+            const { entries } = buildRouteEntries(routes, routeHandlerRoutes, layoutRoutes, imageEntry, stubHandlers);
+            return entries.map(({ methods, pattern }) => ({ methods, pattern }));
+        },
         hasMarkdownUrls: () => markdownUrls,
         getRscEntry: () => rscEntry,
         setDeploymentId: (deploymentId) => {
@@ -121,6 +143,24 @@ export function rebask(options = {}) {
             shellPrerenders.push(result);
         },
     };
+    async function ensureRoutes() {
+        if (!routesScan) {
+            routesScan = (async () => {
+                const appDir = join(projectRoot, "app");
+                await stat(appDir).catch((error) => {
+                    if (error?.code !== "ENOENT") {
+                        throw error;
+                    }
+                });
+                const { pages, layouts, routeHandlers, markdownFiles } = await scanAppDirectory(appDir, markdownUrls);
+                assertNoPageRouteHandlerConflicts(pages, routeHandlers, markdownFiles);
+                routeHandlerRoutes = buildRouteHandlerRoutes(routeHandlers);
+                routes = buildRoutes(layouts, pages, markdownFiles);
+                layoutRoutes = buildLayoutRoutes(layouts);
+            })();
+        }
+        await routesScan;
+    }
     const plugins = [
         {
             name: "rebask:runtime-config",
@@ -129,6 +169,7 @@ export function rebask(options = {}) {
                 projectRoot = config.root;
                 rscEntry = resolve(config.root, config.environments.rsc.build.outDir, "index.js");
                 isBuild = config.command === "build";
+                imageApi = getPluginApi(config.plugins, REBASK_IMAGE_PLUGIN_NAME);
             },
             async resolveId(id) {
                 if (id === "virtual:rebask/runtime-config") {
@@ -182,6 +223,7 @@ export function rebask(options = {}) {
             async config() {
                 return {
                     define: {
+                        __REBASK_VERSION__: JSON.stringify(rebaskVersion),
                         __REBASK_FULL_HTML_FOR_BOTS: JSON.stringify(fullHtmlForBots),
                         __REBASK_MARKDOWN_URLS: JSON.stringify(markdownUrls),
                         __REBASK_DEDUPE_FETCH: JSON.stringify(dedupeFetch),
@@ -368,24 +410,8 @@ export function rebask(options = {}) {
                 if (id !== APP_CONFIG_MODULE_ID)
                     return;
                 // In development the router builds its routes from the app manifest on each request.
-                if (this.environment.mode === "build") {
-                    const appDir = join(projectRoot, "app");
-                    await stat(appDir).catch((error) => {
-                        // If app directory doesn't exist, use empty routes
-                        if (error?.code !== "ENOENT") {
-                            throw error;
-                        }
-                    });
-                    const { pages, layouts, routeHandlers, markdownFiles } = await scanAppDirectory(appDir, markdownUrls);
-                    assertNoPageRouteHandlerConflicts(pages, routeHandlers, markdownFiles);
-                    routeHandlerRoutes = buildRouteHandlerRoutes(routeHandlers);
-                    // Generate page/layout routes only for the RSC environment
-                    if (this.environment.name === "rsc") {
-                        // Store routes in shared state (accessible via plugin API)
-                        routes = buildRoutes(layouts, pages, markdownFiles);
-                        layoutRoutes = buildLayoutRoutes(layouts);
-                    }
-                }
+                if (this.environment.mode === "build")
+                    await ensureRoutes();
                 return [
                     `export const routes = ${JSON.stringify(routes, null, 2)};`,
                     `export const layoutRoutes = ${JSON.stringify(layoutRoutes, null, 2)};`,
@@ -429,21 +455,23 @@ export function rebask(options = {}) {
                 }
             },
         },
-        { ...rebaskRouter(), name: "rebask:server-router-fallback", enforce: "post" },
+        defaultRouterPlugin(),
         proxyPlugin(api),
         pprPlugin(),
         serverOnlyPlugin(),
         useCachePlugin(cacheFunctions),
         {
-            name: "rebask:scoped-cache",
+            name: "rebask:build-cache",
             buildApp: {
                 order: "pre",
                 async handler() {
-                    // Scoped entries belong to the previous deployment.
-                    await rm(join(process.cwd(), "dist", ".rebask", "cache", SCOPED_CACHE_DIR), {
-                        recursive: true,
-                        force: true,
-                    });
+                    const rebaskDir = join(process.cwd(), "dist", ".rebask");
+                    // Scoped entries belong to the previous deployment. The manifest is about to be
+                    // regenerated, and a stale one would make a no-prerender build trust old route data.
+                    await Promise.all([
+                        rm(join(rebaskDir, "cache", SCOPED_CACHE_DIR), { recursive: true, force: true }),
+                        rm(join(rebaskDir, "prerendered-paths.json"), { force: true }),
+                    ]);
                 },
             },
         },
@@ -452,5 +480,8 @@ export function rebask(options = {}) {
         const prerenderOptions = typeof prerender === "object" ? prerender : {};
         plugins.push(prerenderPlugin(api, prerenderOptions));
     }
+    else {
+        plugins.push(routeMetadataPlugin(api));
+    }
     return plugins;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebask/core",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Vite plugin and runtime for React Server Components",
   "homepage": "https://github.com/lfades/vext#readme",
   "license": "MIT",
@@ -145,8 +145,8 @@
   "dependencies": {
     "@lfades/atom": "^3.0.0",
     "@opentelemetry/api": "~1.9.1",
-    "rsc-html-stream": "^0.0.8",
-    "wint-js": "^1.2.7"
+    "rou3": "^1.0.0",
+    "rsc-html-stream": "^0.0.8"
   },
   "devDependencies": {
     "@opentelemetry/context-async-hooks": "^2.12.0",
@@ -177,6 +177,7 @@
     "dev": "tsc -p tsconfig.build.json -w",
     "build": "tsc -p tsconfig.build.json",
     "test:unit": "vitest run",
-    "test:dev": "vitest"
+    "test:dev": "vitest",
+    "publint": "publint"
   }
 }