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

package/src/vite/router-discovery.ts

@@ -103,7 +103,7 @@ function ensureCloudflareProtocolLoaderRegistered(): void {
     // register() requires Node 18.19+ / 20.6+. Older Node still has the
     // Vite transform as primary defense.
     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.`,
     );
   }
 }
@@ -141,9 +141,8 @@ async function createTempRscServer(
   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,
@@ -153,7 +152,7 @@ async function createTempRscServer(
     logLevel: "silent",
     resolve: resolveConfig,
     ...(runnerConfig?.define ? { define: runnerConfig.define } : {}),
-    esbuild: esbuildConfig as any,
+    oxc: oxcConfig as any,
     ...(options.cacheDir && { cacheDir: options.cacheDir }),
     plugins: [
       rsc({
@@ -203,7 +202,7 @@ async function resolveBuildEnv(
   if (option === "auto") {
     if (factoryCtx.preset !== "cloudflare") {
       throw new Error(
-        '[rsc-router] buildEnv: "auto" is only supported with preset: "cloudflare". ' +
+        '[rango] buildEnv: "auto" is only supported with preset: "cloudflare". ' +
           "Use a factory function or plain object for other presets.",
       );
     }
@@ -225,7 +224,7 @@ async function resolveBuildEnv(
       };
     } catch (err: any) {
       throw new Error(
-        '[rsc-router] buildEnv: "auto" requires wrangler to be installed.\n' +
+        '[rango] buildEnv: "auto" requires wrangler to be installed.\n' +
           `Install it with: pnpm add -D wrangler\n${err.message}`,
       );
     }
@@ -277,7 +276,7 @@ async function releaseBuildEnv(s: DiscoveryState): Promise<void> {
     try {
       await s.buildEnvDispose();
     } catch (err: any) {
-      console.warn(`[rsc-router] buildEnv dispose failed: ${err.message}`);
+      console.warn(`[rango] buildEnv dispose failed: ${err.message}`);
     }
     s.buildEnvDispose = null;
   }
@@ -330,12 +329,14 @@ export function createRouterDiscoveryPlugin(
       viteMode = config.mode;
       // Capture user's resolve aliases for the temp server
       s.userResolveAlias = config.resolve.alias;
-      // Capture the data-only resolution config (resolve.*, define, esbuild)
-      // and the user's resolution plugins (resolveId/load) so the discovery
-      // temp server resolves modules the same way the real environment does.
-      // Without this, third-party resolvers (e.g. vite-tsconfig-paths) are
-      // absent during discovery/prerender/static rendering even though they
-      // apply at request time. See utils/forward-user-plugins.ts.
+      // Capture the data-only resolution config (resolve.*, define, oxc) and
+      // the user's resolution plugins (resolveId/load) so the discovery temp
+      // server resolves modules the same way the real environment does.
+      // Without this, both flavors of user resolution are absent during
+      // discovery/prerender/static rendering even though they apply at request
+      // time: third-party resolvers (e.g. vite-tsconfig-paths, forwarded as
+      // plugins) and Vite 8's native resolve.tsconfigPaths (forwarded in the
+      // data slice). See utils/forward-user-plugins.ts.
       s.userRunnerConfig = pickForwardedRunnerConfig(config);
       s.userResolvePlugins = selectForwardableResolvePlugins(
         config.plugins as any,
@@ -543,9 +544,7 @@ export function createRouterDiscoveryPlugin(
             "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;
       }
@@ -684,7 +683,7 @@ export function createRouterDiscoveryPlugin(
             }
           } catch (err: any) {
             console.warn(
-              `[rsc-router] Cloudflare dev discovery failed: ${err.message}\n${err.stack}`,
+              `[rango] Cloudflare dev discovery failed: ${err.message}\n${err.stack}`,
             );
           }
 
@@ -736,7 +735,7 @@ export function createRouterDiscoveryPlugin(
           );
         } catch (err: any) {
           console.warn(
-            `[rsc-router] Router discovery failed: ${err.message}\n${err.stack}`,
+            `[rango] Router discovery failed: ${err.message}\n${err.stack}`,
           );
         } finally {
           debugDiscovery?.(
@@ -851,7 +850,7 @@ export function createRouterDiscoveryPlugin(
             registry = serverMod.RouterRegistry ?? null;
           } catch (err: any) {
             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}`);
@@ -917,7 +916,7 @@ export function createRouterDiscoveryPlugin(
             return;
           } catch (err: any) {
             console.warn(
-              `[rsc-router] Dev prerender failed for ${pathname}: ${err.message}`,
+              `[rango] Dev prerender failed for ${pathname}: ${err.message}`,
             );
           }
         }
@@ -1031,7 +1030,7 @@ export function createRouterDiscoveryPlugin(
                 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) — manifest preserved at last-good; recovery mode active (any in-scan source change will trigger rediscovery)",
@@ -1074,9 +1073,7 @@ export function createRouterDiscoveryPlugin(
                 }
               }
             } catch (err: any) {
-              console.error(
-                `[rsc-router] Route regeneration error: ${err.message}`,
-              );
+              console.error(`[rango] Route regeneration error: ${err.message}`);
             }
             debugDiscovery?.(
               "watcher: regenerated gen files (%sms)",
@@ -1088,7 +1085,7 @@ export function createRouterDiscoveryPlugin(
             if (s.perRouterManifests.length > 0) {
               refreshRuntimeDiscovery().catch((err: any) => {
                 console.warn(
-                  `[rsc-router] Runtime re-discovery error: ${err.message}`,
+                  `[rango] Runtime re-discovery error: ${err.message}`,
                 );
                 // Even on error, unblock the gate so workerd's reload
                 // doesn't hang indefinitely against the previous manifest.
@@ -1259,7 +1256,7 @@ export function createRouterDiscoveryPlugin(
         const rscEnv = (tempServer.environments as any)?.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;
         }
@@ -1302,7 +1299,7 @@ export function createRouterDiscoveryPlugin(
           .filter(Boolean)
           .join("\n");
         throw new Error(
-          `[rsc-router] Build-time router discovery failed:\n${details}`,
+          `[rango] Build-time router discovery failed:\n${details}`,
           { cause: err },
         );
       } finally {
@@ -1330,7 +1327,7 @@ export function createRouterDiscoveryPlugin(
     // `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

package/src/vite/utils/ast-handler-extract.ts

@@ -48,7 +48,7 @@ function findImportInsertionPos(
 ): number {
   let program: ProgramNode;
   try {
-    program = parseAst(code, { jsx: true });
+    program = parseAst(code, { lang: "tsx" });
   } catch {
     return 0;
   }
@@ -127,7 +127,7 @@ export function findHandlerCalls(
 ): HandlerCallSite[] {
   let program: ProgramNode;
   try {
-    program = parseAst(code, { jsx: true });
+    program = parseAst(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -239,7 +239,7 @@ export function getImportedLocalNames(
   parseAst: (code: string, options?: any) => ProgramNode,
 ): Set<string> {
   try {
-    const program = parseAst(code, { jsx: true });
+    const program = parseAst(code, { lang: "tsx" });
     return getImportedLocalNamesFromProgram(program, importedName);
   } catch {
     return new Set<string>();
@@ -256,7 +256,7 @@ export function extractImportDeclarations(
 ): string[] {
   let program: ProgramNode;
   try {
-    program = parseAst(code, { jsx: true });
+    program = parseAst(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -380,7 +380,7 @@ export function extractModuleLevelDeclarations(
 ): string[] {
   let program: ProgramNode;
   try {
-    program = parseAst(code, { jsx: true });
+    program = parseAst(code, { lang: "tsx" });
   } catch {
     return [];
   }
@@ -468,19 +468,19 @@ export function transformInlineHandlers(
     handlerNames,
   );
 
-  // Track line occurrences for same-line collision handling
-  const lineCounts = new Map<number, number>();
-
   // Collect all import statements to prepend
   const importStatements: string[] = [];
 
-  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()) {
+    // Key the extracted handler on its source-order index (per fnName), NOT its
+    // line number. The id flows into BOTH the export name and the virtual module
+    // path (which hashId hashes for the runtime $$id), and line numbers shift
+    // between the prerender and production build contexts. The index is invariant
+    // to those shifts, keeping the prerender manifest key == the runtime id.
+    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}`;
 
     // Extract the full handler call expression text
     const handlerCode = code.slice(site.callStart, site.callEnd);
@@ -498,7 +498,7 @@ export function transformInlineHandlers(
     s.overwrite(site.callStart, site.callEnd, exportName);
 
     // Build the import specifier for this virtual module
-    const importId = `${virtualPrefix}${filePath}:${site.lineNumber}${lineCount > 0 ? `:${lineCount}` : ""}`;
+    const importId = `${virtualPrefix}${idSuffix}`;
     importStatements.push(`import { ${exportName} } from "${importId}";`);
   }
 

package/src/vite/utils/bundle-analysis.ts

@@ -59,7 +59,7 @@ export function extractHandlerExportsFromChunk(
       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) {
@@ -98,8 +98,10 @@ export function evictHandlerCode(
     if (passthrough) continue;
 
     const eName = escapeRegExp(name);
+    // Match const/let/var: Rolldown (Vite 8) emits top-level bindings in the
+    // non-minified RSC bundle as `var`, whereas Rollup used `const`.
     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;

package/src/vite/utils/forward-user-plugins.ts

@@ -4,14 +4,20 @@
  * The discovery temp server (createTempRscServer) runs the user's handler
  * graph through a throwaway Node Vite server built with `configFile: false`.
  * Without help, that server only sees a fixed Rango-owned plugin set, so any
- * user resolution provided by third-party plugins (e.g. vite-tsconfig-paths)
- * is absent during discovery, prerender, and static handler rendering — even
- * though it applies at request time.
+ * user resolution is absent during discovery, prerender, and static handler
+ * rendering — even though it applies at request time. Two flavors of user
+ * resolution must be carried across:
+ *
+ * - Third-party resolveId plugins (e.g. vite-tsconfig-paths) — forwarded as
+ *   plugin instances, see selectForwardableResolvePlugins.
+ * - Native config-driven resolution, including Vite 8's built-in
+ *   `resolve.tsconfigPaths` (which supersedes vite-tsconfig-paths) — forwarded
+ *   as the data slice, see pickForwardedRunnerConfig.
  *
  * These helpers extract the resolution-relevant slice of the user's resolved
- * config (resolve.*, define, esbuild) and forward the user's resolution
- * plugins into the temp server so discovery resolves modules the same way the
- * real environment does.
+ * config (resolve.*, define, oxc) and forward the user's resolution plugins
+ * into the temp server so discovery resolves modules the same way the real
+ * environment does.
  */
 
 import type { Plugin, ResolvedConfig, UserConfig } from "vite";
@@ -120,22 +126,31 @@ export function selectForwardableResolvePlugins(
 /**
  * The resolution-relevant slice of the user's resolved config that is plain
  * data (no plugin re-execution): everything under `resolve` that influences
- * how specifiers map to files, plus `define` and `esbuild` so transforms and
+ * how specifiers map to files, plus `define` and `oxc` so transforms and
  * compile-time constants match request time.
  */
 export interface ForwardedRunnerConfig {
   resolve: UserConfig["resolve"];
   define: UserConfig["define"];
-  esbuild: UserConfig["esbuild"];
+  oxc: UserConfig["oxc"];
 }
 
 /**
  * Extract the data-only config slice to mirror into the discovery temp server.
  * `alias` is included here so callers no longer need to thread it separately.
  *
- * `esbuild` keeps the user's options but always pins the RSC-required JSX
- * runtime, since the temp server compiles the handler graph as React server
- * components regardless of the user's app-level JSX config.
+ * `tsconfigPaths` is forwarded so Vite 8's native tsconfig `paths` resolution
+ * (a top-level `resolve` flag, off by default) reaches the temp server. The
+ * server is created with `configFile: false` and an explicit, allowlisted
+ * resolve slice, so a flag that is not copied here is simply absent during
+ * discovery — which would make path-aliased imports fail at prerender/static
+ * time the same way unforwarded resolveId plugins did (issue #500).
+ *
+ * `oxc` keeps the user's options but always pins the RSC-required JSX runtime
+ * (automatic, react), since the temp server compiles the handler graph as
+ * React server components regardless of the user's app-level JSX config. Vite 8
+ * replaced the deprecated `esbuild` transform option with `oxc`, so we read and
+ * forward `oxc` exclusively — no `esbuild` field is touched.
  */
 export function pickForwardedRunnerConfig(
   config: ResolvedConfig,
@@ -149,16 +164,30 @@ export function pickForwardedRunnerConfig(
   if (r.extensions !== undefined) resolve.extensions = r.extensions;
   if (r.preserveSymlinks !== undefined)
     resolve.preserveSymlinks = r.preserveSymlinks;
+  if (r.tsconfigPaths !== undefined) resolve.tsconfigPaths = r.tsconfigPaths;
 
-  const userEsbuild = config.esbuild;
-  const esbuild: UserConfig["esbuild"] =
-    userEsbuild && typeof userEsbuild === "object"
-      ? { ...userEsbuild, jsx: "automatic", jsxImportSource: "react" }
-      : { jsx: "automatic", jsxImportSource: "react" };
+  // Pin the RSC JSX runtime on top of the user's oxc options. The user's
+  // jsx sub-options (e.g. `development`) are preserved when present; only
+  // `runtime`/`importSource` are forced to the values the RSC compile needs.
+  const userOxc = config.oxc;
+  const userJsx =
+    userOxc &&
+    typeof userOxc === "object" &&
+    typeof userOxc.jsx === "object" &&
+    userOxc.jsx !== null
+      ? userOxc.jsx
+      : {};
+  const oxc: UserConfig["oxc"] =
+    userOxc && typeof userOxc === "object"
+      ? {
+          ...userOxc,
+          jsx: { ...userJsx, runtime: "automatic", importSource: "react" },
+        }
+      : { jsx: { runtime: "automatic", importSource: "react" } };
 
   return {
     resolve,
     define: config.define,
-    esbuild,
+    oxc,
   };
 }

package/src/vite/utils/shared-utils.ts

@@ -6,39 +6,40 @@ import {
   VIRTUAL_ENTRY_BROWSER,
   VIRTUAL_ENTRY_SSR,
   getVirtualEntryRSC,
+  getVirtualVersionContent,
   VIRTUAL_IDS,
 } from "../plugins/virtual-entries.js";
 
 /**
- * esbuild plugin to provide rsc-router:version virtual module during optimization.
- * This is needed because esbuild runs during Vite's dependency optimization phase,
- * before Vite's plugin system can handle virtual modules.
+ * Rolldown plugin to provide the version virtual module during dependency
+ * optimization. Vite 8 optimizes deps with Rolldown (a Rollup-style plugin
+ * pipeline that is separate from the main plugin set), so this is a
+ * resolveId/load plugin under optimizeDeps.rolldownOptions. Any dep pulled into
+ * optimization that imports the version virtual module gets a "dev" stub here;
+ * the real VERSION is injected into runtime modules by the version plugin.
  */
-const versionEsbuildPlugin = {
+const versionRolldownPlugin = {
   name: "@rangojs/router-version",
-  setup(build: any): void {
-    build.onResolve({ filter: /^rsc-router:version$/ }, (args: any) => ({
-      path: args.path,
-      namespace: "@rangojs/router-virtual",
-    }));
-    build.onLoad(
-      { filter: /.*/, namespace: "@rangojs/router-virtual" },
-      () => ({
-        contents: `export const VERSION = "dev";`,
-        loader: "js",
-      }),
-    );
+  resolveId(id: string): string | undefined {
+    if (id === VIRTUAL_IDS.version) return "\0" + VIRTUAL_IDS.version;
+    return undefined;
+  },
+  load(id: string): string | undefined {
+    if (id === "\0" + VIRTUAL_IDS.version) {
+      return getVirtualVersionContent("dev");
+    }
+    return undefined;
   },
 };
 
 /**
- * Shared esbuild options for dependency optimization.
- * Includes the version stub plugin for all environments.
+ * Shared Rolldown options for dependency optimization (Vite 8).
+ * Includes the version stub plugin and the performance-tracks RSDW patch.
  */
-export const sharedEsbuildOptions: {
+export const sharedRolldownOptions: {
   plugins: any[];
 } = {
-  plugins: [versionEsbuildPlugin, performanceTracksOptimizeDepsPlugin()],
+  plugins: [versionRolldownPlugin, performanceTracksOptimizeDepsPlugin()],
 };
 
 /**
@@ -108,7 +109,9 @@ export function createVirtualEntriesPlugin(
  * - "use client" directives: handled by the RSC plugin, not relevant to Rollup
  * - sourcemap errors: caused by "use client" directive at line 1:0 confusing sourcemap resolution
  * - sourcemap incomplete: plugins that transform without generating sourcemaps (router + RSC plugin)
- * - dynamic/static mixed imports: expected for router internals (e.g. request-context, cache-scope)
+ * - dynamic/static mixed imports: expected for router internals (e.g. request-context, cache-scope).
+ *   Under Rolldown (Vite 8) this surfaces as the INEFFECTIVE_DYNAMIC_IMPORT code emitted directly
+ *   by the bundler, rather than the vite:reporter message handled below (Rollup/Vite 7 shape).
  * - empty bundle: @vitejs/plugin-rsc scan build (step 1/5) produces an empty "index" chunk
  *   because the RSC entry is fully externalized during client-reference analysis
  */
@@ -119,7 +122,8 @@ export function onwarn(
   if (
     warning.code === "MODULE_LEVEL_DIRECTIVE" ||
     warning.code === "SOURCEMAP_ERROR" ||
-    warning.code === "EMPTY_BUNDLE"
+    warning.code === "EMPTY_BUNDLE" ||
+    warning.code === "INEFFECTIVE_DYNAMIC_IMPORT"
   ) {
     return;
   }