@rangojs/router 0.0.0-experimental.107 → 0.0.0-experimental.109

package/dist/vite/index.js

@@ -21,8 +21,8 @@ function hashId(filePath, exportName) {
 function makeStubId(filePath, exportName, isBuild) {
   return isBuild ? hashId(filePath, exportName) : `${filePath}#${exportName}`;
 }
-function hashInlineId(filePath, lineNumber, index) {
-  const input = index !== void 0 && index > 0 ? `${filePath}:${lineNumber}:${index}` : `${filePath}:${lineNumber}`;
+function hashInlineId(filePath, fnName, index) {
+  const input = `${filePath}:${fnName}:${index}`;
   return crypto.createHash("sha256").update(input).digest("hex").slice(0, 8);
 }
 function buildExportMap(program) {
@@ -292,7 +292,7 @@ function getRscPluginApi(config) {
     );
     if (plugin) {
       console.warn(
-        `[rsc-router:expose-action-id] RSC plugin found by API structure (name: "${plugin.name}"). Consider updating the name lookup if the plugin was renamed.`
+        `[rango:expose-action-id] RSC plugin found by API structure (name: "${plugin.name}"). Consider updating the name lookup if the plugin was renamed.`
       );
     }
   }
@@ -393,7 +393,7 @@ function exposeActionId() {
       }
       if (!rscPluginApi) {
         throw new Error(
-          "[rsc-router] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin, which is included automatically by rango()."
+          "[rango] Could not find @vitejs/plugin-rsc. @rangojs/router requires the Vite RSC plugin, which is included automatically by rango()."
         );
       }
       if (!isBuild) return;
@@ -475,7 +475,7 @@ function isDirectivePrologueStatement(node) {
 function findImportInsertionPos(code, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return 0;
   }
@@ -515,7 +515,7 @@ function walkNode(node, parent, ancestors, enter) {
 function findHandlerCalls(code, fnName, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -589,7 +589,7 @@ function getImportedLocalNamesFromProgram(program, importedName) {
 }
 function getImportedLocalNames(code, importedName, parseAst4) {
   try {
-    const program = parseAst4(code, { jsx: true });
+    const program = parseAst4(code, { lang: "tsx" });
     return getImportedLocalNamesFromProgram(program, importedName);
   } catch {
     return /* @__PURE__ */ new Set();
@@ -598,7 +598,7 @@ function getImportedLocalNames(code, importedName, parseAst4) {
 function extractImportDeclarations(code, parseAst4) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -653,7 +653,7 @@ function isSafeVariableDeclaration(node, handlerNames) {
 function extractModuleLevelDeclarations(code, parseAst4, handlerNames) {
   let program;
   try {
-    program = parseAst4(code, { jsx: true });
+    program = parseAst4(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -697,14 +697,12 @@ function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtu
     parseAst4,
     handlerNames
   );
-  const lineCounts = /* @__PURE__ */ new Map();
   const importStatements = [];
-  for (const site of inlineSites) {
-    const lineCount = lineCounts.get(site.lineNumber) ?? 0;
-    lineCounts.set(site.lineNumber, lineCount + 1);
-    const hash = hashInlineId(filePath, site.lineNumber, lineCount);
+  for (const [siteIndex, site] of inlineSites.entries()) {
+    const hash = hashInlineId(filePath, fnName, siteIndex);
     const exportName = `__sh_${hash}`;
-    const virtualId = `\0${virtualPrefix}${filePath}:${site.lineNumber}${lineCount > 0 ? `:${lineCount}` : ""}`;
+    const idSuffix = `${filePath}:${fnName}:${siteIndex}`;
+    const virtualId = `\0${virtualPrefix}${idSuffix}`;
     const handlerCode = code.slice(site.callStart, site.callEnd);
     virtualRegistry.set(virtualId, {
       originalModuleId: moduleId,
@@ -714,7 +712,7 @@ function transformInlineHandlers(fnName, virtualPrefix, s, code, filePath, virtu
       exportName
     });
     s.overwrite(site.callStart, site.callEnd, exportName);
-    const importId = `${virtualPrefix}${filePath}:${site.lineNumber}${lineCount > 0 ? `:${lineCount}` : ""}`;
+    const importId = `${virtualPrefix}${idSuffix}`;
     importStatements.push(`import { ${exportName} } from "${importId}";`);
   }
   if (importStatements.length > 0) {
@@ -810,6 +808,17 @@ function getCalledIdentifierFromCall(callExpr) {
   }
   return null;
 }
+function unwrapSignatureWrappedCall(init, fnNameSet) {
+  if (init?.type !== "CallExpression") return init;
+  const directId = getCalledIdentifierFromCall(init);
+  if (directId && fnNameSet.has(directId)) return init;
+  const firstArg = init.arguments?.[0];
+  if (firstArg?.type === "CallExpression") {
+    const innerId = getCalledIdentifierFromCall(firstArg);
+    if (innerId && fnNameSet.has(innerId)) return firstArg;
+  }
+  return init;
+}
 function collectCreateExportBindingsFallback(code, fnNames) {
   const alternation = fnNames.map(escapeRegExp).join("|");
   const exportConstPattern = new RegExp(
@@ -869,7 +878,7 @@ function collectCreateExportBindingsFallback(code, fnNames) {
 function collectCreateExportBindings(code, fnNames, program) {
   if (!program) {
     try {
-      program = parseAst(code, { jsx: true });
+      program = parseAst(code, { lang: "tsx" });
     } catch {
       return collectCreateExportBindingsFallback(code, fnNames);
     }
@@ -882,16 +891,16 @@ function collectCreateExportBindings(code, fnNames, program) {
       return;
     }
     for (const decl of varDecl.declarations ?? []) {
-      const calledIdentifier = getCalledIdentifierFromCall(decl?.init);
-      if (decl?.id?.type !== "Identifier" || decl?.init?.type !== "CallExpression" || !calledIdentifier || !fnNameSet.has(calledIdentifier)) {
+      const callExpr = unwrapSignatureWrappedCall(decl?.init, fnNameSet);
+      const calledIdentifier = getCalledIdentifierFromCall(callExpr);
+      if (decl?.id?.type !== "Identifier" || callExpr?.type !== "CallExpression" || !calledIdentifier || !fnNameSet.has(calledIdentifier)) {
         continue;
       }
       const localName = decl.id.name;
       const exportNames = exportMap.get(localName) ?? [];
       if (exportNames.length === 0) continue;
-      const callStart = decl.init.start;
-      const callEnd = decl.init.end;
-      const calleeEnd = decl.init.callee.end;
+      const callEnd = callExpr.end;
+      const calleeEnd = callExpr.callee.end;
       let openParenPos = -1;
       for (let i = calleeEnd; i < callEnd; i++) {
         if (code[i] === "(") {
@@ -905,10 +914,10 @@ function collectCreateExportBindings(code, fnNames, program) {
       bindings.push({
         localName,
         exportNames,
-        callExprStart: decl.init.start,
+        callExprStart: callExpr.start,
         callOpenParenPos: openParenPos,
         callCloseParenPos: closeParenPos,
-        argCount: decl.init.arguments?.length ?? 0,
+        argCount: callExpr.arguments?.length ?? 0,
         statementEnd
       });
     }
@@ -929,7 +938,7 @@ function collectCreateExportBindings(code, fnNames, program) {
 }
 function buildUnsupportedShapeWarning(filePath, fnName) {
   return [
-    `[rsc-router] Unsupported ${fnName} shape in "${filePath}".`,
+    `[rango] Unsupported ${fnName} shape in "${filePath}".`,
     `Supported shapes are:`,
     `  - export const X = ${fnName}(...)`,
     `  - const X = ${fnName}(...); export { X }`,
@@ -1335,7 +1344,7 @@ ${lazyImports.join(",\n")}
           }
           if (_cachedAst !== void 0 || _astParseFailed) return _cachedAst;
           try {
-            _cachedAst = parseAst2(code, { jsx: true });
+            _cachedAst = parseAst2(code, { lang: "tsx" });
           } catch {
             _astParseFailed = true;
           }
@@ -1716,7 +1725,7 @@ function useCacheTransform() {
         let ast;
         try {
           const { parseAst: parseAst4 } = await import("vite");
-          ast = parseAst4(code);
+          ast = parseAst4(code, { lang: "tsx" });
         } catch {
           return;
         }
@@ -1938,7 +1947,7 @@ import {
 import { createElement, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
 import { rscStream } from "@rangojs/router/internal/deps/html-stream-client";
-import { initBrowserApp, RSCRouter } from "@rangojs/router/browser";
+import { initBrowserApp, Rango } from "@rangojs/router/browser";
 
 async function initializeApp() {
   const deps = {
@@ -1953,7 +1962,7 @@ async function initializeApp() {
 
   hydrateRoot(
     document,
-    createElement(StrictMode, null, createElement(RSCRouter))
+    createElement(StrictMode, null, createElement(Rango))
   );
 }
 
@@ -2040,7 +2049,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.107",
+  version: "0.0.0-experimental.109",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -2175,7 +2184,7 @@ var package_default = {
   scripts: {
     build: "pnpm dlx esbuild src/vite/index.ts --bundle --format=esm --outfile=dist/vite/index.js --platform=node --packages=external && mkdir -p dist/vite/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/vite/plugins/cloudflare-protocol-loader-hook.mjs && pnpm dlx esbuild src/bin/rango.ts --bundle --format=esm --outfile=dist/bin/rango.js --platform=node --packages=external --banner:js='#!/usr/bin/env node' && chmod +x dist/bin/rango.js",
     prepublishOnly: "pnpm build",
-    typecheck: "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit",
+    typecheck: "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit && tsc -p tsconfig.augment-check.json --noEmit",
     test: "playwright test",
     "test:ui": "playwright test --ui",
     "test:unit": "vitest run",
@@ -2183,7 +2192,7 @@ var package_default = {
   },
   dependencies: {
     "@types/debug": "^4.1.12",
-    "@vitejs/plugin-rsc": "^0.5.23",
+    "@vitejs/plugin-rsc": "^0.5.26",
     debug: "^4.4.1",
     "magic-string": "^0.30.17",
     picomatch: "^4.0.3",
@@ -2203,11 +2212,11 @@ var package_default = {
     vitest: "^4.0.0"
   },
   peerDependencies: {
-    "@cloudflare/vite-plugin": "^1.25.0",
-    "@vitejs/plugin-rsc": "^0.5.23",
+    "@cloudflare/vite-plugin": "^1.38.0",
+    "@vitejs/plugin-rsc": "^0.5.26",
     react: ">=19.2.6 <20",
     "react-dom": ">=19.2.6 <20",
-    vite: "^7.3.0"
+    vite: "^8.0.0"
   },
   peerDependenciesMeta: {
     "@cloudflare/vite-plugin": {
@@ -2400,7 +2409,7 @@ ${objectBody}
 } as const;
 
 declare global {
-  namespace RSCRouter {
+  namespace Rango {
     interface GeneratedRouteMap extends Readonly<typeof NamedRoutes> {}
   }
 }
@@ -2635,7 +2644,7 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
   const realPath = resolve2(filePath);
   const key = variableName ? `${realPath}:${variableName}` : realPath;
   if (visited.has(key)) {
-    console.warn(`[rsc-router] Circular include detected, skipping: ${key}`);
+    console.warn(`[rango] Circular include detected, skipping: ${key}`);
     return { routes: {}, searchSchemas: {} };
   }
   visited.add(key);
@@ -2705,7 +2714,7 @@ function findRouterFilesRecursive(dir, filter, results) {
     entries = readdirSync(dir, { withFileTypes: true });
   } catch (err) {
     console.warn(
-      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
+      `[rango] Failed to scan directory ${dir}: ${err.message}`
     );
     return;
   }
@@ -2761,7 +2770,7 @@ function findNestedRouterConflict(routerFiles) {
   }
   return null;
 }
-function formatNestedRouterConflictError(conflict, prefix = "[rsc-router]") {
+function formatNestedRouterConflictError(conflict, prefix = "[rango]") {
   return `${prefix} Nested router roots are not supported.
 Router root: ${conflict.ancestor}
 Nested router: ${conflict.nested}
@@ -2923,7 +2932,7 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
     if (existsSync3(oldCombinedPath)) {
       unlinkSync(oldCombinedPath);
       console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+        `[rango] Removed stale combined route types: ${oldCombinedPath}`
       );
     }
   } catch {
@@ -2978,7 +2987,7 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
       }
       writeFileSync(outPath, source);
       console.log(
-        `[rsc-router] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
+        `[rango] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
       );
     }
   }
@@ -2995,7 +3004,7 @@ function normalizeModuleId(id) {
 function getClientModuleSignature(source) {
   let program;
   try {
-    program = parseAst3(source, { jsx: true });
+    program = parseAst3(source, { lang: "tsx" });
   } catch {
     return void 0;
   }
@@ -3083,7 +3092,7 @@ function createVersionPlugin() {
   let versionCounter = 0;
   const bumpVersion = (reason) => {
     currentVersion = Date.now().toString(16) + String(++versionCounter);
-    console.log(`[rsc-router] ${reason}, version updated: ${currentVersion}`);
+    console.log(`[rango] ${reason}, version updated: ${currentVersion}`);
     const rscEnv = server?.environments?.rsc;
     const versionMod = rscEnv?.moduleGraph?.getModuleById(
       "\0" + VIRTUAL_IDS.version
@@ -3208,22 +3217,18 @@ function patchRsdwClientDebugInfoRecovery(code) {
   };
 }
 function performanceTracksOptimizeDepsPlugin() {
+  const RSDW_CLIENT_RE = /react-server-dom-webpack-client\.browser\.(development|production)\.js$/;
   return {
     name: "@rangojs/router:performance-tracks-optimize-deps",
-    setup(build) {
-      build.onLoad(
-        {
-          filter: /react-server-dom-webpack-client\.browser\.(development|production)\.js$/
-        },
-        async (args) => {
-          const code = await readFile(args.path, "utf8");
-          const patched = patchRsdwClientDebugInfoRecovery(code);
-          return {
-            contents: patched.code,
-            loader: "js"
-          };
-        }
-      );
+    // Vite 8 optimizes deps with Rolldown (Rollup-style plugin pipeline), so the
+    // pre-bundled RSDW client is patched via load() rather than esbuild's onLoad.
+    // Returning code overrides Rolldown's default filesystem read for the module.
+    async load(id) {
+      const cleanId = id.split("?")[0] ?? id;
+      if (!RSDW_CLIENT_RE.test(cleanId)) return null;
+      const code = await readFile(cleanId, "utf8");
+      const patched = patchRsdwClientDebugInfoRecovery(code);
+      return { code: patched.code };
     }
   };
 }
@@ -3250,24 +3255,21 @@ function performanceTracksPlugin() {
 }
 
 // src/vite/utils/shared-utils.ts
-var versionEsbuildPlugin = {
+var versionRolldownPlugin = {
   name: "@rangojs/router-version",
-  setup(build) {
-    build.onResolve({ filter: /^rsc-router:version$/ }, (args) => ({
-      path: args.path,
-      namespace: "@rangojs/router-virtual"
-    }));
-    build.onLoad(
-      { filter: /.*/, namespace: "@rangojs/router-virtual" },
-      () => ({
-        contents: `export const VERSION = "dev";`,
-        loader: "js"
-      })
-    );
+  resolveId(id) {
+    if (id === VIRTUAL_IDS.version) return "\0" + VIRTUAL_IDS.version;
+    return void 0;
+  },
+  load(id) {
+    if (id === "\0" + VIRTUAL_IDS.version) {
+      return getVirtualVersionContent("dev");
+    }
+    return void 0;
   }
 };
-var sharedEsbuildOptions = {
-  plugins: [versionEsbuildPlugin, performanceTracksOptimizeDepsPlugin()]
+var sharedRolldownOptions = {
+  plugins: [versionRolldownPlugin, performanceTracksOptimizeDepsPlugin()]
 };
 function createVirtualEntriesPlugin(entries, routerPathRef) {
   const virtualModules = {};
@@ -3310,7 +3312,7 @@ function createVirtualEntriesPlugin(entries, routerPathRef) {
   };
 }
 function onwarn(warning, defaultHandler) {
-  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE") {
+  if (warning.code === "MODULE_LEVEL_DIRECTIVE" || warning.code === "SOURCEMAP_ERROR" || warning.code === "EMPTY_BUNDLE" || warning.code === "INEFFECTIVE_DYNAMIC_IMPORT") {
     return;
   }
   if (warning.message?.includes("Sourcemap is likely to be incorrect")) {
@@ -3562,7 +3564,7 @@ function createCloudflareProtocolStubPlugin() {
       if (!code.includes(CF_PREFIX)) return null;
       let ast;
       try {
-        ast = this.parse(code);
+        ast = this.parse(code, { lang: "tsx" });
       } catch {
         return null;
       }
@@ -3718,7 +3720,7 @@ function extractHandlerExportsFromChunk(chunkCode, handlerModules, fnName, detec
       if (detectPassthrough) {
         const eFnName = escapeRegExp(fnName);
         const callStartRe = new RegExp(
-          `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
+          `(?:const|let|var)\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
         );
         const callStart = callStartRe.exec(chunkCode);
         if (callStart) {
@@ -3743,7 +3745,7 @@ function evictHandlerCode(code, exports, fnName, brand) {
     if (passthrough) continue;
     const eName = escapeRegExp(name);
     const callStartRe = new RegExp(
-      `const\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
+      `(?:const|let|var)\\s+${eName}\\s*=\\s*${eFnName}\\s*(?:<[^>]*>)?\\s*\\(`
     );
     const startMatch = callStartRe.exec(modified);
     if (!startMatch) continue;
@@ -4091,7 +4093,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const progressInterval = totalDynamic > 0 ? setInterval(() => {
     const elapsed = ((performance.now() - paramsStart) / 1e3).toFixed(1);
     console.log(
-      `[rsc-router] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
+      `[rango] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
     );
   }, 5e3) : void 0;
   try {
@@ -4128,7 +4130,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 get env() {
                   if (buildEnv !== void 0) return buildEnv;
                   throw new Error(
-                    "[rsc-router] ctx.env is not available during build-time getParams(). Configure buildEnv in your rango() plugin options to enable build-time env access."
+                    "[rango] ctx.env is not available during build-time getParams(). Configure buildEnv in your rango() plugin options to enable build-time env access."
                   );
                 }
               };
@@ -4169,7 +4171,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
               resolvedRoutes++;
               if (err.name === "Skip") {
                 console.log(
-                  `[rsc-router]   SKIP route "${routeName}" - ${err.message}`
+                  `[rango]   SKIP route "${routeName}" - ${err.message}`
                 );
                 notifyOnError(
                   registry,
@@ -4182,14 +4184,14 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 continue;
               }
               console.error(
-                `[rsc-router] Failed to get params for prerender route "${routeName}": ${err.message}`
+                `[rango] Failed to get params for prerender route "${routeName}": ${err.message}`
               );
               notifyOnError(registry, err, "prerender", routeName);
               throw err;
             }
           } else {
             console.warn(
-              `[rsc-router] Dynamic prerender route "${routeName}" has no getParams(), skipping`
+              `[rango] Dynamic prerender route "${routeName}" has no getParams(), skipping`
             );
           }
         }
@@ -4200,7 +4202,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
       clearInterval(progressInterval);
       const elapsed = ((performance.now() - paramsStart) / 1e3).toFixed(1);
       console.log(
-        `[rsc-router] Resolved prerender params: ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
+        `[rango] Resolved prerender params: ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`
       );
     }
   }
@@ -4214,7 +4216,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const maxConcurrency = Math.max(...entries.map((e) => e.concurrency));
   const concurrencyNote = maxConcurrency > 1 ? ` (concurrency: ${maxConcurrency})` : "";
   console.log(
-    `[rsc-router] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`
+    `[rango] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`
   );
   debug9?.(
     "prerender loop: %d entries, max concurrency %d",
@@ -4247,7 +4249,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             if (result.passthrough) {
               const elapsed2 = (performance.now() - startUrl).toFixed(0);
               console.log(
-                `[rsc-router]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
+                `[rango]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
               );
               doneCount++;
               break;
@@ -4280,7 +4282,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             }
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.log(
-              `[rsc-router]   OK   ${entry.urlPath.padEnd(40)} (${elapsed}ms)`
+              `[rango]   OK   ${entry.urlPath.padEnd(40)} (${elapsed}ms)`
             );
             doneCount++;
             break;
@@ -4288,7 +4290,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             if (err.name === "Skip") {
               const elapsed2 = (performance.now() - startUrl).toFixed(0);
               console.log(
-                `[rsc-router]   SKIP ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - ${err.message}`
+                `[rango]   SKIP ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - ${err.message}`
               );
               skipCount++;
               notifyOnError(
@@ -4303,7 +4305,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             }
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.error(
-              `[rsc-router]   FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`
+              `[rango]   FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`
             );
             notifyOnError(
               registry,
@@ -4325,7 +4327,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const parts = [`${doneCount} done`];
   if (skipCount > 0) parts.push(`${skipCount} skipped`);
   console.log(
-    `[rsc-router] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`
+    `[rango] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`
   );
   debug9?.(
     "expandPrerenderRoutes done: %d done, %d skipped, %sms (overall %sms)",
@@ -4351,16 +4353,14 @@ async function renderStaticHandlers(state, rscEnv, registry) {
     totalStaticCount += exportNames.length;
   }
   const startStatic = performance.now();
-  console.log(
-    `[rsc-router] Rendering ${totalStaticCount} static handler(s)...`
-  );
+  console.log(`[rango] Rendering ${totalStaticCount} static handler(s)...`);
   for (const [moduleId, exportNames] of state.resolvedStaticModules) {
     let mod;
     try {
       mod = await rscEnv.runner.import(moduleId);
     } catch (err) {
       console.error(
-        `[rsc-router] Failed to import static module ${moduleId}: ${err.message}`
+        `[rango] Failed to import static module ${moduleId}: ${err.message}`
       );
       notifyOnError(registry, err, "static");
       throw err;
@@ -4390,9 +4390,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
               exportValue
             );
             const elapsed = (performance.now() - startHandler).toFixed(0);
-            console.log(
-              `[rsc-router]   OK   ${name.padEnd(40)} (${elapsed}ms)`
-            );
+            console.log(`[rango]   OK   ${name.padEnd(40)} (${elapsed}ms)`);
             staticDone++;
             handled = true;
             break;
@@ -4401,7 +4399,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
           if (err.name === "Skip") {
             const elapsed2 = (performance.now() - startHandler).toFixed(0);
             console.log(
-              `[rsc-router]   SKIP ${name.padEnd(40)} (${elapsed2}ms) - ${err.message}`
+              `[rango]   SKIP ${name.padEnd(40)} (${elapsed2}ms) - ${err.message}`
             );
             staticSkip++;
             notifyOnError(registry, err, "static", void 0, void 0, true);
@@ -4410,16 +4408,14 @@ async function renderStaticHandlers(state, rscEnv, registry) {
           }
           const elapsed = (performance.now() - startHandler).toFixed(0);
           console.error(
-            `[rsc-router]   FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`
+            `[rango]   FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`
           );
           notifyOnError(registry, err, "static");
           throw err;
         }
       }
       if (!handled) {
-        console.warn(
-          `[rsc-router] No router could render static handler "${name}"`
-        );
+        console.warn(`[rango] No router could render static handler "${name}"`);
       }
     }
   }
@@ -4430,7 +4426,7 @@ async function renderStaticHandlers(state, rscEnv, registry) {
   const staticParts = [`${staticDone} done`];
   if (staticSkip > 0) staticParts.push(`${staticSkip} skipped`);
   console.log(
-    `[rsc-router] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`
+    `[rango] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`
   );
   debug9?.(
     "renderStaticHandlers done: %d done, %d skipped, %sms (overall %sms)",
@@ -4478,7 +4474,7 @@ async function resolveHostRouterHandlers(hostRegistry) {
   return errors;
 }
 function formatNoRoutersError(entryPath, errors) {
-  const base = `[rsc-router] No routers found in registry after importing ${entryPath}`;
+  const base = `[rango] No routers found in registry after importing ${entryPath}`;
   if (errors.length === 0) {
     return base;
   }
@@ -4536,7 +4532,7 @@ async function discoverRouters(state, rscEnv) {
       const hostRegistry = serverMod.HostRouterRegistry;
       if (hostRegistry && hostRegistry.size > 0) {
         console.log(
-          `[rsc-router] Found ${hostRegistry.size} host router(s), resolving lazy handlers...`
+          `[rango] Found ${hostRegistry.size} host router(s), resolving lazy handlers...`
         );
         const handlerErrors = await resolveHostRouterHandlers(hostRegistry);
         discoveryErrors.push(...handlerErrors);
@@ -4646,7 +4642,7 @@ async function discoverRouters(state, rscEnv) {
     );
     newPerRouterPrecomputedMap.set(id, routerPrecomputed);
     console.log(
-      `[rsc-router] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
+      `[rango] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
     );
   }
   if (registry.size > 1) {
@@ -4655,7 +4651,7 @@ async function discoverRouters(state, rscEnv) {
     );
     if (autoIds.length > 1) {
       console.warn(
-        `[rsc-router] WARNING: ${autoIds.length} routers use auto-generated IDs (${autoIds.join(", ")}). In multi-router setups, each createRouter() must have an explicit \`id\` option to ensure per-router manifest data is matched correctly at runtime. Example: createRouter({ id: "site", ... })`
+        `[rango] WARNING: ${autoIds.length} routers use auto-generated IDs (${autoIds.join(", ")}). In multi-router setups, each createRouter() must have an explicit \`id\` option to ensure per-router manifest data is matched correctly at runtime. Example: createRouter({ id: "site", ... })`
       );
     }
   }
@@ -4800,7 +4796,7 @@ function writeRouteTypesFiles(state) {
     if (existsSync5(oldCombinedPath)) {
       unlinkSync2(oldCombinedPath);
       console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+        `[rango] Removed stale combined route types: ${oldCombinedPath}`
       );
     }
   } catch {
@@ -4814,7 +4810,7 @@ function writeRouteTypesFiles(state) {
     if (!sourceFile) continue;
     if (sourceFile.includes("node_modules")) {
       throw new Error(
-        `[rsc-router] Router "${id}" has sourceFile inside node_modules: ${sourceFile}
+        `[rango] Router "${id}" has sourceFile inside node_modules: ${sourceFile}
 This means createRouter() stack trace parsing matched a Vite internal frame.
 Set an explicit \`id\` on createRouter() or check the call site.`
       );
@@ -4845,7 +4841,7 @@ Set an explicit \`id\` on createRouter() or check the call site.`
     if (existing !== source) {
       markSelfGenWrite(state, outPath, source);
       writeFileSync3(outPath, source);
-      console.log(`[rsc-router] Generated route types -> ${outPath}`);
+      console.log(`[rango] Generated route types -> ${outPath}`);
     }
   }
 }
@@ -5067,12 +5063,12 @@ function postprocessBundle(state) {
           writeFileSync4(chunkPath, result.code);
           const savedKB = (result.savedBytes / 1024).toFixed(1);
           console.log(
-            `[rsc-router] Evicted ${target.label} (${savedKB} KB saved): ${info.fileName}`
+            `[rango] Evicted ${target.label} (${savedKB} KB saved): ${info.fileName}`
           );
         }
       } catch (replaceErr) {
         console.warn(
-          `[rsc-router] Failed to evict ${target.label}: ${replaceErr.message}`
+          `[rango] Failed to evict ${target.label}: ${replaceErr.message}`
         );
       }
     }
@@ -5110,11 +5106,11 @@ function postprocessBundle(state) {
         writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderManifestEntries).length} entries)`
+          `[rango] Wrote prerender assets (${totalKB} KB total, ${Object.keys(state.prerenderManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
-          `[rsc-router] Failed to write prerender assets: ${err.message}`
+          `[rango] Failed to write prerender assets: ${err.message}`
         );
       }
     }
@@ -5148,11 +5144,11 @@ function postprocessBundle(state) {
         writeFileSync4(rscEntryPath, injection + rscCode);
         const totalKB = (totalBytes / 1024).toFixed(1);
         console.log(
-          `[rsc-router] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticManifestEntries).length} entries)`
+          `[rango] Wrote static assets (${totalKB} KB total, ${Object.keys(state.staticManifestEntries).length} entries)`
         );
       } catch (err) {
         throw new Error(
-          `[rsc-router] Failed to write static assets: ${err.message}`
+          `[rango] Failed to write static assets: ${err.message}`
         );
       }
     }
@@ -5270,12 +5266,17 @@ function pickForwardedRunnerConfig(config) {
   if (r.extensions !== void 0) resolve10.extensions = r.extensions;
   if (r.preserveSymlinks !== void 0)
     resolve10.preserveSymlinks = r.preserveSymlinks;
-  const userEsbuild = config.esbuild;
-  const esbuild = userEsbuild && typeof userEsbuild === "object" ? { ...userEsbuild, jsx: "automatic", jsxImportSource: "react" } : { jsx: "automatic", jsxImportSource: "react" };
+  if (r.tsconfigPaths !== void 0) resolve10.tsconfigPaths = r.tsconfigPaths;
+  const userOxc = config.oxc;
+  const userJsx = userOxc && typeof userOxc === "object" && typeof userOxc.jsx === "object" && userOxc.jsx !== null ? userOxc.jsx : {};
+  const oxc = userOxc && typeof userOxc === "object" ? {
+    ...userOxc,
+    jsx: { ...userJsx, runtime: "automatic", importSource: "react" }
+  } : { jsx: { runtime: "automatic", importSource: "react" } };
   return {
     resolve: resolve10,
     define: config.define,
-    esbuild
+    oxc
   };
 }
 
@@ -5294,7 +5295,7 @@ function ensureCloudflareProtocolLoaderRegistered() {
     );
   } catch (err) {
     console.warn(
-      `[rsc-router] Could not register Node ESM loader hook for cloudflare:* imports (${err?.message ?? err}). Falling back to Vite transform only.`
+      `[rango] Could not register Node ESM loader hook for cloudflare:* imports (${err?.message ?? err}). Falling back to Vite transform only.`
     );
   }
 }
@@ -5305,9 +5306,8 @@ async function createTempRscServer(state, options = {}) {
   const resolveConfig = runnerConfig?.resolve ?? {
     alias: state.userResolveAlias
   };
-  const esbuildConfig = runnerConfig?.esbuild ?? {
-    jsx: "automatic",
-    jsxImportSource: "react"
+  const oxcConfig = runnerConfig?.oxc ?? {
+    jsx: { runtime: "automatic", importSource: "react" }
   };
   return createViteServer({
     root: state.projectRoot,
@@ -5317,7 +5317,7 @@ async function createTempRscServer(state, options = {}) {
     logLevel: "silent",
     resolve: resolveConfig,
     ...runnerConfig?.define ? { define: runnerConfig.define } : {},
-    esbuild: esbuildConfig,
+    oxc: oxcConfig,
     ...options.cacheDir && { cacheDir: options.cacheDir },
     plugins: [
       rsc({
@@ -5348,7 +5348,7 @@ async function resolveBuildEnv(option, factoryCtx) {
   if (option === "auto") {
     if (factoryCtx.preset !== "cloudflare") {
       throw new Error(
-        '[rsc-router] buildEnv: "auto" is only supported with preset: "cloudflare". Use a factory function or plain object for other presets.'
+        '[rango] buildEnv: "auto" is only supported with preset: "cloudflare". Use a factory function or plain object for other presets.'
       );
     }
     try {
@@ -5364,7 +5364,7 @@ async function resolveBuildEnv(option, factoryCtx) {
       };
     } catch (err) {
       throw new Error(
-        `[rsc-router] buildEnv: "auto" requires wrangler to be installed.
+        `[rango] buildEnv: "auto" requires wrangler to be installed.
 Install it with: pnpm add -D wrangler
 ${err.message}`
       );
@@ -5395,7 +5395,7 @@ async function releaseBuildEnv(s) {
     try {
       await s.buildEnvDispose();
     } catch (err) {
-      console.warn(`[rsc-router] buildEnv dispose failed: ${err.message}`);
+      console.warn(`[rango] buildEnv dispose failed: ${err.message}`);
     }
     s.buildEnvDispose = null;
   }
@@ -5563,9 +5563,7 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
             "getOrCreateTempServer: FAILED message=%s",
             err.message
           );
-          console.warn(
-            `[rsc-router] Failed to create temp runner: ${err.message}`
-          );
+          console.warn(`[rango] Failed to create temp runner: ${err.message}`);
         }
         return null;
       }
@@ -5652,7 +5650,7 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
             }
           } catch (err) {
             console.warn(
-              `[rsc-router] Cloudflare dev discovery failed: ${err.message}
+              `[rango] Cloudflare dev discovery failed: ${err.message}
 ${err.stack}`
             );
           }
@@ -5696,7 +5694,7 @@ ${err.stack}`
           );
         } catch (err) {
           console.warn(
-            `[rsc-router] Router discovery failed: ${err.message}
+            `[rango] Router discovery failed: ${err.message}
 ${err.stack}`
           );
         } finally {
@@ -5776,7 +5774,7 @@ ${err.stack}`
             registry = serverMod.RouterRegistry ?? null;
           } catch (err) {
             console.warn(
-              `[rsc-router] Dev prerender module refresh failed: ${err.message}`
+              `[rango] Dev prerender module refresh failed: ${err.message}`
             );
             res.statusCode = 500;
             res.end(`Prerender handler error: ${err.message}`);
@@ -5834,7 +5832,7 @@ ${err.stack}`
             return;
           } catch (err) {
             console.warn(
-              `[rsc-router] Dev prerender failed for ${pathname}: ${err.message}`
+              `[rango] Dev prerender failed for ${pathname}: ${err.message}`
             );
           }
         }
@@ -5918,7 +5916,7 @@ ${err.stack}`
                 at: Date.now()
               };
               console.warn(
-                `[rsc-router] Runtime re-discovery failed: ${err.message}`
+                `[rango] Runtime re-discovery failed: ${err.message}`
               );
               debugDiscovery?.(
                 "hmr: lastDiscoveryError set (%s) \u2014 manifest preserved at last-good; recovery mode active (any in-scan source change will trigger rediscovery)",
@@ -5951,9 +5949,7 @@ ${err.stack}`
                 }
               }
             } catch (err) {
-              console.error(
-                `[rsc-router] Route regeneration error: ${err.message}`
-              );
+              console.error(`[rango] Route regeneration error: ${err.message}`);
             }
             debugDiscovery?.(
               "watcher: regenerated gen files (%sms)",
@@ -5962,7 +5958,7 @@ ${err.stack}`
             if (s.perRouterManifests.length > 0) {
               refreshRuntimeDiscovery().catch((err) => {
                 console.warn(
-                  `[rsc-router] Runtime re-discovery error: ${err.message}`
+                  `[rango] Runtime re-discovery error: ${err.message}`
                 );
                 resolveDiscoveryGate();
               });
@@ -6088,7 +6084,7 @@ ${err.stack}`
         const rscEnv = tempServer.environments?.rsc;
         if (!rscEnv?.runner) {
           console.warn(
-            "[rsc-router] RSC environment runner not available during build, skipping manifest generation"
+            "[rango] RSC environment runner not available during build, skipping manifest generation"
           );
           return;
         }
@@ -6120,7 +6116,7 @@ ${err.stack}`
 ${err.stack}` : null
         ].filter(Boolean).join("\n");
         throw new Error(
-          `[rsc-router] Build-time router discovery failed:
+          `[rango] Build-time router discovery failed:
 ${details}`,
           { cause: err }
         );
@@ -6150,7 +6146,7 @@ ${details}`,
     // `consumeSelfGenWrite` inside `maybeHandleGeneratedRouteFileMutation`),
     // AND vite's own HMR pipeline (which invalidates the gen file's
     // importers and triggers a second workerd full reload — visible to the
-    // user as a duplicate "[RSCRouter] HMR: version changed" on the client).
+    // user as a duplicate "[Rango] HMR: version changed" on the client).
     //
     // `peekSelfGenWrite` is the authoritative filter: its map only contains
     // paths that `markSelfGenWrite` has registered, so it natively works
@@ -6345,7 +6341,7 @@ async function rango(options) {
           // This ensures the same Context instance is used by both browser entry and RSC proxy modules
           optimizeDeps: {
             exclude: excludeDeps,
-            esbuildOptions: sharedEsbuildOptions
+            rolldownOptions: sharedRolldownOptions
           },
           resolve: {
             alias: rangoAliases,
@@ -6375,7 +6371,7 @@ async function rango(options) {
               optimizeDeps: {
                 include: [nested("rsc-html-stream/client")],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             ssr: {
@@ -6400,7 +6396,7 @@ async function rango(options) {
                   )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             rsc: {
@@ -6417,7 +6413,7 @@ async function rango(options) {
                   )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             }
           }
@@ -6453,7 +6449,7 @@ async function rango(options) {
           const list = candidates.map(
             (f) => "  - " + (f.startsWith(root) ? f.slice(root.length + 1) : f)
           ).join("\n");
-          throw new Error(`[rsc-router] Multiple routers found:
+          throw new Error(`[rango] Multiple routers found:
 ${list}`);
         }
       }
@@ -6472,7 +6468,7 @@ ${list}`);
         return {
           optimizeDeps: {
             exclude: excludeDeps,
-            esbuildOptions: sharedEsbuildOptions
+            rolldownOptions: sharedRolldownOptions
           },
           build: {
             rollupOptions: { onwarn }
@@ -6506,7 +6502,7 @@ ${list}`);
                   nested("rsc-html-stream/client")
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions,
+                rolldownOptions: sharedRolldownOptions,
                 entries: [VIRTUAL_IDS.browser]
               }
             },
@@ -6525,7 +6521,7 @@ ${list}`);
                   )
                 ],
                 exclude: excludeDeps,
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             },
             rsc: {
@@ -6539,7 +6535,7 @@ ${list}`);
                     "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge"
                   )
                 ],
-                esbuildOptions: sharedEsbuildOptions
+                rolldownOptions: sharedRolldownOptions
               }
             }
           }
@@ -6556,7 +6552,7 @@ ${list}`);
         if (rscMinimalCount > 1 && !hasWarnedDuplicate) {
           hasWarnedDuplicate = true;
           console.warn(
-            "[rsc-router] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your vite config \u2014 rango() includes it automatically."
+            "[rango] Duplicate @vitejs/plugin-rsc detected. Remove rsc() from your vite config \u2014 rango() includes it automatically."
           );
         }
       }