@rebask/core 0.2.1 → 0.4.0

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

@@ -0,0 +1,16 @@
+import { addRoute, createRouter, findRoute } from "rou3";
+export function createMatcher(entries) {
+    const router = createRouter();
+    for (const entry of entries) {
+        for (const method of entry.methods)
+            addRoute(router, method, entry.pattern, entry);
+    }
+    return {
+        find(method, url) {
+            const match = findRoute(router, method, new URL(url, "http://localhost").pathname);
+            if (!match)
+                return null;
+            return { entry: match.data, params: match.params };
+        },
+    };
+}

package/dist/plugins/router/router-plugin.d.ts

@@ -1,15 +1,18 @@
 import type { Plugin } from "vite";
+import type { MatcherEntry } from "../../lib/server-router/types.js";
 export interface RouterPluginOptions {
     /** Plugin name. */
     name: string;
     /** Absolute path to the module that exports `createMatcher`. */
     matcherModule: string;
+    /** Compiles the matcher entries into the source of a `find` function for production builds. */
+    compile?: (entries: readonly MatcherEntry[]) => string;
 }
 /**
  * Create a Vite plugin that provides a custom server router for Rebask.
  *
- * The plugin resolves `virtual:rebask/server-router` to the given `matcherModule`, which must
- * export a `createMatcher` function.
+ * `matcherModule` provides `createMatcher` in development, and in production unless `compile` is
+ * provided. `compile` replaces it in production builds.
  *
  * @example
  * ```ts
@@ -24,18 +27,5 @@ export interface RouterPluginOptions {
  * ```
  */
 export declare function createRouterPlugin(options: RouterPluginOptions): Plugin;
-/**
- * Default router of Rebask. Adding it manually is optional.
- *
- * @example
- * ```ts
- * import { rebask } from "@rebask/core/vite"
- * import { rebaskRouter } from "@rebask/core/server-router"
- *
- * export default defineConfig({
- *   plugins: [rsc(), react(), rebask(), rebaskRouter()],
- * })
- * ```
- */
-export declare function rebaskRouter(): Plugin;
+export declare function defaultRouterPlugin(): Plugin;
 //# sourceMappingURL=router-plugin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/router/router-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,MAAM,WAAW,mBAAmB;IACnC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAYvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAKrC"}
+{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/router/router-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAGlC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAMpE,MAAM,WAAW,mBAAmB;IACnC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAA;IACrB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,KAAK,MAAM,CAAA;CACtD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAkCvE;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAiB5C"}

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

@@ -1,10 +1,14 @@
+import { addRoute, createRouter } from "rou3";
+import { compileRouterToString } from "rou3/compiler";
+import { REBASK_PLUGIN_NAME } from "../../lib/plugin-names.js";
+import { getPluginApi } from "../../lib/plugin-utils.js";
 const VIRTUAL_MODULE_ID = "virtual:rebask/server-router";
 const RESOLVED_MODULE_ID = "\0virtual:rebask/server-router";
 /**
  * Create a Vite plugin that provides a custom server router for Rebask.
  *
- * The plugin resolves `virtual:rebask/server-router` to the given `matcherModule`, which must
- * export a `createMatcher` function.
+ * `matcherModule` provides `createMatcher` in development, and in production unless `compile` is
+ * provided. `compile` replaces it in production builds.
  *
  * @example
  * ```ts
@@ -19,36 +23,53 @@ const RESOLVED_MODULE_ID = "\0virtual:rebask/server-router";
  * ```
  */
 export function createRouterPlugin(options) {
+    let isBuild = false;
+    let api;
     return {
         name: options.name,
         enforce: "pre",
+        configResolved(config) {
+            isBuild = config.command === "build";
+            if (options.compile) {
+                api = getPluginApi(config.plugins, REBASK_PLUGIN_NAME);
+            }
+        },
         resolveId(id) {
             if (id === VIRTUAL_MODULE_ID)
                 return RESOLVED_MODULE_ID;
         },
-        load(id) {
+        async load(id) {
             if (id !== RESOLVED_MODULE_ID)
                 return;
-            return `export { createMatcher } from ${JSON.stringify(options.matcherModule)};`;
+            if (!options.compile || !isBuild) {
+                return `export { createMatcher } from ${JSON.stringify(options.matcherModule)};`;
+            }
+            if (!api) {
+                throw new Error('createRouterPlugin with "compile" requires the Rebask Vite plugin.');
+            }
+            const entries = await api.getMatcherEntries();
+            return [
+                `import { createCompiledMatcher } from "@rebask/core/server-router";`,
+                `const find = ${options.compile(entries)};`,
+                `export function createMatcher(entries) { return createCompiledMatcher(find, entries); }`,
+            ].join("\n");
         },
     };
 }
-/**
- * Default router of Rebask. Adding it manually is optional.
- *
- * @example
- * ```ts
- * import { rebask } from "@rebask/core/vite"
- * import { rebaskRouter } from "@rebask/core/server-router"
- *
- * export default defineConfig({
- *   plugins: [rsc(), react(), rebask(), rebaskRouter()],
- * })
- * ```
- */
-export function rebaskRouter() {
-    return createRouterPlugin({
-        name: "rebask:router",
-        matcherModule: new URL("./wint-router.js", import.meta.url).pathname,
-    });
+export function defaultRouterPlugin() {
+    return {
+        ...createRouterPlugin({
+            name: "rebask:server-router",
+            matcherModule: new URL("./rou3-router.js", import.meta.url).pathname,
+            compile: (entries) => {
+                const router = createRouter();
+                for (const [index, entry] of entries.entries()) {
+                    for (const method of entry.methods)
+                        addRoute(router, method, entry.pattern, index);
+                }
+                return compileRouterToString(router);
+            },
+        }),
+        enforce: "post",
+    };
 }

package/dist/proxy.d.ts

@@ -1,4 +1,5 @@
 export { rewrite } from "./lib/proxy/rewrite.js";
 export { REBASK_PROXY_BUNDLE_PATH } from "./lib/proxy/types.js";
 export type { ProxyBundle, ProxyHandler, ProxyRoutes, ProxyRouter } from "./lib/proxy/types.js";
+export { proxyPatternToRegExpSource } from "./lib/proxy/pattern.js";
 //# sourceMappingURL=proxy.d.ts.map

package/dist/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA"}

package/dist/proxy.js

@@ -1,2 +1,3 @@
 export { rewrite } from "./lib/proxy/rewrite.js";
 export { REBASK_PROXY_BUNDLE_PATH } from "./lib/proxy/types.js";
+export { proxyPatternToRegExpSource } from "./lib/proxy/pattern.js";

package/dist/request-context.d.ts

@@ -96,8 +96,6 @@ export declare function trackRequestIO(): void;
 export declare function hasRequestIO(): boolean;
 /** Record that the render read `key` and the value `get` returned for it. */
 export declare function trackSearchParam(key: string, value: SearchParamValue): void;
-/** The search params a render read, or `undefined` when it read none. */
-export declare function getUsedSearch(): UsedSearch | undefined;
 /** Whether the render read dynamic data (`routeParams()`, `headers()`, `cookies()`). */
 export declare function hasDynamicIO(): boolean;
 /** Marks that the render failed. */

package/dist/request-context.d.ts.map

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

package/dist/request-context.js

@@ -51,10 +51,6 @@ export function trackSearchParam(key, value) {
     state.usedSearch ??= new Map();
     state.usedSearch.set(key, value);
 }
-/** The search params a render read, or `undefined` when it read none. */
-export function getUsedSearch() {
-    return getRequiredRequestState("getUsedSearch()").usedSearch;
-}
 /** Whether the render read dynamic data (`routeParams()`, `headers()`, `cookies()`). */
 export function hasDynamicIO() {
     return getRequiredRequestState("hasDynamicIO()").dynamicIO ?? false;

package/dist/router.d.ts

@@ -22,7 +22,7 @@ export type NavigateOptions = {
     /** Control window scrolling after navigation. Defaults to `true`. */
     scroll?: boolean;
 };
-export declare const proxyPatternsAtom: import("@lfades/atom").Atom<string[] | undefined>;
+export declare const proxyRegexpsAtom: import("@lfades/atom").Atom<string[] | undefined>;
 /** The tags and segment paths a cache invalidation affected. */
 type CacheInvalidation = {
     tags: string[];

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

@@ -28,7 +28,7 @@ const inflightTreeCache = new Map();
 const inflightRouteTreeByParent = new Map();
 const inflightSegmentCache = new Map();
 const inflightShellCache = new Map();
-export const proxyPatternsAtom = atom(undefined);
+export const proxyRegexpsAtom = atom(undefined);
 /** Latest cache invalidation, or `null` before the first one. */
 const cacheInvalidationAtom = atom(null);
 /**
@@ -593,8 +593,8 @@ class Router {
         const parentPathname = `/${segments.slice(0, -1).join("/")}`;
         const inflightSiblingTree = inflightRouteTreeByParent.get(parentPathname);
         if (cache) {
-            const proxyPatterns = proxyPatternsAtom.get();
-            const predicted = predictRouteTree(target.href, proxyPatterns);
+            const proxyRegexps = proxyRegexpsAtom.get();
+            const predicted = predictRouteTree(target.href, proxyRegexps);
             if (predicted) {
                 this.cache.registerRouteTree(predicted);
                 return predicted;
@@ -667,7 +667,7 @@ class Router {
             return;
         const target = getUrl(url);
         const routeTreeResponse = this.cache.getRouteTreeResponse(target.href) ??
-            predictRouteTree(target.href, proxyPatternsAtom.get()) ??
+            predictRouteTree(target.href, proxyRegexpsAtom.get()) ??
             (await this.prefetchRouteTree(url));
         const expectedRoutePrediction = routeTreeResponse.routePrediction;
         const missing = this.cache.findMissingSegmentLocations(routeTreeResponse);

package/dist/server-router.d.ts

@@ -1,5 +1,5 @@
-export { RouteType } from "./lib/server-router/types.js";
-export type { CreateMatcherFn, MatchedHandler, RouteEntry, RouteMatcher, } from "./lib/server-router/types.js";
+export type { CreateMatcherFn, MatcherEntry, 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";
+export { createCompiledMatcher, type CompiledFind } from "./plugins/router/rou3-compiled.js";
+export { createRouterPlugin, 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,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"}
+{"version":3,"file":"server-router.d.ts","sourceRoot":"","sources":["../src/server-router.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAC/F,YAAY,EACX,WAAW,EACX,aAAa,EACb,KAAK,EACL,YAAY,EACZ,iBAAiB,GACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAC5F,OAAO,EAAE,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,MAAM,mCAAmC,CAAA"}

package/dist/server-router.js

@@ -1,2 +1,2 @@
-export { RouteType } from "./lib/server-router/types.js";
-export { createRouterPlugin, rebaskRouter, } from "./plugins/router/router-plugin.js";
+export { createCompiledMatcher } from "./plugins/router/rou3-compiled.js";
+export { createRouterPlugin } from "./plugins/router/router-plugin.js";

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),
@@ -225,10 +267,18 @@ export function rebask(options = {}) {
                         },
                     },
                     optimizeDeps: {
-                        // Point Vite's dep scanner at user app files so it discovers their bare imports at
-                        // startup. Without this, user deps are discovered mid-hydration and that causes us to
-                        // potentially have duplicated React issues.
-                        entries: ["app/**/*.{tsx,ts,jsx,js}", BROWSER_ENTRY],
+                        // Point Vite's dep scanner at user source so it discovers bare imports at startup.
+                        // App files cover the static route graph. The JSX/TSX glob also covers components
+                        // reached only through computed imports, which would otherwise trigger a late
+                        // re-optimization that duplicates React during a client navigation.
+                        entries: [
+                            "app/**/*.{tsx,ts,jsx,js}",
+                            "**/*.{tsx,jsx}",
+                            "!**/*.test.{tsx,jsx}",
+                            "!**/*.spec.{tsx,jsx}",
+                            "!**/__tests__/**",
+                            BROWSER_ENTRY,
+                        ],
                         // Exclude the framework itself so Vite serves it as native ESM instead of pre-bundling
                         // it. If `@rebask/core` is pre-bundled, React would be baked into the optimized chunk,
                         // resulting in two React copies (one inside the framework chunk, one for app code).
@@ -368,24 +418,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 +463,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 +488,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.1",
+  "version": "0.4.0",
   "description": "Vite plugin and runtime for React Server Components",
   "homepage": "https://github.com/lfades/vext#readme",
   "license": "MIT",
@@ -145,8 +145,9 @@
   "dependencies": {
     "@lfades/atom": "^3.0.0",
     "@opentelemetry/api": "~1.9.1",
-    "rsc-html-stream": "^0.0.8",
-    "wint-js": "^1.2.7"
+    "image-size": "^2.1.0",
+    "rou3": "^1.0.0",
+    "rsc-html-stream": "^0.0.8"
   },
   "devDependencies": {
     "@opentelemetry/context-async-hooks": "^2.12.0",
@@ -177,6 +178,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"
   }
 }

package/dist/components/error-boundary-client.d.ts

@@ -1,49 +0,0 @@
-import { Component, type ReactNode } from "react";
-import type { RevisionSnapshot, RouterCache } from "../lib/router-cache.js";
-type BoundaryRenderProps = {
-    children: ReactNode;
-    fallback: ReactNode;
-    hasError?: boolean;
-};
-export type BoundaryClientProps = BoundaryRenderProps & {
-    boundaryKey: string;
-};
-type BoundaryCacheState = {
-    boundaryKey: string;
-    segmentPath: string;
-    snapshot: RevisionSnapshot;
-    failed: boolean;
-};
-type ErrorBoundaryClientInnerProps = BoundaryRenderProps & BoundaryCacheState;
-type BoundaryCacheStateResult = BoundaryCacheState & {
-    acceptsServerError: boolean;
-};
-type ErrorBoundaryClientState = {
-    hasError: boolean;
-    snapshot: RevisionSnapshot;
-};
-export declare class ErrorBoundaryClientInner extends Component<ErrorBoundaryClientInnerProps, ErrorBoundaryClientState> {
-    static contextType: import("react").Context<RouterCache | null>;
-    context: RouterCache | null;
-    state: ErrorBoundaryClientState;
-    constructor(props: ErrorBoundaryClientInnerProps);
-    static getDerivedStateFromProps(props: ErrorBoundaryClientInnerProps, state: ErrorBoundaryClientState): {
-        hasError: boolean;
-        snapshot: RevisionSnapshot;
-    } | {
-        snapshot?: undefined;
-        hasError: boolean;
-    } | null;
-    static getDerivedStateFromError(error: Error): {
-        hasError: boolean;
-    };
-    componentDidMount(): void;
-    componentDidUpdate(_prevProps: ErrorBoundaryClientInnerProps, prevState: ErrorBoundaryClientState): void;
-    componentDidCatch(error: Error): void;
-    render(): ReactNode;
-    protected recordFailure(): void;
-}
-export declare function ErrorBoundaryClient(props: BoundaryClientProps): import("react").JSX.Element;
-export declare function useBoundaryCacheState(boundaryKey: string): BoundaryCacheStateResult;
-export {};
-//# sourceMappingURL=error-boundary-client.d.ts.map

package/dist/components/error-boundary-client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-boundary-client.d.ts","sourceRoot":"","sources":["../../src/components/error-boundary-client.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAwB,MAAM,OAAO,CAAA;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAK3E,KAAK,mBAAmB,GAAG;IAC1B,QAAQ,EAAE,SAAS,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/E,KAAK,kBAAkB,GAAG;IACzB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,MAAM,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,6BAA6B,GAAG,mBAAmB,GAAG,kBAAkB,CAAA;AAE7E,KAAK,wBAAwB,GAAG,kBAAkB,GAAG;IAAE,kBAAkB,EAAE,OAAO,CAAA;CAAE,CAAA;AAEpF,KAAK,wBAAwB,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAA;AAEjF,qBAAa,wBAAyB,SAAQ,SAAS,CACtD,6BAA6B,EAC7B,wBAAwB,CACxB;IACA,OAAgB,WAAW,8CAAqB;IAEvC,OAAO,EAAE,WAAW,GAAG,IAAI,CAAO;IAClC,KAAK,EAAE,wBAAwB,CAAA;IAExC,YAAY,KAAK,EAAE,6BAA6B,EAM/C;IAED,MAAM,CAAC,wBAAwB,CAC9B,KAAK,EAAE,6BAA6B,EACpC,KAAK,EAAE,wBAAwB;;;;;;aAQ/B;IAED,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;QAElC,QAAQ;MACjB;IAEQ,iBAAiB,SAEzB;IAEQ,kBAAkB,CAC1B,UAAU,EAAE,6BAA6B,EACzC,SAAS,EAAE,wBAAwB,QAQnC;IAEQ,iBAAiB,CAAC,KAAK,EAAE,KAAK,QAGtC;IAEQ,MAAM,cAEd;IAED,SAAS,CAAC,aAAa,SAMtB;CACD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,+BAU7D;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB,CAenF"}