@farm.js/core 0.1.15 → 0.1.17

package/dist/{chunk-IGO2HEV7.mjs → chunk-F6SJAKFJ.mjs}

@@ -184,6 +184,8 @@ var _FarmDataCache = class _FarmDataCache {
   constructor(config = {}) {
     this.entries = /* @__PURE__ */ new Map();
     this.inflight = /* @__PURE__ */ new Map();
+    /** Local entries by tag, so tag counts and pruning never scan unrelated entries. */
+    this.entriesByTag = /* @__PURE__ */ new Map();
     this.invalidatedTagVersions = /* @__PURE__ */ new Map();
     this.activeGenerations = /* @__PURE__ */ new Set();
     this.version = 0;
@@ -202,6 +204,7 @@ var _FarmDataCache = class _FarmDataCache {
   configure(config = {}) {
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -368,14 +371,12 @@ var _FarmDataCache = class _FarmDataCache {
     return entry;
   }
   delete(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     emitFarmEvent({ type: "cache.delete", key, deleted });
     return deleted;
   }
   async deleteAsync(key) {
-    const deleted = this.entries.delete(key);
-    if (deleted) this.pruneInvalidatedTagVersions();
+    const deleted = this.deleteLocalEntry(key);
     if (this.adapter) {
       await this.adapter.delete(this.createAdapterKey(key));
     }
@@ -386,6 +387,7 @@ var _FarmDataCache = class _FarmDataCache {
     const count = this.entries.size;
     this.generation++;
     this.entries.clear();
+    this.entriesByTag.clear();
     this.inflight.clear();
     this.invalidatedTagVersions.clear();
     this.activeGenerations.clear();
@@ -471,23 +473,32 @@ var _FarmDataCache = class _FarmDataCache {
       return cached.value;
     }
     const inflight = this.inflight.get(key);
-    if (inflight) {
+    if (inflight && !this.wasInvalidatedSince(inflight.tags, inflight.startVersion)) {
       emitFarmEvent({ type: "cache.dedupe", key });
-      return inflight;
+      return inflight.promise;
     }
     const tags = Array.from(normalizeCacheOptionsTags(options));
     const generation = this.generation;
+    const startVersion = this.version;
     const promise = this.fillCacheEntry(key, producer, options, tags, generation).catch((error) => {
       emitFarmEvent({ type: "cache.error", key, operation: "set", error });
       throw error;
     }).finally(() => {
-      if (this.inflight.get(key) === promise) {
+      if (this.inflight.get(key)?.promise === promise) {
         this.inflight.delete(key);
       }
     });
-    this.inflight.set(key, promise);
+    this.inflight.set(key, { promise, tags, startVersion });
     return promise;
   }
+  /** A fill that started before one of its tags was invalidated cannot satisfy later readers. */
+  wasInvalidatedSince(tags, version) {
+    for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion !== void 0 && invalidatedVersion > version) return true;
+    }
+    return false;
+  }
   async fillCacheEntry(key, producer, options, tags, generation) {
     const adapter = this.adapter;
     const namespace = this.namespace;
@@ -528,7 +539,7 @@ var _FarmDataCache = class _FarmDataCache {
       return value;
     } finally {
       this.activeGenerations.delete(activeGeneration);
-      this.pruneInvalidatedTagVersions();
+      this.pruneInvalidatedTagVersions(activeGeneration.tags);
       if (leaseToken && adapter?.releaseLease) {
         try {
           await adapter.releaseLease(leaseKey, leaseToken);
@@ -573,18 +584,9 @@ var _FarmDataCache = class _FarmDataCache {
     }
     return void 0;
   }
-  countEntriesForTag(tag) {
-    let count = 0;
-    for (const entry of this.entries.values()) {
-      if (entry.tags.has(tag)) {
-        count++;
-      }
-    }
-    return count;
-  }
   countEntriesForTags(tags) {
     let count = 0;
-    for (const entry of this.entries.values()) {
+    for (const entry of this.entriesByTag.get(tags[0]) ?? []) {
       if (tags.every((tag) => entry.tags.has(tag))) {
         count++;
       }
@@ -592,10 +594,10 @@ var _FarmDataCache = class _FarmDataCache {
     return count;
   }
   invalidateTag(normalizedTag) {
-    const count = this.countEntriesForTag(normalizedTag);
+    const count = this.entriesByTag.get(normalizedTag)?.size ?? 0;
     this.invalidatedTagVersions.delete(normalizedTag);
     this.invalidatedTagVersions.set(normalizedTag, ++this.version);
-    this.pruneInvalidatedTagVersions();
+    this.pruneInvalidatedTagVersions([normalizedTag]);
     return count;
   }
   toPublicEntry(entry) {
@@ -625,19 +627,51 @@ var _FarmDataCache = class _FarmDataCache {
     this.entries.set(key, entry);
   }
   storeLocalEntry(entry) {
-    this.entries.delete(entry.key);
+    const removed = [];
+    const replaced = this.detachLocalEntry(entry.key);
+    if (replaced) removed.push(replaced);
     this.entries.set(entry.key, entry);
+    for (const tag of entry.tags) {
+      let tagged = this.entriesByTag.get(tag);
+      if (!tagged) this.entriesByTag.set(tag, tagged = /* @__PURE__ */ new Set());
+      tagged.add(entry);
+    }
     while (this.entries.size > this.maxEntries) {
       const oldestKey = this.entries.keys().next().value;
       if (oldestKey === void 0) break;
-      this.entries.delete(oldestKey);
+      removed.push(this.detachLocalEntry(oldestKey));
     }
-    this.pruneInvalidatedTagVersions();
+    for (const removedEntry of removed) this.pruneInvalidatedTagVersions(removedEntry.tags);
+  }
+  deleteLocalEntry(key) {
+    const entry = this.detachLocalEntry(key);
+    if (!entry) return false;
+    this.pruneInvalidatedTagVersions(entry.tags);
+    return true;
+  }
+  detachLocalEntry(key) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    this.entries.delete(key);
+    for (const tag of entry.tags) {
+      const tagged = this.entriesByTag.get(tag);
+      if (!tagged) continue;
+      tagged.delete(entry);
+      if (tagged.size === 0) this.entriesByTag.delete(tag);
+    }
+    return entry;
   }
-  pruneInvalidatedTagVersions() {
-    tags: for (const [tag, invalidatedVersion] of this.invalidatedTagVersions) {
-      for (const entry of this.entries.values()) {
-        if (entry.tags.has(tag) && entry.createdVersion < invalidatedVersion) continue tags;
+  /**
+   * Drop invalidation versions that no local entry or active fill can be stale against.
+   * Callers pass only the tags whose dependents just changed, so the cost is bounded by
+   * the entries sharing those tags rather than by the whole cache.
+   */
+  pruneInvalidatedTagVersions(tags) {
+    tags: for (const tag of tags) {
+      const invalidatedVersion = this.invalidatedTagVersions.get(tag);
+      if (invalidatedVersion === void 0) continue;
+      for (const entry of this.entriesByTag.get(tag) ?? []) {
+        if (entry.createdVersion < invalidatedVersion) continue tags;
       }
       for (const generation of this.activeGenerations) {
         if (generation.tags.has(tag) && generation.createdVersion < invalidatedVersion)

package/dist/{chunk-GSDIZACQ.mjs → chunk-FG5H2VCJ.mjs}

@@ -2,10 +2,10 @@ import {
   attachRevalidationListeners,
   createServerQueryCallKey,
   fetchServerQuery
-} from "./chunk-76MNRHTS.mjs";
+} from "./chunk-UUYF3CHN.mjs";
 import {
   getFarmClientDataCache
-} from "./chunk-HKLRP3BN.mjs";
+} from "./chunk-5SPPCN5J.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-LZK5CXDW.mjs → chunk-KLSSO6YD.mjs}

@@ -7,7 +7,7 @@ import {
   isAPIRouteRef,
   resolveServerFnInvalidateTargets,
   settleServerFnOptimisticUpdates
-} from "./chunk-KUO3GBPK.mjs";
+} from "./chunk-L6V3P73N.mjs";
 import {
   notifyClientObserver
 } from "./chunk-72AK62H5.mjs";
@@ -23,7 +23,7 @@ import {
 } from "./chunk-5HGR3W6O.mjs";
 import {
   getFarmClientDataCache
-} from "./chunk-HKLRP3BN.mjs";
+} from "./chunk-5SPPCN5J.mjs";
 import {
   getFarmTrailingSlashPreference
 } from "./chunk-54UPOYFS.mjs";

package/dist/{chunk-KUO3GBPK.mjs → chunk-L6V3P73N.mjs}

@@ -7,7 +7,7 @@ import {
   FarmClientDataCache,
   getFarmClientDataCache,
   normalizeFarmClientCacheKey
-} from "./chunk-HKLRP3BN.mjs";
+} from "./chunk-5SPPCN5J.mjs";
 import {
   createClientCancellation
 } from "./chunk-QVYLBY73.mjs";

package/dist/{chunk-FBHGHMOA.mjs → chunk-MVIWBEJF.mjs}

@@ -7,7 +7,7 @@ import {
 import {
   compileFarmDocsAdapterEdgeManifest,
   createFarmDocsAPIHandler
-} from "./chunk-NJ47VORC.mjs";
+} from "./chunk-UTBVHYS3.mjs";
 import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsHandler,
@@ -17,7 +17,7 @@ import {
   loadFarmDocsPage,
   resolveFarmDocsContentDir,
   toFarmDocsMarkdownPage
-} from "./chunk-MOQNHLTS.mjs";
+} from "./chunk-5QOEPUYE.mjs";
 import {
   generateFarmDocsSearchClientRuntime,
   isFarmDocsSearchEnabled,
@@ -31,7 +31,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-GNTPTTLA.mjs";
+} from "./chunk-QGVJVSNX.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-F5D4XEAS.mjs";
@@ -59,17 +59,18 @@ import {
   getClientModuleMetadata,
   getFarmClientHydrationPlanOptions,
   mergeFarmFontCss,
+  mergeFarmProductionViteConfig,
   mergeFarmViteConfig,
   resolveFarmClientCacheAdapterEntry,
   resolveFarmIsolatedClientHydrationMode,
   resolveFarmNotFoundComponentPath
-} from "./chunk-JRF3C33L.mjs";
+} from "./chunk-56DAX2BE.mjs";
 import {
   findRequestBoundSourceBlockers,
   generateFarmTypeArtifacts,
   parseRouteRenderingDirective,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-27JNCYEK.mjs";
+} from "./chunk-EN7WTEAY.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
@@ -96,16 +97,19 @@ import {
 } from "./chunk-OLYK7EAK.mjs";
 import {
   applyFarmCspHashesToHtml
-} from "./chunk-Q3MDL7TM.mjs";
+} from "./chunk-ZCNJKLA2.mjs";
 import {
   applyFarmCronVercelCrons,
   createFarmCronCloudflareConfig,
   mergeScheduledTasks,
   prepareFarmCronForNitro
-} from "./chunk-4L7SZOHZ.mjs";
+} from "./chunk-YHOCRI4H.mjs";
+import {
+  createBundledEnv
+} from "./chunk-4OOBRCJX.mjs";
 import {
   isFarmMarkdownPageFile
-} from "./chunk-LUC2FAGW.mjs";
+} from "./chunk-6VQIKZZO.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
@@ -113,17 +117,17 @@ import {
 import {
   applyFarmWorkflowVercelCrons,
   prepareFarmWorkflowsForNitro
-} from "./chunk-MUUZJLCI.mjs";
+} from "./chunk-EGJDUF4Q.mjs";
 import {
   getFarmIntegrationPluginServerRuntime,
   getIntegrationProviders
 } from "./chunk-JLCQGPXE.mjs";
 import {
   appendMiddlewareRoutePath
-} from "./chunk-B76DT5Y6.mjs";
+} from "./chunk-57J3Y7Y3.mjs";
 import {
   APIRouteManager
-} from "./chunk-ZHOIQC6U.mjs";
+} from "./chunk-ATERBVHQ.mjs";
 import {
   readFarmI18nCatalogs
 } from "./chunk-FV45CKBC.mjs";
@@ -2136,7 +2140,7 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     }
   }
   try {
-    await viteBuild({
+    const clientViteConfig = {
       root,
       // Vite otherwise falls back to <root>/public, silently dropping every
       // asset in a custom config.publicDir from the production client output.
@@ -2272,7 +2276,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
           "@farm.js/core/headers"
         ]
       }
-    });
+    };
+    await viteBuild(mergeFarmProductionViteConfig(clientViteConfig, config.vite));
     await mergeBuiltFontCss(outputDir);
     await validateClientBuildOutput(root, srcDir, outputDir);
   } finally {
@@ -4618,7 +4623,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
     "react-dom/server"
   ];
   try {
-    await viteBuild({
+    const serverViteConfig = {
       root,
       build: {
         target: "esnext",
@@ -4709,7 +4714,7 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
       },
       define: {
         __FARM_API_BASE_URL__: JSON.stringify(config.api.baseURL),
-        __FARM_ENV__: JSON.stringify(config.env || { server: {}, public: {} }),
+        __FARM_ENV__: JSON.stringify(createBundledEnv(config.env)),
         __FARM_PUBLIC_ENV__: JSON.stringify(config.env?.public || {})
       },
       plugins: [
@@ -4779,7 +4784,8 @@ async function buildSSRInMemory(productionVite, config, root, routeManager, apiR
         // Route modules and the renderer adapter must share one runtime instance.
         dedupe: [...config.renderer.dedupe || []]
       }
-    });
+    };
+    await viteBuild(mergeFarmProductionViteConfig(serverViteConfig, config.vite));
   } finally {
     if (postcssConfigDir) {
       try {
@@ -6987,7 +6993,7 @@ function hasLocalRequestRoute(request, routePathname) {
   const pathname = new URL(request.url).pathname;
   if (
     farmOpenAPIReference &&
-    normalizeRuntimePath(pathname) === normalizeRuntimePath(farmOpenAPIReference.route)
+    normalizeRuntimePath(stripFarmBasePath(pathname)) === normalizeRuntimePath(farmOpenAPIReference.route)
   ) {
     return true;
   }
@@ -7023,7 +7029,7 @@ function getFarmPluginRequestOptions(request) {
   const route = { pathname };
   if (
     farmOpenAPIReference &&
-    normalizeRuntimePath(pathname) === normalizeRuntimePath(farmOpenAPIReference.route)
+    normalizeRuntimePath(stripFarmBasePath(pathname)) === normalizeRuntimePath(farmOpenAPIReference.route)
   ) {
     return {
       kind: "docs",
@@ -7352,9 +7358,10 @@ async function handleFarmRequest(request, adapterContext) {
   )` : "handleFarmRequestInContext(request, null, false, Date.now(), adapterContext, requestUrl)"};
   ${config.md?.enabled ? `const pathname = getFarmRoutePathname(requestUrl.pathname);
   if (matchPageRoute(pathname)) {
+    // The Link header advertises the public .md URL, like the head alternate.
     return applyMarkdownNegotiationHeaders(response, {
       config: farmMarkdownConfig,
-      pathname,
+      pathname: requestUrl.pathname,
     });
   }` : ""}
   return response;
@@ -7542,7 +7549,7 @@ async function handleFarmRequestInContext(
   if (
     farmOpenAPIReference &&
     farmOpenAPIReference.specRoute &&
-    normalizeRuntimePath(pathname) === normalizeRuntimePath(farmOpenAPIReference.specRoute)
+    normalizeRuntimePath(stripFarmBasePath(pathname)) === normalizeRuntimePath(farmOpenAPIReference.specRoute)
   ) {
     const method = request.method.toUpperCase();
     const specResponse = method === "GET" || method === "HEAD"
@@ -7566,7 +7573,7 @@ async function handleFarmRequestInContext(
 
   if (
     farmOpenAPIReference &&
-    normalizeRuntimePath(pathname) === normalizeRuntimePath(farmOpenAPIReference.route)
+    normalizeRuntimePath(stripFarmBasePath(pathname)) === normalizeRuntimePath(farmOpenAPIReference.route)
   ) {
     const method = request.method.toUpperCase();
     const response = method === "GET" || method === "HEAD"
@@ -8104,12 +8111,15 @@ async function handleFarmRequestInContext(
         const sharedCacheControl = getRouteSharedCacheControl(route, pprCanCache);
         const responseHeaders = {
           "Content-Type": "text/html; charset=utf-8",
-          "Cache-Control": renderedPage.stream || hasRequestScopedRender || !sharedCacheControl
-            ? "private, no-store"
-            : sharedCacheControl,
+          "Cache-Control": sharedCacheControl,
           ...(farmFontPreloadHeader ? { "Link": farmFontPreloadHeader } : {}),
           ...(pprConfig.enabled ? getPPRHeaders(pprCanCache ? "miss" : "bypass", pprConfig) : {}),
         };
+        // An error status or a request-scoped render is never shareable, even when
+        // the PPR shell headers would otherwise grant a shared max-age.
+        if (renderedPage.stream || hasRequestScopedRender || !sharedCacheControl) {
+          responseHeaders["Cache-Control"] = "private, no-store";
+        }
         const farmI18nSnapshot = getFarmI18nSnapshot();
         let html = renderedPage.html;
         
@@ -10115,7 +10125,7 @@ async function buildSSR(viteBuild, config, root, srcDir, outputDir) {
     },
     define: {
       __FARM_API_BASE_URL__: JSON.stringify(config.api.baseURL),
-      __FARM_ENV__: JSON.stringify(config.env || { server: {}, public: {} }),
+      __FARM_ENV__: JSON.stringify(createBundledEnv(config.env)),
       __FARM_PUBLIC_ENV__: JSON.stringify(config.env?.public || {})
     },
     plugins: [
@@ -10138,7 +10148,7 @@ function resolveLegacyPageEntry(config, root, srcDir) {
 __name(resolveLegacyPageEntry, "resolveLegacyPageEntry");
 async function buildNitro(config, routeManager, apiRouteManager, serverRenderer, preset, root, distDir, pluginManager) {
   const [{ createNitroConfig }, { createNitro, build: nitroBuild }] = await Promise.all([
-    import("./nitro-ICBP5APY.mjs"),
+    import("./nitro-CVZ36JM5.mjs"),
     import("nitro/builder")
   ]);
   let nitroConfig = await createNitroConfig(
@@ -10198,7 +10208,7 @@ async function buildNitro(config, routeManager, apiRouteManager, serverRenderer,
     farmRegistry.apiRouteManager = apiRouteManager;
     farmRegistry.routeManager = routeManager;
     farmRegistry.serverRenderer = serverRenderer;
-    farmRegistry.env = config.env || { server: {}, public: {} };
+    farmRegistry.env = createBundledEnv(config.env);
     const routePaths = {};
     for (const [pattern, entry] of routeManager.getRoutes()) {
       const bundledPath = entry.modulePath.replace(/.*\/src\/app\//, "").replace(/\.(tsx?|jsx?)$/, ".js");

package/dist/{chunk-KTGFMHET.mjs → chunk-N6UROPT7.mjs}

@@ -7,7 +7,7 @@ import {
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-NDD2YVGU.mjs";
+} from "./chunk-NRVGEI5I.mjs";
 import {
   emitFarmEvent
 } from "./chunk-FUZEBRP3.mjs";

package/dist/{chunk-NDD2YVGU.mjs → chunk-NRVGEI5I.mjs}

@@ -278,7 +278,7 @@ function parseColonParam(segment) {
   };
 }
 __name(parseColonParam, "parseColonParam");
-function compilePathPattern(pattern) {
+function compilePathPattern(pattern, trailingSlash = false) {
   const params = [];
   const segments = pattern.split("/").filter(Boolean);
   if (segments.length === 0) {
@@ -314,11 +314,18 @@ function compilePathPattern(pattern) {
   });
   return {
     kind: "path",
-    regex: new RegExp(`^${parts.join("")}$`),
+    regex: new RegExp(`^${parts.join("")}${trailingSlash ? "/?" : ""}$`),
     params
   };
 }
 __name(compilePathPattern, "compilePathPattern");
+function compileMatcherPattern(pattern) {
+  if (typeof pattern === "string" && pattern !== "*" && !pattern.endsWith("(.*)")) {
+    return compilePathPattern(pattern, true);
+  }
+  return compilePattern(pattern);
+}
+__name(compileMatcherPattern, "compileMatcherPattern");
 function compilePattern(pattern) {
   if (pattern instanceof RegExp) {
     return { kind: "regexp", regex: pattern };
@@ -338,7 +345,7 @@ __name(compilePattern, "compilePattern");
 function compileMiddlewareConfig(config) {
   const compiled = {
     matcher: config.matcher ? toMatcherList(config.matcher).map(
-      (matcher) => typeof matcher === "function" ? matcher : compilePattern(matcher)
+      (matcher) => typeof matcher === "function" ? matcher : compileMatcherPattern(matcher)
     ) : void 0,
     exclude: config.exclude?.map(compilePattern)
   };

package/dist/{chunk-GNTPTTLA.mjs → chunk-QGVJVSNX.mjs}

@@ -28,29 +28,29 @@ import {
   resolveFarmNoindexPreviews,
   resolveFarmPerformanceConfig,
   resolveFarmSecurityConfig
-} from "./chunk-Q3MDL7TM.mjs";
+} from "./chunk-ZCNJKLA2.mjs";
 import {
   resolveFarmImageConfig
 } from "./chunk-G2KY33I6.mjs";
 import {
   resolveCronConfig
-} from "./chunk-4L7SZOHZ.mjs";
+} from "./chunk-YHOCRI4H.mjs";
 import {
   resolveServerActionsConfig
 } from "./chunk-QCFFHV5H.mjs";
 import {
   resolveEnv,
   setEnv
-} from "./chunk-FOGLGRDS.mjs";
+} from "./chunk-4OOBRCJX.mjs";
 import {
   resolveMdxConfig
 } from "./chunk-FA2W42OV.mjs";
 import {
   resolveMarkdownConfig
-} from "./chunk-6SCB2MXB.mjs";
+} from "./chunk-SXHV42UQ.mjs";
 import {
   resolveWorkflowsConfig
-} from "./chunk-MUUZJLCI.mjs";
+} from "./chunk-EGJDUF4Q.mjs";
 import {
   resolveFarmThemeConfig
 } from "./chunk-AELACLOB.mjs";

package/dist/{chunk-6SCB2MXB.mjs → chunk-SXHV42UQ.mjs}

@@ -105,8 +105,16 @@ async function createMarkdownMirrorResponse(options) {
   if (!hasMarkdownExtension) {
     headersOut.set("Vary", "Accept");
   }
+  for (const token of pageResponse.headers.get("vary")?.split(",") ?? []) {
+    const name = token.trim();
+    if (name && name.toLowerCase() !== "accept") appendHeaderToken(headersOut, "Vary", name);
+  }
+  const pageCacheControl = pageResponse.headers.get("cache-control");
   const cache = target.route?.cache ?? options.config?.cache ?? false;
-  headersOut.set("Cache-Control", createMarkdownCacheHeader(cache));
+  headersOut.set(
+    "Cache-Control",
+    pageCacheControl && isPrivateCacheControl(pageCacheControl) ? pageCacheControl : createMarkdownCacheHeader(cache)
+  );
   return new Response(options.request.method === "HEAD" ? null : markdown, {
     status: pageResponse.status,
     headers: headersOut
@@ -336,6 +344,13 @@ function isHtmlResponse(response) {
   return contentType.includes("text/html");
 }
 __name(isHtmlResponse, "isHtmlResponse");
+function isPrivateCacheControl(value) {
+  return value.split(",").some((directive) => {
+    const name = directive.split("=", 1)[0].trim().toLowerCase();
+    return name === "private" || name === "no-store";
+  });
+}
+__name(isPrivateCacheControl, "isPrivateCacheControl");
 function createMarkdownCacheHeader(cache) {
   if (cache === false || cache <= 0) {
     return "no-store";

package/dist/{chunk-OWTIOHON.mjs → chunk-SYGGPS4A.mjs}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-EMLAPBEM.mjs";
 import {
   applyFarmCacheInvalidationTargets
-} from "./chunk-IGO2HEV7.mjs";
+} from "./chunk-F6SJAKFJ.mjs";
 import {
   assertBrowserStableRoutePath,
   assertUniqueRouteParameters,
@@ -77,7 +77,7 @@ function createEndpoint(pathOrOptions, optionsOrHandler, maybeHandler) {
     wrappedHandler
   );
   endpoint.__path = path || void 0;
-  endpoint.__method = options.method || "GET";
+  endpoint.__method = options.method || (path ? "GET" : void 0);
   endpoint.__autoPath = !path;
   endpoint.__handler = wrappedHandler;
   endpoint.__farmInvoke = (ctx) => runEndpointMiddleware(middleware, ctx, handler, error, options.invalidates);

package/dist/{chunk-NC333MFA.mjs → chunk-TSWW5BVH.mjs}

@@ -12,7 +12,7 @@ import {
   createFarmCacheKey,
   createRouteDataCacheTag,
   getFarmDataCache
-} from "./chunk-IGO2HEV7.mjs";
+} from "./chunk-F6SJAKFJ.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
@@ -355,6 +355,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
     }
     return rendererRuntime.createElement(...args);
   }, "createElement");
+  const markFunctionComponent = /* @__PURE__ */ __name((component) => rendererRuntime?.markFunctionComponent?.(component) ?? component, "markFunctionComponent");
   const Component = route.component;
   if (route.pending) {
     const PendingComponent = route.pending;
@@ -376,7 +377,9 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         throw error;
       }
     }, "FarmProgrammaticPageContent");
-    const PageContent = FarmProgrammaticPageContent2;
+    const PageContent = markFunctionComponent(
+      FarmProgrammaticPageContent2
+    );
     const FarmProgrammaticPage = /* @__PURE__ */ __name(function FarmProgrammaticPage2(props) {
       return createElement(
         rendererRuntime.Suspense,
@@ -386,7 +389,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
         createElement(PageContent, props)
       );
     }, "FarmProgrammaticPage");
-    return FarmProgrammaticPage;
+    return markFunctionComponent(FarmProgrammaticPage);
   }
   const FarmProgrammaticPageContent = /* @__PURE__ */ __name(async function FarmProgrammaticPageContent2(props) {
     try {
@@ -405,7 +408,7 @@ function createProgrammaticPageComponent(route, rendererRuntime) {
       throw error;
     }
   }, "FarmProgrammaticPageContent");
-  return FarmProgrammaticPageContent;
+  return markFunctionComponent(FarmProgrammaticPageContent);
 }
 __name(createProgrammaticPageComponent, "createProgrammaticPageComponent");
 function readProgrammaticRouteProps(route, props, resources) {

package/dist/{chunk-LK6FGAQR.mjs → chunk-UDBJCUPA.mjs}

@@ -6,10 +6,10 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteConflictError
-} from "./chunk-ZHOIQC6U.mjs";
+} from "./chunk-ATERBVHQ.mjs";
 import {
   findProgrammaticRouteFilesInDir
-} from "./chunk-VO5SCWF5.mjs";
+} from "./chunk-BNGS6KJ6.mjs";
 import {
   isFarmAPIRouteFileName
 } from "./chunk-CU625VAY.mjs";
@@ -19,7 +19,7 @@ import {
   invokeAPIRouteEndpoint,
   matchAPIRouteAtBasePath,
   resolveAPIRouteEndpoint
-} from "./chunk-DPZUDPVJ.mjs";
+} from "./chunk-XP777LRD.mjs";
 import {
   isProgrammaticRoutesFileName
 } from "./chunk-EA5K5BKU.mjs";
@@ -38,6 +38,9 @@ import {
 import {
   sendWebResponse
 } from "./chunk-Z2RZJZIZ.mjs";
+import {
+  resolveFarmRequestURL
+} from "./chunk-BSPQVJ4A.mjs";
 import {
   AmbiguousRouteError,
   assertUniqueRouteParameters,
@@ -395,7 +398,7 @@ function farmApiPlugin(options = {}) {
             if (currentPathname !== pathname && !matchAPIRouteAtBasePath(apiRoutesCache, currentPathname, basePath)) {
               return next();
             }
-            const fullUrl = `http://${req.headers.host || "localhost:3000"}${currentUrl}`;
+            const fullUrl = resolveFarmRequestURL(req);
             const headers = new Headers();
             for (const [key, value] of Object.entries(req.headers)) {
               if (value) {