@rangojs/router 0.11.0 → 0.12.1

package/dist/testing/vitest.js

@@ -1,8 +1,21 @@
 // src/testing/vitest.ts
-import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+import { fileURLToPath, pathToFileURL } from "node:url";
 function here(relativeFromRoot) {
   return fileURLToPath(new URL(`../../${relativeFromRoot}`, import.meta.url));
 }
+var RSD_SERVER_EDGE_SPEC = "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
+var requireFromHere = createRequire(
+  import.meta.url
+);
+function resolveFromRouter(spec) {
+  try {
+    return requireFromHere.resolve(spec);
+  } catch {
+    return void 0;
+  }
+}
+var rsdServerEdgePath = resolveFromRouter(RSD_SERVER_EDGE_SPEC);
 function rangoTestAliases(opts = {}) {
   const aliases = [
     // Real impls (index.rsc.ts) for the bare specifier ONLY — exact regex so
@@ -14,10 +27,16 @@ function rangoTestAliases(opts = {}) {
       replacement: here("src/testing/vitest-stubs/version.ts")
     },
     {
-      find: /^@vitejs\/plugin-rsc\/rsc$/,
+      find: /^@vitejs\/plugin-rsc\/rsc(\/(server|client))?$/,
       replacement: here("src/testing/vitest-stubs/plugin-rsc.ts")
     }
   ];
+  if (rsdServerEdgePath) {
+    aliases.push({
+      find: RSD_SERVER_EDGE_SPEC,
+      replacement: rsdServerEdgePath
+    });
+  }
   if (opts.preset === "cloudflare") {
     aliases.push(
       {
@@ -63,8 +82,9 @@ function rangoUseClientTransform() {
       });
       if (!result) return void 0;
       const { output } = result;
+      const rsdHref = rsdServerEdgePath ? pathToFileURL(rsdServerEdgePath).href : RSD_SERVER_EDGE_SPEC;
       output.prepend(
-        `import * as $$RangoRSD from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
+        `import * as $$RangoRSD from ${JSON.stringify(rsdHref)};
 `
       );
       return {

package/dist/types/deps/rsc-client.d.ts

@@ -0,0 +1 @@
+export { createFromReadableStream, encodeReply, createClientTemporaryReferenceSet, } from "@vitejs/plugin-rsc/rsc/client";

package/dist/types/deps/rsc.d.ts

@@ -1 +1 @@
-export { renderToReadableStream, decodeReply, createTemporaryReferenceSet, loadServerAction, decodeAction, decodeFormState, } from "@vitejs/plugin-rsc/rsc";
+export { renderToReadableStream, decodeReply, createTemporaryReferenceSet, loadServerAction, decodeAction, decodeFormState, } from "@vitejs/plugin-rsc/rsc/server";

package/dist/types/deps/ssr.d.ts

@@ -1 +1 @@
-export { createFromReadableStream, setOnClientReference, } from "@vitejs/plugin-rsc/ssr";
+export { createFromReadableStream, setOnClientReference, getClientEntryUrl, } from "@vitejs/plugin-rsc/ssr";

package/dist/types/rsc/types.d.ts

@@ -107,37 +107,37 @@ export interface RscPayload {
  */
 export type ReactFormState = unknown;
 /**
- * RSC dependencies from @vitejs/plugin-rsc/rsc
+ * RSC dependencies from @vitejs/plugin-rsc/rsc/server
  */
 export interface RSCDependencies {
     /**
-     * renderToReadableStream from @vitejs/plugin-rsc/rsc
+     * renderToReadableStream from @vitejs/plugin-rsc/rsc/server
      */
     renderToReadableStream: <T>(payload: T, options?: {
         temporaryReferences?: unknown;
         onError?: (error: unknown) => string | void;
     }) => ReadableStream<Uint8Array>;
     /**
-     * decodeReply from @vitejs/plugin-rsc/rsc
+     * decodeReply from @vitejs/plugin-rsc/rsc/server
      */
     decodeReply: (body: FormData | string, options?: {
         temporaryReferences?: unknown;
     }) => Promise<unknown[]>;
     /**
-     * createTemporaryReferenceSet from @vitejs/plugin-rsc/rsc
+     * createTemporaryReferenceSet from @vitejs/plugin-rsc/rsc/server
      */
     createTemporaryReferenceSet: () => unknown;
     /**
-     * loadServerAction from @vitejs/plugin-rsc/rsc
+     * loadServerAction from @vitejs/plugin-rsc/rsc/server
      */
     loadServerAction: (actionId: string) => Promise<Function>;
     /**
-     * decodeAction from @vitejs/plugin-rsc/rsc
+     * decodeAction from @vitejs/plugin-rsc/rsc/server
      * Decodes a FormData into a bound action function (for useActionState forms)
      */
     decodeAction: (body: FormData) => Promise<() => Promise<unknown>>;
     /**
-     * decodeFormState from @vitejs/plugin-rsc/rsc
+     * decodeFormState from @vitejs/plugin-rsc/rsc/server
      * Decodes the action result into a ReactFormState for useActionState progressive enhancement
      */
     decodeFormState: (actionResult: unknown, body: FormData) => Promise<ReactFormState | null>;
@@ -268,8 +268,8 @@ export interface CreateRSCHandlerOptions<TEnv = unknown, TRoutes extends Record<
      */
     router: RangoInternal<TEnv, TRoutes>;
     /**
-     * RSC dependencies from @vitejs/plugin-rsc/rsc.
-     * Defaults to the exports from @vitejs/plugin-rsc/rsc.
+     * RSC dependencies from @vitejs/plugin-rsc/rsc/server.
+     * Defaults to the exports from @vitejs/plugin-rsc/rsc/server.
      */
     deps?: RSCDependencies;
     /**

package/dist/types/ssr/index.d.ts

@@ -117,10 +117,19 @@ export interface SSRDependencies<TEnv = unknown> {
      */
     injectRSCPayload: (rscStream: ReadableStream<Uint8Array>, options?: InjectRSCPayloadOptions) => TransformStream<Uint8Array, Uint8Array>;
     /**
-     * Function to load bootstrap script content
-     * Typically: () => import.meta.viteRsc.loadBootstrapScriptContent("index")
+     * Function to load bootstrap script content.
+     * Required unless `getClientEntryUrl` is provided with `headScripts: "preinit"`.
+     * Custom SSR entries typically: `() => import.meta.viteRsc.loadBootstrapScriptContent("index")`
+     * (deprecated in `@vitejs/plugin-rsc` 0.5.33 in favor of `getClientEntryUrl`).
      */
-    loadBootstrapScriptContent: () => Promise<string>;
+    loadBootstrapScriptContent?: () => Promise<string>;
+    /**
+     * Client entry URL from `@vitejs/plugin-rsc/ssr` `getClientEntryUrl()`.
+     * Preferred when `headScripts` is `"preinit"`: Fizz receives `bootstrapModules`
+     * without the deprecated `loadBootstrapScriptContent` round-trip. Custom SSR
+     * entries can omit this and keep the inline bootstrap path.
+     */
+    getClientEntryUrl?: () => string;
     /**
      * Document script strategy; the generated virtual SSR entry threads the
      * `rango({ headScripts })` plugin option here (canonical docs on
@@ -251,7 +260,10 @@ interface ShellResumeOptions {
  * @example
  * ```tsx
  * import { createSSRHandler } from "@rangojs/router/ssr";
- * import { createFromReadableStream } from "@rangojs/router/internal/deps/ssr";
+ * import {
+ *   createFromReadableStream,
+ *   getClientEntryUrl,
+ * } from "@rangojs/router/internal/deps/ssr";
  * import { renderToReadableStream } from "react-dom/server.edge";
  * import { injectRSCPayload } from "@rangojs/router/internal/deps/html-stream-server";
  *
@@ -259,6 +271,17 @@ interface ShellResumeOptions {
  *   createFromReadableStream,
  *   renderToReadableStream,
  *   injectRSCPayload,
+ *   getClientEntryUrl,
+ *   headScripts: "preinit", // getClientEntryUrl is only used under "preinit"
+ * });
+ * ```
+ *
+ * Custom SSR entries that still use the deprecated bootstrap helper:
+ * ```tsx
+ * export const renderHTML = createSSRHandler({
+ *   createFromReadableStream,
+ *   renderToReadableStream,
+ *   injectRSCPayload,
  *   loadBootstrapScriptContent: () =>
  *     import.meta.viteRsc.loadBootstrapScriptContent("index"),
  * });

package/dist/types/testing/flight.d.ts

@@ -6,14 +6,15 @@
  * the same react-server-dom serializer the router uses at runtime. It runs in
  * plain node (no Vite, no browser), but ONLY under the `react-server` export
  * condition. The serializer is the VENDORED build shipped with
- * @vitejs/plugin-rsc — the public `@vitejs/plugin-rsc/rsc` entry top-level
- * imports Vite virtual modules and is not usable outside a Vite build.
+ * @vitejs/plugin-rsc — the public `@vitejs/plugin-rsc/rsc/server` entry
+ * top-level imports Vite virtual modules and is not usable outside a Vite
+ * build.
  *
  * Run the example/tests for this module via the dedicated rsc vitest project
  * (vitest.rsc.config.ts), which forces `--conditions=react-server` on the
  * worker. The main vitest project must NOT use that condition (it would flip
  * React to the no-hooks server build and break the ~50 tests that mock
- * @vitejs/plugin-rsc/rsc).
+ * @vitejs/plugin-rsc/rsc/server).
  *
  * Scope / limitations (v1):
  * - Server-only / leaf trees. A tree containing a CLIENT component emits an

package/dist/types/testing/vitest-stubs/plugin-rsc.d.ts

@@ -5,3 +5,5 @@ export declare const decodeReply: () => undefined;
 export declare const decodeAction: () => undefined;
 export declare const decodeFormState: () => undefined;
 export declare const createTemporaryReferenceSet: () => Record<string, never>;
+export declare const encodeReply: () => never;
+export declare const createClientTemporaryReferenceSet: () => Record<string, never>;

package/dist/types/testing/vitest.d.ts

@@ -18,7 +18,8 @@
  *   `@rangojs/router` specifier to its react-server entry (real impls) while
  *   leaving React as the client build — which is exactly what this helper does.
  * - The build-only `@rangojs/router:version` virtual and `@vitejs/plugin-rsc/rsc`
- *   (whose real body imports unresolvable Vite virtuals) are stubbed.
+ *   plus `/rsc/server`, `/rsc/client` (whose real body imports unresolvable
+ *   Vite virtuals) are stubbed.
  * - Cloudflare apps additionally import the `cloudflare:workers` /
  *   `cloudflare:email` runtime virtuals; pass `{ preset: "cloudflare" }` to stub them.
  *

package/dist/types/vite/plugins/vercel-output.d.ts

@@ -28,9 +28,11 @@
  *      type:module in scope the deployed (isolated) function loads them as
  *      CommonJS and fails on the first `import`.
  *
- * The launcher is bundled with srvx (the Web->Node streaming bridge, a
- * @rangojs/router dependency) and @vercel/functions (resolved from the app)
- * inlined, keeping the RSC bundle a runtime-relative external.
+ * The launcher is bundled with rolldown (Vite 8's bundler — a production
+ * dependency of `vite`, resolved through the app's vite install) so a
+ * standalone consumer does not need `esbuild`. srvx (the Web->Node streaming
+ * bridge, a @rangojs/router dependency) and @vercel/functions (resolved from
+ * the app) are inlined; the RSC bundle stays a runtime-relative external.
  *
  * Timing: this runs in the `buildApp` hook (order "post"), which fires once
  * after every environment has built, so dist/{client,rsc,ssr} all exist.
@@ -41,6 +43,23 @@
  */
 import type { Plugin } from "vite";
 import type { RangoVercelOptions, VercelPresetOptions } from "../plugin-types.js";
+/**
+ * Resolve rolldown through the app's vite install (rolldown is a production
+ * dependency of Vite 8, unlike esbuild which is only an optional peer). Fall
+ * back to the app root, then the plugin's own vite, so a hoisted or
+ * workspace copy still works. Issue #785: the previous "esbuild ships with
+ * Vite" path broke standalone consumers on Vite 8.
+ */
+export declare function resolveRolldownPath(root: string): string;
+/**
+ * Bundle the Node launcher into `funcDir/index.mjs`: srvx + @vercel/functions
+ * inlined, `./rsc/index.js` left as a runtime-relative external.
+ */
+export declare function bundleVercelLauncher(opts: {
+    root: string;
+    funcDir: string;
+    srvxNodePath: string;
+}): Promise<void>;
 /**
  * Reject a non-Node runtime for the vercel preset. The preset only emits a Node
  * serverless function (launcherType "Nodejs", bundled Node APIs, response

package/dist/types/vite/plugins/virtual-entries.d.ts

@@ -3,8 +3,9 @@ export declare const VIRTUAL_ENTRY_BROWSER: string;
 /**
  * Generate the virtual SSR entry. `headScripts` mirrors the rango() plugin
  * option: "preinit" (default) installs the client-reference preinit hook and
- * lets the SSR handlers convert the bootstrap to `bootstrapModules`;
- * "preload" omits the hook and pins the handlers to the hint-only strategy.
+ * threads `getClientEntryUrl` so Fizz emits `bootstrapModules`;
+ * "preload" omits the hook and uses the deprecated inline
+ * `loadBootstrapScriptContent` bootstrap.
  */
 export declare function getVirtualEntrySSR(headScripts?: HeadScriptsOption, progressiveChunkSize?: number): string;
 /**

package/dist/vite/index.js

@@ -3048,6 +3048,7 @@ function useCacheTransform() {
         } catch {
           return;
         }
+        stripNullDirectiveFields(ast);
         const filePath = normalizePath(path5.relative(projectRoot, id));
         const isLayoutOrTemplate = LAYOUT_TEMPLATE_PATTERN.test(id);
         if (hasDirective(ast.body, "use cache")) {
@@ -3058,7 +3059,8 @@ function useCacheTransform() {
             id,
             isBuild,
             isLayoutOrTemplate,
-            transformWrapExport
+            transformWrapExport,
+            hasDirective
           );
         }
         const functionResult = transformFunctionLevelUseCache(
@@ -3077,7 +3079,7 @@ function useCacheTransform() {
     }
   };
 }
-function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLayoutOrTemplate, transformWrapExport) {
+function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLayoutOrTemplate, transformWrapExport, hasDirective) {
   const unconfirmedExports = [];
   const { exportNames, output } = transformWrapExport(code, ast, {
     runtime: (value, name) => {
@@ -3087,6 +3089,11 @@ function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLa
     rejectNonAsyncFunction: false,
     filter: (name, meta) => {
       if (name === "default" && isLayoutOrTemplate) return false;
+      if (name.startsWith("$$hoist_")) return false;
+      if (isHoistedServerReferenceRebind(meta.valueNode)) return false;
+      if (functionHasUseServerDirective(meta.valueNode, hasDirective)) {
+        return false;
+      }
       if (meta.isFunction !== true) {
         unconfirmedExports.push(name);
         return false;
@@ -3158,6 +3165,36 @@ function transformFunctionLevelUseCache(code, ast, filePath, sourceId, isBuild,
     return;
   }
 }
+function stripNullDirectiveFields(node) {
+  if (!node || typeof node !== "object") return;
+  const rec = node;
+  if (rec.type === "ExpressionStatement" && typeof rec.directive !== "string") {
+    delete rec.directive;
+  }
+  for (const value of Object.values(rec)) {
+    if (Array.isArray(value)) {
+      for (const item of value) stripNullDirectiveFields(item);
+    } else if (value && typeof value === "object" && "type" in value) {
+      stripNullDirectiveFields(value);
+    }
+  }
+}
+function isHoistedServerReferenceRebind(valueNode) {
+  if (!valueNode || valueNode.type !== "CallExpression") return false;
+  const first = valueNode.arguments[0];
+  return first !== void 0 && first.type === "Identifier" && first.name.startsWith("$$hoist_");
+}
+function functionHasUseServerDirective(valueNode, hasDirective) {
+  if (!valueNode || !("body" in valueNode)) return false;
+  const { body } = valueNode;
+  if (!body || Array.isArray(body) || body.type !== "BlockStatement") {
+    return false;
+  }
+  return hasDirective(
+    body.body,
+    "use server"
+  );
+}
 function findFileLevelDirective(ast) {
   for (const node of ast.body ?? []) {
     if (node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache")) {
@@ -3501,7 +3538,7 @@ function emitProgressiveChunkSize(value) {
 }
 function getVirtualEntrySSR(headScripts = "preinit", progressiveChunkSize) {
   const preinit = headScripts !== "preload";
-  const depsImportNames = preinit ? "createFromReadableStream,\n  setOnClientReference," : "createFromReadableStream,";
+  const depsImportNames = preinit ? "createFromReadableStream,\n  setOnClientReference,\n  getClientEntryUrl," : "createFromReadableStream,";
   const ssrImportNames = preinit ? "\n  installClientReferencePreinit," : "";
   const install = preinit ? `
 // Upgrade client-reference modulepreload hints to executing module scripts in
@@ -3509,6 +3546,8 @@ function getVirtualEntrySSR(headScripts = "preinit", progressiveChunkSize) {
 // See src/ssr/preinit-client-references.ts for the full rationale.
 installClientReferencePreinit(setOnClientReference);
 ` : "";
+  const bootstrapDep = preinit ? "getClientEntryUrl," : `loadBootstrapScriptContent: () =>
+    import.meta.viteRsc.loadBootstrapScriptContent("index"),`;
   const hs = JSON.stringify(headScripts);
   const pcs = progressiveChunkSize !== void 0 ? `
   progressiveChunkSize: ${emitProgressiveChunkSize(progressiveChunkSize)},` : "";
@@ -3530,8 +3569,7 @@ export const renderHTML = createSSRHandler({
   renderToReadableStream,
   injectRSCPayload,
   headScripts: ${hs},${pcs}
-  loadBootstrapScriptContent: () =>
-    import.meta.viteRsc.loadBootstrapScriptContent("index"),
+  ${bootstrapDep}
 });
 
 export const captureShellHTML = createShellCaptureHandler({
@@ -3541,8 +3579,7 @@ export const captureShellHTML = createShellCaptureHandler({
   prerender,
   resume,
   headScripts: ${hs},${pcs}
-  loadBootstrapScriptContent: () =>
-    import.meta.viteRsc.loadBootstrapScriptContent("index"),
+  ${bootstrapDep}
 });
 
 export const resumeShellHTML = createShellResumeHandler({
@@ -3552,8 +3589,7 @@ export const resumeShellHTML = createShellResumeHandler({
   prerender,
   resume,
   headScripts: ${hs},${pcs}
-  loadBootstrapScriptContent: () =>
-    import.meta.viteRsc.loadBootstrapScriptContent("index"),
+  ${bootstrapDep}
 });
 `.trim();
 }
@@ -3710,7 +3746,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.11.0",
+  version: "0.12.1",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -3798,6 +3834,11 @@ var package_default = {
       "react-server": "./src/deps/rsc.ts",
       default: "./src/deps/rsc.ts"
     },
+    "./internal/deps/rsc-client": {
+      types: "./dist/types/deps/rsc-client.d.ts",
+      "react-server": "./src/deps/rsc-client.ts",
+      default: "./src/deps/rsc-client.ts"
+    },
     "./internal/deps/html-stream-client": {
       types: "./dist/types/deps/html-stream-client.d.ts",
       default: "./src/deps/html-stream-client.ts"
@@ -3903,7 +3944,7 @@ var package_default = {
   },
   dependencies: {
     "@types/debug": "^4.1.12",
-    "@vitejs/plugin-rsc": "^0.5.31",
+    "@vitejs/plugin-rsc": "^0.5.34",
     debug: "^4.4.1",
     "magic-string": "^0.30.17",
     picomatch: "^4.0.4",
@@ -3936,7 +3977,7 @@ var package_default = {
     "@playwright/test": "^1.49.1",
     "@testing-library/react": ">=16",
     "@vercel/functions": "^3.0.0",
-    "@vitejs/plugin-rsc": "^0.5.31",
+    "@vitejs/plugin-rsc": "^0.5.34",
     react: ">=19.2.8 <20",
     "react-dom": ">=19.2.8 <20",
     vite: "^8.0.16",
@@ -5641,6 +5682,7 @@ import { existsSync as existsSync5 } from "node:fs";
 import { resolve as resolve5, join as join4 } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 import { pathToFileURL } from "node:url";
+var VIRTUAL_LAUNCHER_ID = "\0rango-vercel-launcher";
 var LAUNCHER_SOURCE = `import { toNodeHandler } from "srvx/node";
 import { waitUntil } from "@vercel/functions";
 import rscHandler from "./rsc/index.js";
@@ -5660,6 +5702,99 @@ const fetchHandler = (request) =>
 
 export default toNodeHandler(fetchHandler);
 `;
+function resolveRolldownPath(root) {
+  const appRequire = createRequire2(join4(root, "package.json"));
+  const rangoRequire = createRequire2(import.meta.url);
+  const attempts = [
+    () => createRequire2(appRequire.resolve("vite")).resolve("rolldown"),
+    () => appRequire.resolve("rolldown"),
+    () => createRequire2(rangoRequire.resolve("vite")).resolve("rolldown"),
+    () => rangoRequire.resolve("rolldown")
+  ];
+  for (const attempt of attempts) {
+    try {
+      return attempt();
+    } catch {
+    }
+  }
+  throw new Error(
+    '[rango] preset "vercel" requires "rolldown" to bundle the function launcher. Vite 8 depends on it; reinstall dependencies.'
+  );
+}
+async function bundleVercelLauncher(opts) {
+  const { root, funcDir, srvxNodePath } = opts;
+  const appRequire = createRequire2(join4(root, "package.json"));
+  let vercelFunctionsPath;
+  try {
+    vercelFunctionsPath = appRequire.resolve("@vercel/functions");
+  } catch {
+    throw new Error(
+      '[rango] preset "vercel": could not resolve "@vercel/functions". Add it to your app dependencies (it also backs VercelCacheStore).'
+    );
+  }
+  let rolldownModule;
+  try {
+    rolldownModule = await import(pathToFileURL(resolveRolldownPath(root)).href);
+  } catch {
+    throw new Error(
+      '[rango] preset "vercel" requires "rolldown" to bundle the function launcher. Vite 8 depends on it; reinstall dependencies.'
+    );
+  }
+  const rolldownFn = rolldownModule.rolldown ?? rolldownModule.default?.rolldown;
+  if (typeof rolldownFn !== "function") {
+    throw new Error('[rango] preset "vercel": could not load rolldown().');
+  }
+  let bundle;
+  try {
+    bundle = await rolldownFn({
+      input: VIRTUAL_LAUNCHER_ID,
+      cwd: root,
+      platform: "node",
+      logLevel: "silent",
+      resolve: {
+        alias: {
+          "srvx/node": srvxNodePath,
+          "@vercel/functions": vercelFunctionsPath
+        }
+      },
+      plugins: [
+        {
+          name: "rango-vercel-launcher",
+          resolveId(id) {
+            if (id === VIRTUAL_LAUNCHER_ID) return VIRTUAL_LAUNCHER_ID;
+            if (id === "./rsc/index.js") {
+              return { id: "./rsc/index.js", external: true };
+            }
+            return null;
+          },
+          load(id) {
+            if (id === VIRTUAL_LAUNCHER_ID) return LAUNCHER_SOURCE;
+            return null;
+          }
+        }
+      ]
+    });
+    await bundle.write({
+      file: join4(funcDir, "index.mjs"),
+      format: "esm",
+      exports: "default",
+      // @vercel/functions (and srvx) may contain dynamic import(); the
+      // launcher must stay a single index.mjs — Vercel's handler field
+      // points at that one file.
+      codeSplitting: false
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if (/@vercel\/functions/.test(message)) {
+      throw new Error(
+        '[rango] preset "vercel": could not resolve "@vercel/functions". Add it to your app dependencies (it also backs VercelCacheStore).\n' + message
+      );
+    }
+    throw error;
+  } finally {
+    await bundle?.close();
+  }
+}
 function assertVercelNodeRuntime(runtime2) {
   if (runtime2 != null && !runtime2.startsWith("nodejs")) {
     throw new Error(
@@ -5747,66 +5882,7 @@ async function assemble(root, options, assetsDir, publicDir) {
       '[rango] preset "vercel" requires "srvx" (a dependency of @rangojs/router). Reinstall dependencies.'
     );
   }
-  const appRequire = createRequire2(join4(root, "package.json"));
-  const resolveEsbuildPath = () => {
-    try {
-      const viteRequire = createRequire2(appRequire.resolve("vite"));
-      return viteRequire.resolve("esbuild");
-    } catch {
-    }
-    try {
-      return appRequire.resolve("esbuild");
-    } catch {
-    }
-    return rangoRequire.resolve("esbuild");
-  };
-  let esbuildModule;
-  try {
-    esbuildModule = await import(pathToFileURL(resolveEsbuildPath()).href);
-  } catch {
-    throw new Error(
-      '[rango] preset "vercel" requires "esbuild" to bundle the function launcher. It ships with Vite; reinstall dependencies (or add esbuild to your app dependencies).'
-    );
-  }
-  const esbuildBuild = esbuildModule.build ?? esbuildModule.default?.build;
-  if (typeof esbuildBuild !== "function") {
-    throw new Error('[rango] preset "vercel": could not load esbuild.build.');
-  }
-  try {
-    await esbuildBuild({
-      stdin: {
-        contents: LAUNCHER_SOURCE,
-        resolveDir: root,
-        sourcefile: "func-entry.mjs",
-        loader: "js"
-      },
-      outfile: join4(funcDir, "index.mjs"),
-      bundle: true,
-      format: "esm",
-      platform: "node",
-      target: "node18",
-      alias: { "srvx/node": srvxNodePath },
-      plugins: [
-        {
-          name: "external-rsc-entry",
-          setup(b) {
-            b.onResolve({ filter: /^\.\/rsc\/index\.js$/ }, () => ({
-              path: "./rsc/index.js",
-              external: true
-            }));
-          }
-        }
-      ]
-    });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (/@vercel\/functions/.test(message)) {
-      throw new Error(
-        '[rango] preset "vercel": could not resolve "@vercel/functions". Add it to your app dependencies (it also backs VercelCacheStore).\n' + message
-      );
-    }
-    throw error;
-  }
+  await bundleVercelLauncher({ root, funcDir, srvxNodePath });
   await writeFile(
     join4(funcDir, "package.json"),
     JSON.stringify({ type: "module" }, null, 2) + "\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rangojs/router",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "description": "Django-inspired RSC router with composable URL patterns",
   "keywords": [
     "react",
@@ -88,6 +88,11 @@
       "react-server": "./src/deps/rsc.ts",
       "default": "./src/deps/rsc.ts"
     },
+    "./internal/deps/rsc-client": {
+      "types": "./dist/types/deps/rsc-client.d.ts",
+      "react-server": "./src/deps/rsc-client.ts",
+      "default": "./src/deps/rsc-client.ts"
+    },
     "./internal/deps/html-stream-client": {
       "types": "./dist/types/deps/html-stream-client.d.ts",
       "default": "./src/deps/html-stream-client.ts"
@@ -179,7 +184,7 @@
   },
   "dependencies": {
     "@types/debug": "^4.1.12",
-    "@vitejs/plugin-rsc": "^0.5.31",
+    "@vitejs/plugin-rsc": "^0.5.34",
     "debug": "^4.4.1",
     "magic-string": "^0.30.17",
     "picomatch": "^4.0.4",
@@ -212,7 +217,7 @@
     "@playwright/test": "^1.49.1",
     "@testing-library/react": ">=16",
     "@vercel/functions": "^3.0.0",
-    "@vitejs/plugin-rsc": "^0.5.31",
+    "@vitejs/plugin-rsc": "^0.5.34",
     "react": ">=19.2.8 <20",
     "react-dom": ">=19.2.8 <20",
     "vite": "^8.0.16",