@rangojs/router 0.31.0 → 0.33.0

package/dist/vite/index.js

@@ -138,11 +138,11 @@ var init_logging = __esm({
 // src/browser/notify-listeners.ts
 function notifyListeners(entries, notify, isActive, shouldContinue) {
   const errors = [];
-  for (const entry of entries) {
+  for (const entry2 of entries) {
     if (shouldContinue && !shouldContinue()) break;
-    if (isActive && !isActive(entry)) continue;
+    if (isActive && !isActive(entry2)) continue;
     try {
-      notify(entry);
+      notify(entry2);
     } catch (error) {
       errors.push(error);
     }
@@ -179,21 +179,36 @@ function getRawCookieValue(cookieString, name) {
   }
   return null;
 }
-function encodeStateValue(version, timestamp) {
-  return `${encodeURIComponent(version)}:${timestamp}`;
+function encodeStateValue(version, timestamp, write = 0) {
+  const base = `${encodeURIComponent(version)}:${timestamp}`;
+  return write === 0 ? base : `${base}:${write}`;
 }
 function decodeStateValue(raw) {
   const colon = raw.indexOf(":");
   if (colon <= 0) return null;
-  const timestamp = Number(raw.slice(colon + 1));
-  if (!Number.isFinite(timestamp)) return null;
+  const parts = raw.slice(colon + 1).split(":");
+  if (parts.length > 2) return null;
+  const timestamp = parseStatePart(parts[0]);
+  const write = parts.length === 2 ? parseStatePart(parts[1]) : 0;
+  if (timestamp === null || write === null) return null;
   let version;
   try {
     version = decodeURIComponent(raw.slice(0, colon));
   } catch {
     return null;
   }
-  return { version, timestamp };
+  return { version, timestamp, write };
+}
+function parseStatePart(part) {
+  if (part === "") return null;
+  const value = Number(part);
+  return Number.isFinite(value) ? value : null;
+}
+function stateEpoch(raw) {
+  const first = raw.indexOf(":");
+  if (first < 0) return raw;
+  const second = raw.indexOf(":", first + 1);
+  return second < 0 ? raw : raw.slice(0, second);
 }
 function mintStateValue(version, prevRaw) {
   const prevTs = prevRaw ? decodeStateValue(prevRaw)?.timestamp ?? 0 : 0;
@@ -246,9 +261,11 @@ function getRangoState() {
   }
   if (read.value !== null) {
     if (read.value !== mirror) {
+      const rotated = mirror === null || stateEpoch(mirror) !== stateEpoch(read.value);
       mirror = read.value;
       cookieBacked = true;
-      notifyExternalRotation(read.value);
+      if (rotated) notifyExternalRotation(read.value);
+      else externalWriteObserver?.();
     } else {
       cookieBacked = true;
     }
@@ -265,7 +282,7 @@ function getRangoState() {
   }
   return mirror;
 }
-var cookieName, currentVersion, mirror, cookieBacked, externalRotationObserver;
+var cookieName, currentVersion, mirror, cookieBacked, externalRotationObserver, externalWriteObserver;
 var init_rango_state = __esm({
   "src/browser/rango-state.ts"() {
     "use strict";
@@ -275,6 +292,7 @@ var init_rango_state = __esm({
     mirror = null;
     cookieBacked = false;
     externalRotationObserver = null;
+    externalWriteObserver = null;
   }
 });
 
@@ -318,6 +336,52 @@ var init_wire_params = __esm({
   }
 });
 
+// src/prefetch-source-scope.ts
+function formatSourceLabel(shape, page) {
+  const parts = [];
+  if (shape.keys) {
+    parts.push(
+      "$k=" + Object.keys(page.params).sort().map(encodeURIComponent).join(",")
+    );
+  }
+  if (shape.route) parts.push(entry("$r", page.routeName));
+  for (const name of shape.names) {
+    parts.push(entry(encodeURIComponent(name), page.params[name]));
+  }
+  return parts.join("&");
+}
+function entry(name, value) {
+  return value === void 0 ? name : name + "=" + encodeURIComponent(value);
+}
+function paramsScopeLabel(header) {
+  if (!header?.startsWith(PARAMS_SCOPE_PREFIX)) return void 0;
+  return header.slice(PARAMS_SCOPE_PREFIX.length);
+}
+function parseSourceShape(label) {
+  let keys = false;
+  let route2 = false;
+  const names = [];
+  for (const part of label.split("&")) {
+    if (part === "") continue;
+    const eq = part.indexOf("=");
+    const name = eq === -1 ? part : part.slice(0, eq);
+    if (name === "$k") keys = true;
+    else if (name === "$r") route2 = true;
+    else names.push(decodeURIComponent(name));
+  }
+  return { keys, route: route2, names: names.sort() };
+}
+function sourceShapeId(shape) {
+  return (shape.keys ? "k" : "") + (shape.route ? "r" : "") + ":" + shape.names.map(encodeURIComponent).join(",");
+}
+var PARAMS_SCOPE_PREFIX;
+var init_prefetch_source_scope = __esm({
+  "src/prefetch-source-scope.ts"() {
+    "use strict";
+    PARAMS_SCOPE_PREFIX = "params; ";
+  }
+});
+
 // src/browser/prefetch/cache.ts
 function isPrefetchCacheDisabled() {
   return cacheTTL <= 0;
@@ -330,6 +394,31 @@ function buildPrefetchKey(prefix, targetUrl) {
 function buildSourceKey(rangoState, sourceHref, targetUrl) {
   return rangoState + "\0" + sourceHref + "\0" + targetUrl.pathname + targetUrl.search;
 }
+function buildParamsKey(rangoState, label, targetUrl) {
+  return buildPrefetchKey(rangoState + "\0p:" + label, targetUrl);
+}
+function rememberParamsShape(targetUrl, label) {
+  const target = buildPrefetchKey("", targetUrl);
+  const shape = parseSourceShape(label);
+  let shapes = paramsShapes.get(target);
+  if (!shapes) {
+    if (paramsShapes.size >= maxPrefetchCacheSize) {
+      const oldest = paramsShapes.keys().next().value;
+      if (oldest !== void 0) paramsShapes.delete(oldest);
+    }
+    shapes = /* @__PURE__ */ new Map();
+    paramsShapes.set(target, shapes);
+  }
+  shapes.set(sourceShapeId(shape), shape);
+}
+function paramsCandidateKeys(rangoState, targetUrl, page) {
+  if (!page) return [];
+  const shapes = paramsShapes.get(buildPrefetchKey("", targetUrl));
+  if (!shapes) return [];
+  return [...shapes.values()].sort((a, b) => weightOf(b) - weightOf(a)).map(
+    (shape) => buildParamsKey(rangoState, formatSourceLabel(shape, page), targetUrl)
+  );
+}
 function forEachAlias(key, fn) {
   const aliases = inflightAliases.get(key);
   if (aliases) {
@@ -341,20 +430,20 @@ function forEachAlias(key, fn) {
 function hasPrefetch(key) {
   if (inflight.has(key)) return true;
   if (cacheTTL <= 0) return false;
-  const entry = cache.get(key);
-  if (!entry) return false;
-  if (Date.now() - entry.timestamp > cacheTTL) {
-    entry.entry.dispose?.();
+  const entry2 = cache.get(key);
+  if (!entry2) return false;
+  if (Date.now() - entry2.timestamp > cacheTTL || isPrefetchStale(entry2.entry)) {
+    entry2.entry.dispose?.();
     cache.delete(key);
     return false;
   }
   return true;
 }
-function storePrefetch(key, entry, fetchGeneration) {
+function storePrefetch(key, entry2, fetchGeneration, inflightKey = key) {
   if (cacheTTL <= 0) return;
   if (fetchGeneration !== generation) return;
-  if (adoptedKeys.has(key)) {
-    forEachAlias(key, (k) => adoptedKeys.delete(k));
+  if (adoptedKeys.has(inflightKey)) {
+    forEachAlias(inflightKey, (k) => adoptedKeys.delete(k));
     return;
   }
   const now = Date.now();
@@ -377,18 +466,24 @@ function storePrefetch(key, entry, fetchGeneration) {
       cache.delete(oldest);
     }
   }
-  cache.set(key, { entry, timestamp: now });
+  cache.set(key, { entry: entry2, timestamp: now });
   if (now < earliestTimestamp) earliestTimestamp = now;
 }
-function removePrefetch(key, entry) {
-  if (cache.get(key)?.entry === entry) {
-    entry.dispose?.();
+function removePrefetch(key, entry2) {
+  if (cache.get(key)?.entry === entry2) {
+    entry2.dispose?.();
     cache.delete(key);
   }
 }
 function currentGeneration() {
   return generation;
 }
+function currentPrefetchEpoch() {
+  return staleEpoch;
+}
+function isPrefetchStale(entry2) {
+  return entry2.epoch < staleEpoch;
+}
 function markPrefetchInflight(key) {
   inflight.add(key);
 }
@@ -409,7 +504,7 @@ function clearPrefetchInflight(key) {
 function isFragmentPassthroughEnabled() {
   return fragmentPassthroughEnabled;
 }
-var cacheTTL, fragmentPassthroughEnabled, maxPrefetchCacheSize, cache, inflight, earliestTimestamp, inflightPromises, inflightAliases, adoptedKeys, generation;
+var cacheTTL, fragmentPassthroughEnabled, maxPrefetchCacheSize, cache, inflight, earliestTimestamp, inflightPromises, inflightAliases, adoptedKeys, paramsShapes, generation, staleEpoch, weightOf;
 var init_cache = __esm({
   "src/browser/prefetch/cache.ts"() {
     "use strict";
@@ -417,6 +512,7 @@ var init_cache = __esm({
     init_invalidation();
     init_rango_state();
     init_wire_params();
+    init_prefetch_source_scope();
     cacheTTL = 3e5;
     fragmentPassthroughEnabled = true;
     maxPrefetchCacheSize = 100;
@@ -426,7 +522,10 @@ var init_cache = __esm({
     inflightPromises = /* @__PURE__ */ new Map();
     inflightAliases = /* @__PURE__ */ new Map();
     adoptedKeys = /* @__PURE__ */ new Set();
+    paramsShapes = /* @__PURE__ */ new Map();
     generation = 0;
+    staleEpoch = 0;
+    weightOf = (shape) => shape.names.length + (shape.route ? 1 : 0) + (shape.keys ? 1 : 0);
   }
 });
 
@@ -627,11 +726,12 @@ var init_validate_redirect_origin = __esm({
 });
 
 // src/prefetch-markers.ts
-var PREFETCH_HEADER, PREFETCH_FAILED_ROW;
+var PREFETCH_HEADER, PREFETCH_INTENT, PREFETCH_FAILED_ROW;
 var init_prefetch_markers = __esm({
   "src/prefetch-markers.ts"() {
     "use strict";
     PREFETCH_HEADER = "X-Rango-Prefetch";
+    PREFETCH_INTENT = "intent";
     PREFETCH_FAILED_ROW = ":H_0\n";
   }
 });
@@ -710,12 +810,17 @@ var init_segment_fragments = __esm({
 function getRegisteredStore() {
   return registeredStore;
 }
-var registeredStore;
+function getCommittedPage() {
+  return readCommittedPage ? readCommittedPage() : null;
+}
+var registeredStore, readCommittedPage;
 var init_navigation_store_handle = __esm({
   "src/browser/navigation-store-handle.ts"() {
     "use strict";
+    init_action_fence();
     init_rango_state();
     registeredStore = null;
+    readCommittedPage = null;
   }
 });
 
@@ -746,31 +851,42 @@ var init_wire_protocol = __esm({
 function setPrefetchDecoder(fn) {
   decoder = fn;
 }
-function makeRespawn(storageKey, reserve, scope) {
+function makeRespawn(storageKey, reserve, slot, epoch) {
   return () => {
     const [body, nextReserve] = reserve.tee();
     const payload = decoder(Promise.resolve(new Response(body)));
     payload.catch(() => {
     });
-    const entry = {
+    const entry2 = {
       payload,
       streamComplete: Promise.resolve(),
-      scope,
+      scope: slot.scope,
+      paramsLabel: slot.paramsLabel,
+      epoch,
       complete: true,
       dispose: () => {
         nextReserve.cancel().catch(() => {
         });
       }
     };
-    entry.respawn = makeRespawn(storageKey, nextReserve, scope);
-    payload.catch(() => removePrefetch(storageKey, entry));
-    return entry;
+    entry2.respawn = makeRespawn(storageKey, nextReserve, slot, epoch);
+    payload.catch(() => removePrefetch(storageKey, entry2));
+    return entry2;
   };
 }
-function isSamePage(url) {
+function committedHref() {
+  const committed = getRegisteredStore()?.getSegmentState().currentUrl;
+  return committed ? new URL(committed, window.location.origin).href : window.location.href;
+}
+function withoutHash(href2) {
+  const hash = href2.indexOf("#");
+  return hash === -1 ? href2 : href2.slice(0, hash);
+}
+function isSamePage(url, sourceHref) {
   try {
     const target = new URL(url, window.location.origin);
-    return target.pathname + target.search === window.location.pathname + window.location.search;
+    const source = new URL(sourceHref, window.location.origin);
+    return target.pathname + target.search === source.pathname + source.search;
   } catch {
     return false;
   }
@@ -793,8 +909,21 @@ function buildPrefetchUrl(url, segmentIds, version, routerId2) {
     rewriteTarget: getRegisteredStore()?.getHistoryEntryMemory()?.rewriteTarget
   });
 }
-function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope, rangoState, expectedRouterId, signal) {
+function prefetchStorageSlot(forceSourceScope, scopeHeader, sourceKey, wildcardKey, stateKey, targetUrl) {
+  if (forceSourceScope || scopeHeader === "source") {
+    return { scope: "source", key: sourceKey };
+  }
+  const label = paramsScopeLabel(scopeHeader);
+  if (label === void 0) return { scope: "wildcard", key: wildcardKey };
+  return {
+    scope: "params",
+    key: buildParamsKey(stateKey, label, targetUrl),
+    paramsLabel: label
+  };
+}
+function executePrefetchFetch(wildcardKey, sourceKey, sourceHref, targetUrl, forceSourceScope, rangoState, intent, expectedRouterId, signal) {
   const gen = currentGeneration();
+  const epoch = currentPrefetchEpoch();
   const inflightKeys = forceSourceScope ? [sourceKey] : [wildcardKey, sourceKey];
   for (const k of inflightKeys) markPrefetchInflight(k);
   let publishedKey;
@@ -819,7 +948,7 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
         once: true
       });
   }
-  const promise = fetch(fetchUrl, {
+  const promise = fetch(targetUrl.toString(), {
     priority: "low",
     // During an action's flight the state is not rotated, so the old
     // X-Rango-State still matches the Vary-keyed HTTP-cache entry; bypass it so
@@ -830,8 +959,8 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
     signal: effectiveSignal,
     headers: {
       "X-Rango-State": rangoState,
-      "X-RSC-Router-Client-Path": window.location.href,
-      [PREFETCH_HEADER]: "1",
+      "X-RSC-Router-Client-Path": sourceHref,
+      [PREFETCH_HEADER]: intent ? PREFETCH_INTENT : "1",
       ...isFragmentPassthroughEnabled() && {
         [SEGMENT_FRAGMENT_CAPABILITY_HEADER]: "1"
       }
@@ -844,8 +973,15 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
     if (isForeignRouterId(response, expectedRouterId)) {
       return null;
     }
-    const scope = forceSourceScope || response.headers.get("x-rsc-prefetch-scope") === "source" ? "source" : "wildcard";
-    const storageKey = scope === "source" ? sourceKey : wildcardKey;
+    const slot = prefetchStorageSlot(
+      forceSourceScope,
+      response.headers.get("x-rsc-prefetch-scope"),
+      sourceKey,
+      wildcardKey,
+      stateEpoch(rangoState),
+      targetUrl
+    );
+    const storageKey = slot.key;
     let resolveStreamComplete;
     let endedCleanly = false;
     const streamComplete = new Promise((resolve16) => {
@@ -871,10 +1007,12 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
     const payload = decoder(Promise.resolve(decodeSource));
     payload.catch(() => {
     });
-    const entry = {
+    const entry2 = {
       payload,
       streamComplete,
-      scope,
+      scope: slot.scope,
+      paramsLabel: slot.paramsLabel,
+      epoch,
       complete: false,
       stallTimer: timeoutId,
       ...reserve && {
@@ -884,26 +1022,29 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
         }
       }
     };
-    storePrefetch(storageKey, entry, gen);
+    storePrefetch(storageKey, entry2, gen, inflightKeys[0]);
+    if (slot.paramsLabel !== void 0) {
+      rememberParamsShape(targetUrl, slot.paramsLabel);
+    }
     publishedKey = storageKey;
-    publishedEntry = entry;
-    payload.catch(() => removePrefetch(storageKey, entry));
+    publishedEntry = entry2;
+    payload.catch(() => removePrefetch(storageKey, entry2));
     streamComplete.then(() => {
-      if (!endedCleanly) removePrefetch(storageKey, entry);
+      if (!endedCleanly) removePrefetch(storageKey, entry2);
     });
     Promise.allSettled([payload, streamComplete]).then(([decode]) => {
       clearTimeout(timeoutId);
       if (decode.status === "fulfilled" && endedCleanly) {
-        entry.complete = true;
+        entry2.complete = true;
         if (reserve) {
-          entry.respawn = makeRespawn(storageKey, reserve, scope);
-          if (!hasPrefetch(storageKey)) {
-            storePrefetch(storageKey, entry.respawn(), gen);
+          entry2.respawn = makeRespawn(storageKey, reserve, slot, epoch);
+          if (!isPrefetchStale(entry2) && !hasPrefetch(storageKey)) {
+            storePrefetch(storageKey, entry2.respawn(), gen);
           }
         }
       }
     });
-    return entry;
+    return entry2;
   }).catch(() => null).finally(() => {
     clearPrefetchInflight(inflightKeys[0]);
     if (publishedKey === void 0) clearTimeout(timeoutId);
@@ -911,22 +1052,32 @@ function executePrefetchFetch(wildcardKey, sourceKey, fetchUrl, forceSourceScope
   setInflightPromiseWithAliases(inflightKeys, promise);
   return promise;
 }
-function hasPrefetchHit(forceSourceScope, wildcardKey, sourceKey) {
-  return forceSourceScope ? hasPrefetch(sourceKey) : hasPrefetch(wildcardKey) || hasPrefetch(sourceKey);
+function hasPrefetchHit(forceSourceScope, wildcardKey, sourceKey, stateKey, targetUrl) {
+  if (forceSourceScope) return hasPrefetch(sourceKey);
+  return hasPrefetch(wildcardKey) || hasPrefetch(sourceKey) || paramsCandidateKeys(stateKey, targetUrl, getCommittedPage()).some(
+    hasPrefetch
+  );
 }
 function prefetchDirect(url, segmentIds, version, routerId2, prefetchKey) {
   if (!shouldPrefetch()) return;
   const targetUrl = buildPrefetchUrl(url, segmentIds, version, routerId2);
   if (!targetUrl) return;
   const forceSourceScope = prefetchKey === ":source";
-  if (!forceSourceScope && isSamePage(url)) {
+  const sourceHref = committedHref();
+  if (!forceSourceScope && isSamePage(url, sourceHref)) {
     return;
   }
-  const sourceHref = window.location.href;
   const rangoState = getRangoState();
-  const wildcardKey = buildPrefetchKey(rangoState, targetUrl);
-  const sourceKey = buildSourceKey(rangoState, sourceHref, targetUrl);
-  if (hasPrefetchHit(forceSourceScope, wildcardKey, sourceKey)) {
+  const stateKey = stateEpoch(rangoState);
+  const wildcardKey = buildPrefetchKey(stateKey, targetUrl);
+  const sourceKey = buildSourceKey(stateKey, sourceHref, targetUrl);
+  if (hasPrefetchHit(
+    forceSourceScope,
+    wildcardKey,
+    sourceKey,
+    stateKey,
+    targetUrl
+  )) {
     if (IS_BROWSER_DEBUG) {
       debugLog("[prefetch] direct dedup (key already exists)", {
         url,
@@ -949,9 +1100,11 @@ function prefetchDirect(url, segmentIds, version, routerId2, prefetchKey) {
   executePrefetchFetch(
     wildcardKey,
     sourceKey,
-    targetUrl.toString(),
+    sourceHref,
+    targetUrl,
     forceSourceScope,
     rangoState,
+    true,
     routerId2
   );
 }
@@ -960,15 +1113,22 @@ function prefetchQueued(url, segmentIds, version, routerId2, prefetchKey) {
   const targetUrl = buildPrefetchUrl(url, segmentIds, version, routerId2);
   if (!targetUrl) return "";
   const forceSourceScope = prefetchKey === ":source";
-  if (!forceSourceScope && isSamePage(url)) {
+  const sourceHref = committedHref();
+  if (!forceSourceScope && isSamePage(url, sourceHref)) {
     return "";
   }
-  const sourceHref = window.location.href;
   const rangoState = getRangoState();
-  const wildcardKey = buildPrefetchKey(rangoState, targetUrl);
-  const sourceKey = buildSourceKey(rangoState, sourceHref, targetUrl);
+  const stateKey = stateEpoch(rangoState);
+  const wildcardKey = buildPrefetchKey(stateKey, targetUrl);
+  const sourceKey = buildSourceKey(stateKey, sourceHref, targetUrl);
   const queueKey = forceSourceScope ? sourceKey : wildcardKey;
-  if (hasPrefetchHit(forceSourceScope, wildcardKey, sourceKey)) {
+  if (hasPrefetchHit(
+    forceSourceScope,
+    wildcardKey,
+    sourceKey,
+    stateKey,
+    targetUrl
+  )) {
     if (IS_BROWSER_DEBUG) {
       debugLog("[prefetch] queued dedup (key already exists)", {
         url,
@@ -979,20 +1139,30 @@ function prefetchQueued(url, segmentIds, version, routerId2, prefetchKey) {
     }
     return queueKey;
   }
-  const fetchUrlStr = targetUrl.toString();
   enqueuePrefetch(queueKey, (signal) => {
-    if (hasPrefetchHit(forceSourceScope, wildcardKey, sourceKey)) {
+    const liveState = getRangoState();
+    if (stateEpoch(liveState) !== stateKey) return Promise.resolve();
+    if (hasPrefetchHit(
+      forceSourceScope,
+      wildcardKey,
+      sourceKey,
+      stateKey,
+      targetUrl
+    )) {
       return Promise.resolve();
     }
-    if (!forceSourceScope && isSamePage(url)) {
+    const committed = committedHref();
+    if (withoutHash(committed) !== withoutHash(sourceHref) || !forceSourceScope && isSamePage(url, committed)) {
       return Promise.resolve();
     }
     return executePrefetchFetch(
       wildcardKey,
       sourceKey,
-      fetchUrlStr,
+      sourceHref,
+      targetUrl,
       forceSourceScope,
-      rangoState,
+      liveState,
+      false,
       routerId2,
       signal
     ).then(() => {
@@ -1005,7 +1175,9 @@ var init_fetch = __esm({
   "src/browser/prefetch/fetch.ts"() {
     "use strict";
     init_cache();
+    init_prefetch_source_scope();
     init_rango_state();
+    init_cookie_name();
     init_action_fence();
     init_queue();
     init_policy();
@@ -1994,6 +2166,7 @@ var DEFAULT_EXCLUDE_PATTERNS = [
   "**/dist/**",
   "**/coverage/**",
   "**/*.test.{ts,tsx,js,jsx}",
+  "**/*.rsc-test.{ts,tsx,js,jsx}",
   "**/*.spec.{ts,tsx,js,jsx}"
 ];
 function createScanFilter(root, opts) {
@@ -2035,12 +2208,12 @@ function findTsFiles(dir, filter) {
     );
     return results;
   }
-  for (const entry of entries) {
-    const fullPath = join(dir, entry.name);
-    if (entry.isDirectory()) {
-      if (isSkippedSourceScanDir(entry.name)) continue;
+  for (const entry2 of entries) {
+    const fullPath = join(dir, entry2.name);
+    if (entry2.isDirectory()) {
+      if (isSkippedSourceScanDir(entry2.name)) continue;
       results.push(...findTsFiles(fullPath, filter));
-    } else if ((entry.name.endsWith(".ts") || entry.name.endsWith(".tsx") || entry.name.endsWith(".js") || entry.name.endsWith(".jsx")) && !entry.name.includes(".gen.")) {
+    } else if ((entry2.name.endsWith(".ts") || entry2.name.endsWith(".tsx") || entry2.name.endsWith(".js") || entry2.name.endsWith(".jsx")) && !entry2.name.includes(".gen.")) {
       if (filter && !filter(fullPath)) continue;
       results.push(fullPath);
     }
@@ -2883,20 +3056,20 @@ ${lazyImports.join(",\n")}
         return "\0" + id;
       }
       if (importer?.startsWith("\0" + VIRTUAL_HANDLER_PREFIX)) {
-        const entry = virtualHandlers.get(importer);
-        if (entry) {
-          return this.resolve(id, entry.originalModuleId, { skipSelf: true });
+        const entry2 = virtualHandlers.get(importer);
+        if (entry2) {
+          return this.resolve(id, entry2.originalModuleId, { skipSelf: true });
         }
       }
     },
     load(id) {
       if (id.startsWith("\0" + VIRTUAL_HANDLER_PREFIX)) {
-        const entry = virtualHandlers.get(id);
-        if (!entry) return null;
+        const entry2 = virtualHandlers.get(id);
+        if (!entry2) return null;
         return [
-          ...entry.imports,
-          ...entry.declarations,
-          `export const ${entry.exportName} = ${entry.handlerCode};`
+          ...entry2.imports,
+          ...entry2.declarations,
+          `export const ${entry2.exportName} = ${entry2.handlerCode};`
         ].join("\n") + "\n";
       }
       if (id !== RESOLVED_VIRTUAL_LOADER_MANIFEST) return;
@@ -2911,13 +3084,13 @@ ${lazyImports.join(",\n")}
         const results = [];
         try {
           const entries = await fs2.readdir(dir, { withFileTypes: true });
-          for (const entry of entries) {
-            const fullPath = path4.join(dir, entry.name);
-            if (entry.isDirectory()) {
-              if (!isSkippedSourceScanDir(entry.name)) {
+          for (const entry2 of entries) {
+            const fullPath = path4.join(dir, entry2.name);
+            if (entry2.isDirectory()) {
+              if (!isSkippedSourceScanDir(entry2.name)) {
                 results.push(...await scanDir(fullPath));
               }
-            } else if (/\.(ts|tsx|js|jsx)$/.test(entry.name)) {
+            } else if (/\.(ts|tsx|js|jsx)$/.test(entry2.name)) {
               results.push(fullPath);
             }
           }
@@ -4181,8 +4354,8 @@ async function recordEmitted(emitted, file, value) {
   emitted.set(file, { disk: await readSource(file), value });
 }
 async function loadEmittedOrDisk(emitted, hoistedFile, disk, rehoist) {
-  const entry = emitted.get(normalizePath2(hoistedFile));
-  if (entry && (disk === null || entry.disk === disk)) return entry.value;
+  const entry2 = emitted.get(normalizePath2(hoistedFile));
+  if (entry2 && (disk === null || entry2.disk === disk)) return entry2.value;
   return disk === null ? void 0 : rehoist(disk);
 }
 
@@ -4476,6 +4649,7 @@ function getLoaderBodyTags() {
 function getCurrentLoaderBodyId() {
   return loaderBodyScopeALS.getStore()?.loaderId;
 }
+var segmentPinALS = globalThis[/* @__PURE__ */ Symbol.for("rangojs-router:segment-pin")] ??= new AsyncLocalStorage2();
 var PUSH_CALLBACK_SCOPE_KEY = /* @__PURE__ */ Symbol.for(
   "rangojs-router:push-callback-scope"
 );
@@ -5315,6 +5489,7 @@ init_logging();
 
 // src/browser/navigation-store.ts
 init_cache();
+init_action_fence();
 init_rango_state();
 
 // src/browser/react/NavigationProvider.tsx
@@ -5373,12 +5548,12 @@ function getObserver() {
     observer = new IntersectionObserver(
       (entries, currentObserver) => {
         function* intersectingCallbacks() {
-          for (const entry of entries) {
-            if (entry.isIntersecting) {
-              const subscriptions = callbacks.get(entry.target);
+          for (const entry2 of entries) {
+            if (entry2.isIntersecting) {
+              const subscriptions = callbacks.get(entry2.target);
               if (subscriptions) {
-                currentObserver.unobserve(entry.target);
-                callbacks.delete(entry.target);
+                currentObserver.unobserve(entry2.target);
+                callbacks.delete(entry2.target);
                 for (const [subscription, callback] of subscriptions) {
                   yield [subscriptions, subscription, callback];
                 }
@@ -5937,6 +6112,12 @@ var DERIVED_RENDER_BARRIER_DESCRIPTOR = {
 };
 var backgroundWork = new AsyncLocalStorage6();
 
+// src/router/revalidation.ts
+init_prefetch_source_scope();
+
+// src/router/source-reads.ts
+init_prefetch_source_scope();
+
 // src/route-definition/redirect.ts
 init_redirect_origin();
 
@@ -6119,9 +6300,9 @@ function serializeRoute(route2, options, ordinals) {
 }
 function serializeLoaderOptions(loaders, owner, options) {
   const loaderRevalidate = loaders.map(
-    ({ loader: loader3, revalidate: revalidate3 }) => revalidate3.flatMap((entry) => {
-      if (isHoistedRevalidateRef(entry)) return [entry.$$rangoRevalidate];
-      if (typeof entry === "boolean") return [entry];
+    ({ loader: loader3, revalidate: revalidate3 }) => revalidate3.flatMap((entry2) => {
+      if (isHoistedRevalidateRef(entry2)) return [entry2.$$rangoRevalidate];
+      if (typeof entry2 === "boolean") return [entry2];
       if (options.hoisted) {
         throw new Error(
           `clientUrls() revalidate() on loader "${loader3.$$id}" of ${owner} was not hoisted to the server: call revalidate() (the builder's helper, or the one "@rangojs/router/client" exports for a component's .use) with an inline function, an imported predicate or a boolean.`
@@ -6562,25 +6743,25 @@ function fingerprint(node) {
       out.push(JSON.stringify(typeof value === "bigint" ? `${value}n` : value));
       return;
     }
-    let entry = value;
-    if (typeof entry.type === "string") {
-      entry = unwrapExpression(entry);
-      if (entry.type.startsWith("TS")) {
-        visit(entry.expression);
+    let entry2 = value;
+    if (typeof entry2.type === "string") {
+      entry2 = unwrapExpression(entry2);
+      if (entry2.type.startsWith("TS")) {
+        visit(entry2.expression);
         return;
       }
-      out.push(entry.type, "(");
-      if (entry.type === "TemplateElement") {
-        out.push(JSON.stringify(entry.value.raw));
+      out.push(entry2.type, "(");
+      if (entry2.type === "TemplateElement") {
+        out.push(JSON.stringify(entry2.value.raw));
       }
     }
-    for (const key of Object.keys(entry)) {
+    for (const key of Object.keys(entry2)) {
       if (FINGERPRINT_SKIP.has(key)) continue;
-      if (key === "optional" && entry.type === "Identifier") continue;
+      if (key === "optional" && entry2.type === "Identifier") continue;
       out.push(key);
-      visit(entry[key]);
+      visit(entry2[key]);
     }
-    if (typeof entry.type === "string") out.push(")");
+    if (typeof entry2.type === "string") out.push(")");
   };
   visit(node);
   return out.join(" ");
@@ -7146,7 +7327,7 @@ function resolveVersionsFrom(table, routerId2) {
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.31.0",
+  version: "0.33.0",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -7339,7 +7520,7 @@ var package_default = {
     tag: "latest"
   },
   scripts: {
-    build: "pnpm run build:types && pnpm exec 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 exec esbuild src/testing/vitest.ts --bundle --format=esm --outfile=dist/testing/vitest.js --platform=node --packages=external && pnpm exec 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 && mkdir -p dist/bin/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/bin/plugins/cloudflare-protocol-loader-hook.mjs",
+    build: "pnpm run build:types && pnpm exec 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 exec esbuild src/testing/vitest.ts --bundle --format=esm --outfile=dist/testing/vitest.js --platform=node --packages=external && rm -rf dist/bin && pnpm exec esbuild src/bin/rango.ts --bundle --format=esm --splitting --outdir=dist/bin --platform=node --packages=external && chmod +x dist/bin/rango.js && mkdir -p dist/bin/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/bin/plugins/cloudflare-protocol-loader-hook.mjs",
     "build:types": "rm -rf dist/types && pnpm exec tsc -p tsconfig.types.json",
     prepublishOnly: "pnpm build",
     typecheck: "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit && tsc -p tsconfig.augment-check.json --noEmit",
@@ -8243,10 +8424,10 @@ function serverCssRecords(server, projectRoot, serverResources) {
     const key = portableModuleId(id, projectRoot).match(SERVER_CSS_MODULE)?.[1];
     if (key !== void 0) moduleOf.set(key, id);
   }
-  return [...serverResources].map(([key, entry]) => ({
+  return [...serverResources].map(([key, entry2]) => ({
     kind: "server-css",
     key,
-    digest: sha256(entry),
+    digest: sha256(entry2),
     moduleId: moduleOf.get(key)
   }));
 }
@@ -8485,8 +8666,8 @@ function isWorkspaceDevelopment() {
   return !isInstalledFromNpm();
 }
 var SOURCE_EXPORT_SUBPATHS = Object.keys(package_default.exports).filter((key) => {
-  const entry = package_default.exports[key];
-  return Object.entries(entry).some(
+  const entry2 = package_default.exports[key];
+  return Object.entries(entry2).some(
     ([condition, path6]) => condition !== "types" && typeof path6 === "string" && /\.tsx?$/.test(path6)
   );
 }).map((key) => key.replace(/^\./, ""));
@@ -8690,9 +8871,26 @@ function readSourceMemoized(memo, realPath) {
   if (memo) memo.files.set(realPath, source);
   return source;
 }
-function isUrlsDefinitionCall(node) {
+function isUrlsDefinitionCall(node, aliases) {
   const callee = node.expression;
-  return ts3.isIdentifier(callee) && (callee.text === "urls" || callee.text === "clientUrls");
+  return ts3.isIdentifier(callee) && (callee.text === "urls" || callee.text === "clientUrls" || aliases?.has(callee.text) === true);
+}
+function collectUrlsImportAliases(sourceFile) {
+  const aliases = /* @__PURE__ */ new Set();
+  for (const stmt of sourceFile.statements) {
+    if (!ts3.isImportDeclaration(stmt) || !ts3.isStringLiteral(stmt.moduleSpecifier) || stmt.moduleSpecifier.text !== "@rangojs/router" && stmt.moduleSpecifier.text !== "@rangojs/router/client") {
+      continue;
+    }
+    const bindings = stmt.importClause?.namedBindings;
+    if (!bindings || !ts3.isNamedImports(bindings)) continue;
+    for (const el of bindings.elements) {
+      const imported = (el.propertyName ?? el.name).text;
+      if (imported === "urls" || imported === "clientUrls") {
+        aliases.add(el.name.text);
+      }
+    }
+  }
+  return aliases;
 }
 function extractNamePrefixFromInclude(node) {
   if (node.arguments.length >= 3) {
@@ -8939,8 +9137,8 @@ function buildRouteMapFromBlock(block, fullSource, filePath, visited, searchSche
     blockSourceFile
   );
   if (diagnosticsOut) {
-    for (const entry of unresolvable) {
-      diagnosticsOut.push({ ...entry, sourceFile: filePath });
+    for (const entry2 of unresolvable) {
+      diagnosticsOut.push({ ...entry2, sourceFile: filePath });
     }
   }
   for (const inc of includes) {
@@ -9227,7 +9425,7 @@ function countPublicRouteEntries(source) {
 var ROUTER_CALL_PATTERN = /\bcreateRouter\s*[<(]/;
 var ROUTER_CALL_PATTERN_G = /\bcreateRouter\s*[<(]/g;
 function isRoutableSourceFile(name) {
-  return (name.endsWith(".ts") || name.endsWith(".tsx") || name.endsWith(".js") || name.endsWith(".jsx")) && !name.includes(".gen.") && !name.includes(".test.") && !name.includes(".spec.");
+  return (name.endsWith(".ts") || name.endsWith(".tsx") || name.endsWith(".js") || name.endsWith(".jsx")) && !name.includes(".gen.") && !name.includes(".test.") && !name.includes(".rsc-test.") && !name.includes(".spec.");
 }
 function isExcludedScanDir(name) {
   return isUniversallySkippedScanDir(name) || name === "__tests__" || name === "__mocks__";
@@ -9244,13 +9442,13 @@ function findCallSiteFilesRecursive(dir, pattern, patternG, stopAtMatchDir, filt
   }
   const childDirs = [];
   const matchesInDir = [];
-  for (const entry of entries) {
-    const fullPath = join3(dir, entry.name);
-    if (entry.isDirectory()) {
-      if (!isExcludedScanDir(entry.name)) childDirs.push(fullPath);
+  for (const entry2 of entries) {
+    const fullPath = join3(dir, entry2.name);
+    if (entry2.isDirectory()) {
+      if (!isExcludedScanDir(entry2.name)) childDirs.push(fullPath);
       continue;
     }
-    if (!isRoutableSourceFile(entry.name)) continue;
+    if (!isRoutableSourceFile(entry2.name)) continue;
     if (filter && !filter(fullPath)) continue;
     try {
       const source = readFileSync4(fullPath, "utf-8");
@@ -9309,11 +9507,12 @@ function isCreateRouterCall(node) {
   const callee = node.expression;
   return ts5.isIdentifier(callee) && callee.text === "createRouter";
 }
-function extractUrlsArgument(node, sourceFile) {
+function extractUrlsArgument(arg, sourceFile, urlsAliases) {
+  const node = unwrapTypeOperators(arg);
   if (ts5.isIdentifier(node)) {
     return { kind: "variable", name: node.text };
   }
-  if (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node)) {
+  if (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node) || ts5.isCallExpression(node) && isUrlsDefinitionCall(node, urlsAliases)) {
     return { kind: "inline", block: node.getText(sourceFile) };
   }
   return null;
@@ -9330,23 +9529,77 @@ function collectCreateRouterCallChain(endpoint) {
     current = receiver;
   }
 }
+function collectExportedLocalNames(sourceFile) {
+  const names = /* @__PURE__ */ new Set();
+  const addIdentifier = (expr) => {
+    const node = expr && unwrapTypeOperators(expr);
+    if (node && ts5.isIdentifier(node)) names.add(node.text);
+  };
+  for (const statement of sourceFile.statements) {
+    if (ts5.isExportAssignment(statement)) {
+      addIdentifier(statement.expression);
+    } else if (ts5.isExportDeclaration(statement) && !statement.moduleSpecifier && !statement.isTypeOnly && statement.exportClause && ts5.isNamedExports(statement.exportClause)) {
+      for (const element of statement.exportClause.elements) {
+        if (!element.isTypeOnly) {
+          names.add((element.propertyName ?? element.name).text);
+        }
+      }
+    } else if (ts5.isVariableStatement(statement) && hasModifier(statement, ts5.SyntaxKind.ExportKeyword)) {
+      for (const decl of statement.declarationList.declarations) {
+        addIdentifier(decl.initializer);
+      }
+    }
+  }
+  return names;
+}
+function isExportedChain(chainEnd, exportedNames) {
+  let current = chainEnd;
+  while (current.parent && (ts5.isAsExpression(current.parent) || ts5.isSatisfiesExpression(current.parent) || ts5.isParenthesizedExpression(current.parent))) {
+    current = current.parent;
+  }
+  const parent = current.parent;
+  if (!parent) return false;
+  if (ts5.isExportAssignment(parent))
+    return parent.parent === current.getSourceFile();
+  if (!ts5.isVariableDeclaration(parent) || parent.initializer !== current || !ts5.isIdentifier(parent.name)) {
+    return false;
+  }
+  const statement = parent.parent.parent;
+  if (!ts5.isVariableStatement(statement) || !ts5.isSourceFile(statement.parent)) {
+    return false;
+  }
+  return hasModifier(statement, ts5.SyntaxKind.ExportKeyword) || exportedNames.has(parent.name.text);
+}
 function findRouterUrls(sourceFile) {
-  let result = null;
+  const exported = [];
+  const local = [];
+  let anyExported = false;
+  const seen = /* @__PURE__ */ new Set();
+  const urlsAliases = collectUrlsImportAliases(sourceFile);
+  const exportedNames = collectExportedLocalNames(sourceFile);
   function visit(node) {
-    if (result) return;
     if (ts5.isCallExpression(node)) {
       const chain = collectCreateRouterCallChain(node);
-      if (chain) {
+      if (chain && !seen.has(chain[0])) {
         const extracted = [];
+        const unreadable = [];
         const createRouterCall = chain[0];
+        seen.add(createRouterCall);
+        const addMount = (arg, mount) => {
+          const urls2 = extractUrlsArgument(arg, sourceFile, urlsAliases);
+          if (urls2) extracted.push(urls2);
+          else
+            unreadable.push(
+              mount(arg.getText(sourceFile).replace(/\s+/g, " "))
+            );
+        };
         for (const callArg of createRouterCall.arguments) {
           if (!ts5.isObjectLiteralExpression(callArg)) continue;
           for (const prop of callArg.properties) {
             if (!ts5.isPropertyAssignment(prop) || !ts5.isIdentifier(prop.name) || prop.name.text !== "urls") {
               continue;
             }
-            const urls2 = extractUrlsArgument(prop.initializer, sourceFile);
-            if (urls2) extracted.push(urls2);
+            addMount(prop.initializer, (text) => `urls: ${text}`);
             break;
           }
         }
@@ -9354,36 +9607,43 @@ function findRouterUrls(sourceFile) {
           if (!ts5.isPropertyAccessExpression(call.expression) || call.expression.name.text !== "routes" || call.arguments.length === 0) {
             continue;
           }
-          const urls2 = extractUrlsArgument(call.arguments[0], sourceFile);
-          if (urls2) extracted.push(urls2);
-        }
-        if (extracted.length > 0) {
-          result = { createRouterCall, extractions: extracted };
-          return;
+          addMount(call.arguments[0], (text) => `.routes(${text})`);
+        }
+        const isExported = isExportedChain(node, exportedNames);
+        if (isExported) anyExported = true;
+        if (extracted.length > 0 || unreadable.length > 0) {
+          (isExported ? exported : local).push({
+            createRouterCall,
+            extractions: extracted,
+            unreadable
+          });
         }
       }
     }
     ts5.forEachChild(node, visit);
   }
   visit(sourceFile);
-  return result;
+  const candidates = anyExported ? exported : local;
+  return candidates.find((c) => c.extractions.length > 0) ?? candidates[0] ?? null;
 }
-function extractAllUrlsFromRouter(code) {
-  const sourceFile = ts5.createSourceFile(
+function parseRouterSource(code) {
+  return ts5.createSourceFile(
     "router.tsx",
     code,
     ts5.ScriptTarget.Latest,
     true,
     ts5.ScriptKind.TSX
   );
-  return findRouterUrls(sourceFile)?.extractions ?? [];
+}
+function extractAllUrlsFromRouter(code) {
+  return findRouterUrls(parseRouterSource(code))?.extractions ?? [];
 }
 function extractUrlsFromRouter(code) {
   const extractions = extractAllUrlsFromRouter(code);
   return extractions[extractions.length - 1] ?? null;
 }
 function unwrapTypeOperators(expr) {
-  while (ts5.isAsExpression(expr) || ts5.isSatisfiesExpression(expr)) {
+  while (ts5.isAsExpression(expr) || ts5.isSatisfiesExpression(expr) || ts5.isParenthesizedExpression(expr)) {
     expr = expr.expression;
   }
   return expr;
@@ -10701,10 +10961,10 @@ function generateRoutesManifestModule(state) {
     const genFileImports = [];
     const genFileVarByEntry = [];
     let varIdx = 0;
-    for (const entry of state.perRouterManifests) {
-      if (entry.sourceFile) {
-        const routerDir = dirname4(entry.sourceFile);
-        const routerBasename = basename(entry.sourceFile).replace(
+    for (const entry2 of state.perRouterManifests) {
+      if (entry2.sourceFile) {
+        const routerDir = dirname4(entry2.sourceFile);
+        const routerBasename = basename(entry2.sourceFile).replace(
           /\.(tsx?|jsx?)$/,
           ""
         );
@@ -10747,10 +11007,10 @@ function generateRoutesManifestModule(state) {
       );
     }
     const routerMapVars = [];
-    for (const [i, entry] of state.perRouterManifests.entries()) {
+    for (const [i, entry2] of state.perRouterManifests.entries()) {
       const mapVar = `__m${i}`;
       const genVar = genFileVarByEntry[i];
-      const init = genVar ? `__flat(${genVar})` : jsonParseExpression(entry.routeManifest);
+      const init = genVar ? `__flat(${genVar})` : jsonParseExpression(entry2.routeManifest);
       lines2.push(`const ${mapVar} = ${init};`);
       routerMapVars.push(mapVar);
     }
@@ -10761,9 +11021,9 @@ function generateRoutesManifestModule(state) {
         `setCachedManifest({ ${routerMapVars.map((v) => `...${v}`).join(", ")} });`
       );
     }
-    for (const [i, entry] of state.perRouterManifests.entries()) {
+    for (const [i, entry2] of state.perRouterManifests.entries()) {
       lines2.push(
-        `setRouterManifest(${JSON.stringify(entry.id)}, ${routerMapVars[i]});`
+        `setRouterManifest(${JSON.stringify(entry2.id)}, ${routerMapVars[i]});`
       );
     }
     if (state.isBuildMode) {
@@ -11041,14 +11301,14 @@ async function runWithConcurrency(items, concurrency2, fn) {
 }
 function groupByConcurrency(entries) {
   const map2 = /* @__PURE__ */ new Map();
-  for (const entry of entries) {
-    const key = entry.concurrency;
+  for (const entry2 of entries) {
+    const key = entry2.concurrency;
     let group = map2.get(key);
     if (!group) {
       group = [];
       map2.set(key, group);
     }
-    group.push(entry);
+    group.push(entry2);
   }
   return Array.from(map2.entries(), ([concurrency2, items]) => ({
     concurrency: concurrency2,
@@ -11726,23 +11986,23 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
     await runWithConcurrency(
       group.entries,
       group.concurrency,
-      async (entry) => {
+      async (entry2) => {
         const startUrl = performance.now();
         for (const [routerId2, routerInstance] of registry) {
           if (!routerInstance.matchForPrerender) continue;
           try {
             const result = await routerInstance.matchForPrerender(
-              entry.urlPath,
+              entry2.urlPath,
               {},
-              entry.buildVars,
-              entry.isPassthroughRoute,
+              entry2.buildVars,
+              entry2.isPassthroughRoute,
               state.resolvedBuildEnv
             );
             if (!result) continue;
             if (result.passthrough) {
               const elapsed2 = (performance.now() - startUrl).toFixed(0);
               console.log(
-                `[rango]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
+                `[rango]   PASS ${entry2.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
               );
               doneCount++;
               break;
@@ -11763,7 +12023,7 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             stage(main);
             if (result.ppr !== void 0 && result.ppr !== false) {
               (state.shellCandidates ??= []).push({
-                urlPath: entry.urlPath,
+                urlPath: entry2.urlPath,
                 routeName: result.routeName,
                 paramHash,
                 ppr: result.ppr === true ? true : result.ppr
@@ -11773,13 +12033,13 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             if (intercept2) stage(intercept2);
             const elapsed = (performance.now() - startUrl).toFixed(0);
             console.log(
-              `[rango]   OK   ${entry.urlPath.padEnd(40)} (${elapsed}ms)`
+              `[rango]   OK   ${entry2.urlPath.padEnd(40)} (${elapsed}ms)`
             );
             warnLiveIntercepts(
               warnedLiveIntercepts,
               routerId2,
               result.routeName,
-              entry.urlPath,
+              entry2.urlPath,
               result.liveIntercepts
             );
             doneCount++;
@@ -11790,11 +12050,11 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
               registry,
               err,
               prerenderOnError,
-              entry.urlPath.padEnd(40),
+              entry2.urlPath.padEnd(40),
               elapsed,
               "prerender",
-              entry.routeName,
-              entry.urlPath
+              entry2.routeName,
+              entry2.urlPath
             );
             skipCount++;
             break;
@@ -11942,8 +12202,8 @@ function isLazyMount(route2) {
 }
 async function resolveHostRouterHandlers(hostRegistry) {
   const errors = [];
-  for (const [hostId, entry] of hostRegistry) {
-    for (const route2 of entry.routes) {
+  for (const [hostId, entry2] of hostRegistry) {
+    for (const route2 of entry2.routes) {
       if (isLazyMount(route2)) {
         await invokeLazyMount(
           route2.handler,
@@ -11952,9 +12212,9 @@ async function resolveHostRouterHandlers(hostRegistry) {
         );
       }
     }
-    if (isLazyMount(entry.fallback)) {
+    if (isLazyMount(entry2.fallback)) {
       await invokeLazyMount(
-        entry.fallback.handler,
+        entry2.fallback.handler,
         `host "${hostId}" fallback handler`,
         errors
       );
@@ -12001,17 +12261,17 @@ var DiscoveryError = class _DiscoveryError extends Error {
 };
 function describeDiscoveryFailure(err, opts = {}) {
   if (err instanceof DiscoveryError && err.caught.length === 0) {
-    const entry = err.entryPath ?? "the router entry";
+    const entry2 = err.entryPath ?? "the router entry";
     if (opts.reoptimizeObserved) {
       return {
         level: "warn",
-        message: `[rango] No routers found while Vite was re-optimizing dependencies on dev boot. This is transient: routes are served per-request and discovery re-runs automatically, so it clears on the next boot. If routes still 404, confirm ${entry} calls createRouter().`
+        message: `[rango] No routers found while Vite was re-optimizing dependencies on dev boot. This is transient: routes are served per-request and discovery re-runs automatically, so it clears on the next boot. If routes still 404, confirm ${entry2} calls createRouter().`
       };
     }
     return {
       level: "error",
       message: `${err.message}
-  Ensure ${entry} calls createRouter() at module top level and that the configured router entry path is correct.`
+  Ensure ${entry2} calls createRouter() at module top level and that the configured router entry path is correct.`
     };
   }
   const e = err;
@@ -13809,9 +14069,9 @@ function devServerPhase(s, server) {
             if (s.resolvedEntryPath) {
               routerSourceFiles.add(resolve12(s.resolvedEntryPath));
             }
-            for (const entry of s.perRouterManifests) {
-              if (entry.sourceFile) {
-                routerSourceFiles.add(resolve12(entry.sourceFile));
+            for (const entry2 of s.perRouterManifests) {
+              if (entry2.sourceFile) {
+                routerSourceFiles.add(resolve12(entry2.sourceFile));
               }
             }
             const seen = /* @__PURE__ */ new Set();
@@ -13916,11 +14176,11 @@ function digestDirectory(dir) {
     const entries = readdirSync3(current, { withFileTypes: true }).sort(
       (a, b) => compareStrings(a.name, b.name)
     );
-    for (const entry of entries) {
-      if (entry.name === "node_modules" || entry.name === ".git") continue;
-      const path6 = join8(current, entry.name);
-      const name = `${prefix}${entry.name}`;
-      const kind = entry.isSymbolicLink() ? linkTarget(path6) : entry;
+    for (const entry2 of entries) {
+      if (entry2.name === "node_modules" || entry2.name === ".git") continue;
+      const path6 = join8(current, entry2.name);
+      const name = `${prefix}${entry2.name}`;
+      const kind = entry2.isSymbolicLink() ? linkTarget(path6) : entry2;
       if (kind?.isDirectory()) {
         visit(path6, `${name}/`);
       } else if (kind?.isFile()) {
@@ -14027,9 +14287,9 @@ function readServerResources(manifest) {
     );
   }
   return new Map(
-    entries.map((entry) => [
-      entry.key,
-      manifest.slice(entry.value.start, entry.value.end)
+    entries.map((entry2) => [
+      entry2.key,
+      manifest.slice(entry2.value.start, entry2.value.end)
     ])
   );
 }
@@ -14118,9 +14378,9 @@ function runRouterVersionsPhase(s, builder) {
           { fileName: ASSETS_MANIFEST_FILE, name: ASSETS_MANIFEST_FILE }
         ]
       },
-      routers: s.perRouterManifests.map((entry) => ({
-        id: entry.id,
-        moduleId: entry.sourceFile
+      routers: s.perRouterManifests.map((entry2) => ({
+        id: entry2.id,
+        moduleId: entry2.sourceFile
       })),
       buildData: [...s.buildData, ...clientUrlRecords(s)],
       readServerFile: (fileName) => readIfPresent(join9(rscOutDir, fileName)),
@@ -14159,9 +14419,9 @@ function runRouterVersionsPhase(s, builder) {
   }
   const elapsed = (performance.now() - start).toFixed(1);
   const sourceOf = new Map(
-    s.perRouterManifests.map((entry) => [
-      entry.id,
-      entry.sourceFile ? portableModuleId(entry.sourceFile, s.projectRoot) : ""
+    s.perRouterManifests.map((entry2) => [
+      entry2.id,
+      entry2.sourceFile ? portableModuleId(entry2.sourceFile, s.projectRoot) : ""
     ])
   );
   const detailOf = new Map(details.map((detail) => [detail.routerId, detail]));
@@ -14666,7 +14926,7 @@ function bundleScanPhase(s, context, bundle) {
 }
 
 // src/vite/utils/forward-user-plugins.ts
-function isDenied(name) {
+function isFrameworkPlugin(name) {
   return name.startsWith("vite:") || name === "rsc" || name.startsWith("rsc:") || name.startsWith("@rangojs/router") || name.startsWith("@cloudflare/vite-plugin") || name.startsWith("vite-plugin-cloudflare");
 }
 var IMPORT_REWRITE_PLUGINS = /* @__PURE__ */ new Set([
@@ -14693,7 +14953,7 @@ function selectForwardableResolvePlugins(plugins) {
   const forwarded = [];
   for (const p of plugins) {
     const name = p?.name;
-    if (!name || isDenied(name)) continue;
+    if (!name || isFrameworkPlugin(name)) continue;
     if (!isForwardable(p)) continue;
     forwarded.push(stripToResolutionHooks(p));
   }
@@ -14759,8 +15019,8 @@ function createRouterDiscoveryPlugin(entryPath, opts) {
         s.resolvedEntryPath = opts.routerPathRef.path;
       }
       if (!s.resolvedEntryPath) {
-        const entry = resolveRscEntryFromConfig(config);
-        if (entry) s.resolvedEntryPath = entry;
+        const entry2 = resolveRscEntryFromConfig(config);
+        if (entry2) s.resolvedEntryPath = entry2;
       }
       if (opts?.staticRouteTypesGeneration !== false) {
         s.cachedRouterFiles = findRouterFiles(s.projectRoot, s.scanFilter);