@rsc-kit/core 0.20.10 → 0.20.11

package/dist/host.d.ts

@@ -60,7 +60,16 @@ export interface RscEngine {
     handleRscResume?(component: string, props?: Record<string, unknown>, layouts?: {
         component: string;
         props: Record<string, unknown>;
-    }[], loadings?: string[], parallelSlots?: Record<string, string>, slotOverrides?: Record<string, unknown>, postponed?: unknown, nonce?: string, pageKey?: string, pathname?: string | null): Promise<{
+    }[], loadings?: string[], parallelSlots?: Record<string, string>, slotOverrides?: Record<string, unknown>, postponed?: unknown, nonce?: string, pageKey?: string, pathname?: string | null, 
+    /**
+     * The real params, for the holes.
+     *
+     * Separate from `props`, which is the shape the shell was frozen with.
+     * A pattern shell is rendered with a placeholder per param, and the
+     * resume has to render the same tree above the holes or React cannot
+     * line them up; the values the holes need travel here.
+     */
+    params?: Record<string, string>): Promise<{
         htmlStream: ReadableStream;
     }>;
     handleRscRevalidate?(target: string, page: unknown): Promise<{

package/dist/host.js

@@ -14,7 +14,7 @@
 //   const rsc = createRscHandler({ engine, manifest, assets })
 //   Bun.serve({ fetch: (req) => rsc(req).then((r) => r ?? new Response('', { status: 404 })) })
 import { allowFor, matchApiRoute, matchIntercept, matchRoute, retentionKey, sharedDepth, } from "./routing.js";
-import { pathKey, patternKey } from "./prerender.js";
+import { PARAM_PLACEHOLDER, pathKey, patternKey } from "./prerender.js";
 import { apiKey } from "./apiPrerender.js";
 import { hostPath, hostSegment, routableHost } from "./hostRouting.js";
 import { withRevalidation } from "./revalidate.js";
@@ -1034,7 +1034,19 @@ export function createRscHandler(options) {
             // good. Fall through and render the page now instead.
             if (state === null || !engine.handleRscResume || !route)
                 return null;
-            const { htmlStream } = await engine.handleRscResume(route.route.component, route.params, 
+            // A shell stored for the pattern was frozen with a placeholder for
+            // every param - the build had no url to render for - and the tree
+            // above its holes was shaped by those. Handing the real ones back
+            // here renders a different tree wherever anything branches on a
+            // param above a boundary, and React refuses to line the slots up:
+            // "Expected the resume to render <X> in this slot but instead it
+            // rendered <Y>", every hole client-rendered, a production page that
+            // arrives inert. So the resume gets the shape the shell had, and the
+            // values go to the holes through `params`.
+            const forShape = shellKey === key
+                ? route.params
+                : Object.fromEntries(Object.keys(route.params).map((name) => [name, PARAM_PLACEHOLDER]));
+            const { htmlStream } = await engine.handleRscResume(route.route.component, forShape, 
             // Empty props, because that is what the build passed. Resuming replays
             // the tree against the slots the shell left, and React matches those by
             // key — so an argument that differs from the frozen render at all is a
@@ -1046,7 +1058,7 @@ export function createRscHandler(options) {
             // key the tree differently from the one being resumed.
             shellKey === key ? url.pathname : "", 
             // But the url itself, for the hooks: the holes are rendered for it.
-            url.pathname);
+            url.pathname, route.params);
             // A shell stored for the pattern was built without a url, so its title
             // is the layouts' - the page's generateMetadata reads the params and
             // was left out. This request has the params.