@rangojs/router 0.30.0 → 0.31.0

package/src/vite/discovery/build-versions.ts

@@ -593,11 +593,23 @@ export function isSourceMap(fileName: string): boolean {
 }
 
 /**
- * The bundler's region comments around plugin-rsc's server-reference map, as
- * they appear in an unminified chunk (`\0` is printed as two characters).
+ * The bundler's module marker: the comment line before each module's code in
+ * an unminified chunk, naming the module (`\0` printed as two characters).
+ * rolldown before 1.2.15 wraps the code in `//#region <id>` and
+ * `//#endregion`; 1.2.15 (rolldown/rolldown#11235) prints only `// <id>`
+ * where the module starts.
  */
-const SERVER_REFERENCES_REGION_START = `//#region \\0${SERVER_REFERENCES_MODULE_ID.slice(1)}\n`;
-const REGION_END = "//#endregion";
+const MODULE_MARKER = /^\/\/(#region)? (.+)$/gm;
+/**
+ * plugin-rsc's server-reference map: its marker in either form (group 1), and
+ * its body up to the next `// ` line or the region's end. The body stops at
+ * any `// ` line, a comment of its own included, so it never takes in the
+ * code of the module after it.
+ */
+const SERVER_REFERENCE_MAP = new RegExp(
+  `(^//(?:#region)? ${escapeRegExp(`\\0${SERVER_REFERENCES_MODULE_ID.slice(1)}`)}\n)[\\s\\S]*?(?=^//(?: |#endregion))`,
+  "m",
+);
 
 /**
  * Drop the body of the server-reference map from a chunk's source.
@@ -609,33 +621,61 @@ const REGION_END = "//#endregion";
  * hashed by the routers that reach it (resolveRouterMembers), so nothing the
  * map says is lost by skipping it.
  *
- * Works on the region comments, so a minified server build (which has none)
- * keeps the map in every router's hash: more clearing, never less.
+ * Works on the module markers, so a minified server build (which has none),
+ * or a map no marker follows, keeps the map in every router's hash: more
+ * clearing, never less.
  */
 export function stripServerReferenceMap(source: string): string {
-  const start = source.indexOf(SERVER_REFERENCES_REGION_START);
-  if (start === -1) return source;
-  const bodyStart = start + SERVER_REFERENCES_REGION_START.length;
-  const end = source.indexOf(REGION_END, bodyStart);
-  if (end === -1) return source;
-  return source.slice(0, bodyStart) + source.slice(end);
+  return source.replace(SERVER_REFERENCE_MAP, "$1");
 }
 
-const REGION_LINE = /^\/\/#region .*$/gm;
+/**
+ * Every way the bundler can print one of `moduleIds` in a marker. rolldown
+ * prints a path relative to its working directory (`stabilize_id`), so any
+ * trailing run of the path's segments, and any other id as it is.
+ */
+function printedModuleIds(moduleIds: readonly string[]): Set<string> {
+  const printed = new Set<string>();
+  for (const id of moduleIds) {
+    if (!isAbsolutePath(id)) {
+      printed.add(id.replaceAll("\0", "\\0"));
+      continue;
+    }
+    const segments = id.replaceAll("\\", "/").split("/");
+    for (let index = 0; index < segments.length; index++) {
+      printed.add(segments.slice(index).join("/"));
+    }
+  }
+  return printed;
+}
 
 /**
- * Take the module paths out of a chunk's region comments.
+ * Take the module paths out of a chunk's module markers.
+ *
+ * The path says where the build ran, not what it built: it is relative to the
+ * directory `vite build` was started from (`vite build apps/web` from a
+ * repository root prints other paths than `vite build` in the app), it holds
+ * the pnpm store directory with its peer suffix, and a virtual id is printed
+ * verbatim, absolute paths in its query included. The code after the marker
+ * is hashed either way.
  *
- * The bundler prints one before each module's code, and the path says where
- * the build ran, not what it built: it is relative to the directory `vite
- * build` was started from (`vite build apps/web` from a repository root
- * prints other paths than `vite build` in the app), it holds the pnpm store
- * directory with its peer suffix, and a virtual id is printed verbatim,
- * absolute paths in its query included. The code under the comment is hashed
- * either way.
+ * A `//#region` line is always a marker. A `// ` line is one only when it
+ * names a module of the chunk (`moduleIds`): a kept comment or a line of a
+ * multi-line string can start the same way, and is hashed.
  */
-export function stripRegionPaths(source: string): string {
-  return source.replace(REGION_LINE, "//#region");
+export function stripModulePaths(
+  source: string,
+  moduleIds: readonly string[],
+): string {
+  let printed: Set<string> | undefined;
+  return source.replace(
+    MODULE_MARKER,
+    (line, region: string | undefined, name: string) => {
+      if (region) return "//#region";
+      printed ??= printedModuleIds(moduleIds);
+      return printed.has(name.replace(/^(?:\.\.\/)+/, "")) ? "//" : line;
+    },
+  );
 }
 
 /** One thing a version is a hash of: its name and the digest of its bytes. */
@@ -676,8 +716,8 @@ const FOREIGN_FILE = "~";
  *
  * Three things are taken out of a chunk's text first, each because it says
  * where or how the build ran: the server-reference map's body
- * ({@link stripServerReferenceMap}), the paths in region comments
- * ({@link stripRegionPaths}), and the hashed names of bundle files. A name
+ * ({@link stripServerReferenceMap}), the paths in module markers
+ * ({@link stripModulePaths}), and the hashed names of bundle files. A name
  * carries the content hash of its file, and every chunk importing the file
  * has the name in its bytes, so one router's change would otherwise move the
  * digest of every chunk naming its chunk. Only names with a content hash are
@@ -756,8 +796,9 @@ export function digestBundle(
       };
     }
     const references: string[] = [];
-    const text = stripRegionPaths(
+    const text = stripModulePaths(
       stripServerReferenceMap(decoder.decode(bytes)),
+      chunk.moduleIds,
     );
     const blanked = reference
       ? text.replace(reference, (name) => {

package/src/vite/plugins/stable-rsc-output.ts

@@ -121,7 +121,7 @@ export function canonicalAssetsManifestBinding(
  *    (`ServerReferencesManager.claimMap`), which varies with the concurrent
  *    scan builds (e2e/test-app: 2 of 2 consecutive builds differed). Sorted
  *    here so a minified server build, where stripServerReferenceMap finds no
- *    region comments, still hashes the same bytes.
+ *    module markers, still hashes the same bytes.
  * 2. Local name of the assets-manifest import. plugin-rsc imports the manifest
  *    under three names; the bundler merges them into one import per chunk and
  *    keeps a different one from build to build (the cache-versions fixture:

package/src/vite/temp-rsc-server.ts

@@ -1,12 +1,14 @@
 /**
  * The discovery temp RSC server: a minimal Vite server whose module runner
  * imports the user's router files. Shared by dev discovery
- * (discovery/dev-server-phase.ts) and build discovery
- * (discovery/build-discovery-phase.ts).
+ * (discovery/dev-server-phase.ts), build discovery
+ * (discovery/build-discovery-phase.ts) and `rango generate --runtime`
+ * (build/runtime-discovery.ts).
  *
  * Sits in src/vite/, not src/vite/discovery/: the loader hook URL below
- * resolves against this module's import.meta.url, and the published bundle
- * (dist/vite/index.js) ships the hook at the same relative path.
+ * resolves against this module's import.meta.url, and the published bundles
+ * (dist/vite/index.js, dist/bin/rango.js) ship the hook at the same relative
+ * path.
  */
 
 import type { ViteDevServer } from "vite";
@@ -103,6 +105,8 @@ export async function createTempRscServer(
      * shell capture actually runs.
      */
     realSsrEntry?: boolean;
+    /** Caller-specific plugins, appended after the forwarded user plugins. */
+    plugins?: import("vite").Plugin[];
   } = {},
 ): Promise<ViteDevServer> {
   // Install the Node ESM loader hook before any module evaluation so
@@ -218,6 +222,7 @@ export async function createTempRscServer(
       // IMPORT_REWRITE_PLUGINS) and placed last so framework resolution runs first;
       // Vite re-sorts by `enforce`, so `enforce: "pre"` resolvers still lead.
       ...state.userResolvePlugins,
+      ...(options.plugins ?? []),
     ],
   });
 }

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

@@ -139,6 +139,8 @@ export interface ForwardedRunnerConfig {
 /**
  * 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.
+ * Accepts the unresolved config too: `rango generate --runtime` must not
+ * resolve it (that runs rango()'s configResolved, which writes gen files).
  *
  * `tsconfigPaths` is forwarded so Vite 8's native tsconfig `paths` resolution
  * (a top-level `resolve` flag, off by default) reaches the temp server. The
@@ -154,9 +156,9 @@ export interface ForwardedRunnerConfig {
  * forward `oxc` exclusively — no `esbuild` field is touched.
  */
 export function pickForwardedRunnerConfig(
-  config: ResolvedConfig,
+  config: Pick<ResolvedConfig | UserConfig, "resolve" | "define" | "oxc">,
 ): ForwardedRunnerConfig {
-  const r = config.resolve ?? ({} as ResolvedConfig["resolve"]);
+  const r = config.resolve ?? {};
   const resolve: NonNullable<UserConfig["resolve"]> = {};
   if (r.alias !== undefined) resolve.alias = r.alias as any;
   if (r.dedupe !== undefined) resolve.dedupe = r.dedupe;