@rangojs/router 0.24.4 → 0.25.0

package/src/vite/rango.ts

@@ -15,6 +15,7 @@ import {
 import { useCacheTransform } from "./plugins/use-cache-transform.js";
 import { transitionWhenHoistPlugin } from "./plugins/transition-when-hoist.js";
 import { clientUrlsRevalidateHoistPlugin } from "./plugins/client-urls-revalidate-hoist.js";
+import { createClientUrlRevalidateIndex } from "./discovery/state.js";
 import { clientRefDedup } from "./plugins/client-ref-dedup.js";
 import { stableRscOutput } from "./plugins/stable-rsc-output.js";
 import { VIRTUAL_IDS } from "./plugins/virtual-entries.js";
@@ -593,7 +594,8 @@ export async function rango(options?: RangoOptions): Promise<PluginOption[]> {
 
   plugins.push(createLoaderDirectiveGuardPlugin());
   plugins.push(transitionWhenHoistPlugin());
-  plugins.push(...clientUrlsRevalidateHoistPlugin());
+  const clientUrlRevalidate = createClientUrlRevalidateIndex();
+  plugins.push(...clientUrlsRevalidateHoistPlugin(clientUrlRevalidate));
   plugins.push(createLoaderScanStubPlugin());
   plugins.push(exposeActionId());
   plugins.push(
@@ -623,6 +625,7 @@ export async function rango(options?: RangoOptions): Promise<PluginOption[]> {
       prerenderOnError: options?.prerender?.onError,
       discovery: options?.discovery,
       clientChunkCtx,
+      clientUrlRevalidate,
       headScripts: resolvedOptions.headScripts,
       progressiveChunkSize: resolvedOptions.progressiveChunkSize,
     }),

package/src/vite/router-discovery.ts

@@ -64,6 +64,7 @@ import {
 } from "./discovery/self-gen-tracking.js";
 import { discoverRouters } from "./discovery/discover-routers.js";
 import {
+  componentUseSignature,
   recordClientUrlsModule,
   refreshRecordedClientUrlProjections,
 } from "./discovery/client-urls-projection.js";
@@ -334,8 +335,9 @@ export async function createTempRscServer(
       transitionWhenHoistPlugin(),
       // clientUrls() revalidate() predicates move to the server here too:
       // discovery serializes the SSR copy's markers and the RSC realm
-      // registers the predicates the materialized stubs call.
-      ...clientUrlsRevalidateHoistPlugin(),
+      // registers the predicates the materialized stubs call. The index is
+      // the main plugin's, so its group modules import the files assigned here.
+      ...clientUrlsRevalidateHoistPlugin(state.clientUrlRevalidate),
       // Dev prerender must use dev-mode IDs (path-based) to match the workerd
       // runtime. forceBuild produces hashed IDs for production bundle consistency.
       exposeInternalIds(options.forceBuild ? { forceBuild: true } : undefined),
@@ -1982,6 +1984,7 @@ export function createRouterDiscoveryPlugin(
                   s,
                   (server.environments as any)?.ssr,
                   serverMod,
+                  rscEnv,
                 );
                 // Force the routes-manifest virtual module to re-transform:
                 // its generated code REPLAYS projections (clear + set) on
@@ -2043,6 +2046,17 @@ export function createRouterDiscoveryPlugin(
           }, 100);
         };
 
+        // The `.use` signature of each component-use module at its last
+        // save: a save that keeps it (markup, hooks) re-projects nothing.
+        const componentUseSignatures = new Map<string, string>();
+        const componentUseChanged = (file: string, source: string) => {
+          const next = componentUseSignature(source, file);
+          const changed = next !== componentUseSignatures.get(file);
+          if (next === undefined) componentUseSignatures.delete(file);
+          else componentUseSignatures.set(file, next);
+          return changed;
+        };
+
         const handleRouteFileChange = (filePath: string) => {
           if (isOutsideApp(filePath)) {
             debugDiscovery?.(
@@ -2105,7 +2119,18 @@ export function createRouterDiscoveryPlugin(
               hasClientUrls =
                 firstCodeMatchIndex(source, /\bclientUrls\(/g) >= 0;
             }
-            if (!inRecoveryMode && isUseClient && !hasClientUrls) return;
+            // A component whose `.use` a group reads changes the group's
+            // projection too (its loaders, loading(), revalidate() keys):
+            // on its first save, and when a `.use` changed, came or went.
+            const hasComponentUse = componentUseChanged(filePath, source);
+            if (
+              !inRecoveryMode &&
+              isUseClient &&
+              !hasClientUrls &&
+              !hasComponentUse
+            ) {
+              return;
+            }
             // Cheap raw pre-check first; only when a candidate token is present
             // do we confirm it occurs in real code (not a comment/string) via a
             // single allocation-free code-region scan. Most saved files contain
@@ -2127,7 +2152,8 @@ export function createRouterDiscoveryPlugin(
               !inRecoveryMode &&
               !hasUrls &&
               !hasCreateRouter &&
-              !hasClientUrls
+              !hasClientUrls &&
+              !hasComponentUse
             ) {
               return;
             }
@@ -2143,11 +2169,12 @@ export function createRouterDiscoveryPlugin(
               );
             } else {
               debugDiscovery?.(
-                "watcher: %s matches (urls=%s, router=%s, clientUrls=%s)",
+                "watcher: %s matches (urls=%s, router=%s, clientUrls=%s, componentUse=%s)",
                 filePath,
                 hasUrls,
                 hasCreateRouter,
                 hasClientUrls,
+                hasComponentUse,
               );
             }
             // A "use client" clientUrls module is an HMR-accepted client
@@ -2159,7 +2186,10 @@ export function createRouterDiscoveryPlugin(
             // against the refreshed projection (installed by the pre-entry
             // refresh in discover-routers.ts).
             const mainRscEnv = (server.environments as any)?.rsc;
-            if (isUseClient && hasClientUrls && mainRscEnv?.runner) {
+            if (
+              ((isUseClient && hasClientUrls) || hasComponentUse) &&
+              mainRscEnv?.runner
+            ) {
               const rscGraph = mainRscEnv.moduleGraph;
               if (rscGraph?.getModulesByFile) {
                 // Importers must be invalidated too: the virtual RSC entry
@@ -2483,7 +2513,9 @@ export function createRouterDiscoveryPlugin(
           () => generateRoutesManifestModule(s),
         );
         debugRoutes?.("manifest module emitted (%d bytes)", code?.length ?? 0);
-        return code;
+        // Only ever a bare import (the RSC entry's), so a build whose
+        // treeshake.moduleSideEffects is false would drop it; load outranks it.
+        return { code, moduleSideEffects: "no-treeshake" };
       }
       // Per-router virtual modules: pure data exports (no side effects).
       // ensureRouterManifest() imports the module and stores the data.

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

@@ -10,12 +10,29 @@ import {
 import { resolve } from "node:path";
 
 import { escapeRegExp } from "../../regex-escape.js";
+import { substitutePatternParams } from "../../router/substitute-pattern-params.js";
 import { encodePathRemainder } from "../../router/url-params.js";
 
 export function encodePathParam(value: unknown): string {
   return encodePathRemainder(String(value), encodeURIComponent);
 }
 
+/**
+ * `ctx.reverse` of a build-time `getParams()`. Substitutes like the dev-mode
+ * one (`createReverseFunction`, router/prerender-match.ts): a missing required
+ * param throws `Missing param`, with or without a params object, instead of
+ * leaving a literal `:param` in the URL.
+ */
+export function createGetParamsReverse(
+  routes: Record<string, string>,
+): (name: string, params?: Record<string, string>) => string {
+  return (name, params) => {
+    const pattern = routes[name];
+    if (!pattern) throw new Error(`Unknown route: "${name}"`);
+    return substitutePatternParams(pattern, params ?? {}, name);
+  };
+}
+
 export function substituteRouteParams(
   pattern: string,
   params: Record<string, string>,