@farm.js/core 0.1.36 → 0.1.37

package/dist/{chunk-35WV46VL.mjs → chunk-K4I4O5TS.mjs}

@@ -5,12 +5,13 @@ import {
   withProductionNodeEnv
 } from "./chunk-655RLQQL.mjs";
 import {
-  generateNativeMCPPluginSource
-} from "./chunk-FXEF4PPL.mjs";
+  generateNativeMCPPluginSource,
+  layoutsCanCoverSamePage
+} from "./chunk-WRPHYQVY.mjs";
 import {
   compileFarmDocsAdapterEdgeManifest,
   createFarmDocsAPIHandler
-} from "./chunk-4E5AEDKY.mjs";
+} from "./chunk-XOPOIFTJ.mjs";
 import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsHandler,
@@ -28,7 +29,7 @@ import {
 } from "./chunk-UP4CW6WP.mjs";
 import {
   FARM_PRERENDER_ENV
-} from "./chunk-3KZS4SUS.mjs";
+} from "./chunk-MCIZVNOQ.mjs";
 import {
   loadFarmDocsEngine
 } from "./chunk-2VQKKQ6D.mjs";
@@ -37,7 +38,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-OHLSEQ57.mjs";
+} from "./chunk-EXG5LD6B.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-ZZSRYEYU.mjs";
@@ -76,13 +77,13 @@ import {
   resolveFarmIsolatedClientHydrationMode,
   resolveFarmNotFoundComponentPath,
   usesFarmServerTree
-} from "./chunk-276VJSM6.mjs";
+} from "./chunk-4P6ULFMD.mjs";
 import {
   findRequestBoundSourceBlockers,
   generateFarmTypeArtifacts,
   parseRouteRenderingDirective,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-4GLOOWKE.mjs";
+} from "./chunk-CQMVIOYP.mjs";
 import {
   FARM_API_CATALOG_PATH,
   FARM_APP_MANIFEST_LEGACY_PATH,
@@ -94,7 +95,7 @@ import {
   resolveFarmAppManifestInput,
   routeBoundaryCoversDirectory,
   stripRouteGroups
-} from "./chunk-LSZAVSGY.mjs";
+} from "./chunk-LBGILORX.mjs";
 import {
   FARM_DEFAULT_MCP_PATH,
   createFarmDefaultMCPServer,
@@ -143,7 +144,7 @@ import {
 } from "./chunk-4OOBRCJX.mjs";
 import {
   isFarmMarkdownPageFile
-} from "./chunk-4WCZJQUO.mjs";
+} from "./chunk-TPLJVC7E.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
@@ -159,20 +160,20 @@ import {
   FARM_INTEGRATION_API_BASE_PATH_KEY,
   getFarmIntegrationPluginServerRuntime,
   getIntegrationProviders
-} from "./chunk-MKYBIIAQ.mjs";
+} from "./chunk-Z5BEWYVO.mjs";
 import {
   appendMiddlewareDirectory,
   appendMiddlewareRoutePath,
   compareMiddlewareRouteLocations
-} from "./chunk-BPOF5U4N.mjs";
+} from "./chunk-NFMDCAOS.mjs";
 import {
   compileMiddlewareConfig,
   matchesCompiledMiddlewareConfig,
   matchesMiddlewareRoute
-} from "./chunk-JG6DJF5A.mjs";
+} from "./chunk-HZFM2LWQ.mjs";
 import {
   APIRouteManager
-} from "./chunk-T4OGRVNS.mjs";
+} from "./chunk-VXAWRDK7.mjs";
 import {
   readFarmI18nCatalogs
 } from "./chunk-QCFBDFRS.mjs";
@@ -199,7 +200,7 @@ import {
 } from "./chunk-BTHHUD7Q.mjs";
 import {
   FARM_VERSION
-} from "./chunk-OO7GXVSR.mjs";
+} from "./chunk-YCKO6FRS.mjs";
 import {
   getFarmPresetRuntime
 } from "./chunk-2A3EQHXX.mjs";
@@ -759,15 +760,32 @@ function createFarmNetlifyEntry(options) {
 import nitroNetlifyHandler from ${JSON.stringify(options.nitroNetlifyEntry)};
 
 const PRIVATE_CACHE_DIRECTIVE = /(?:^|,)\\s*(?:private|no-store)\\s*(?:[,=]|$)/i;
+const CREDENTIAL_VARY = /(?:^|,)\\s*(?:\\*|cookie|authorization)\\s*(?:,|$)/i;
+// What Nitro's entry sets when the response has no Cache-Control of its own.
+const NITRO_DEFAULT_CACHE_CONTROL = "public, max-age=0, must-revalidate";
+
+function isSharedCacheable(request, response) {
+  return (
+    response.status === 200 &&
+    !request.headers.has("cookie") &&
+    !request.headers.has("authorization") &&
+    !response.headers.has("set-cookie") &&
+    !PRIVATE_CACHE_DIRECTIVE.test(response.headers.get("cache-control") || "") &&
+    !CREDENTIAL_VARY.test(response.headers.get("vary") || "")
+  );
+}
 
 export default async function farmNetlifyHandler(request, context) {
   const response = await nitroNetlifyHandler(request, context);
   if (
     response &&
     response.headers.has("netlify-cdn-cache-control") &&
-    PRIVATE_CACHE_DIRECTIVE.test(response.headers.get("cache-control") || "")
+    !isSharedCacheable(request, response)
   ) {
     response.headers.delete("netlify-cdn-cache-control");
+    if (response.headers.get("cache-control") === NITRO_DEFAULT_CACHE_CONTROL) {
+      response.headers.set("cache-control", "private, no-store");
+    }
   }
   return response;
 }
@@ -3174,15 +3192,17 @@ __farmConfigureApp(__farmAppSetup);` : `import React, { createRoot, hydrateRoot
   const cssImport = existsSync2(globalsCssPath) ? `import ${JSON.stringify(toImportPath(globalsCssPath))};` : "";
   const layoutImportStatements = [];
   const layoutRegistrations = [];
+  const hydratingLayoutPatterns = layoutRoutes.filter((layout) => layout.shouldHydrate).map((layout) => layout.pattern);
   layoutRoutes.forEach((layout, index) => {
     const relativePath = toImportPath(layout.modulePath);
-    if (!layout.hasIsolatedClientBoundaries) {
+    const rendersOnClient = !layout.hasIsolatedClientBoundaries && hydratingLayoutPatterns.some((pattern) => layoutsCanCoverSamePage(layout.pattern, pattern));
+    if (rendersOnClient) {
       layoutImportStatements.push(`import Layout${index} from "${relativePath}";`);
     }
     const groupScope = getRouteGroupScope(layout.pattern);
     const groupFields = groupScope ? `, urlPattern: ${JSON.stringify(stripRouteGroups(layout.pattern))}, groupScope: ${JSON.stringify(groupScope)}` : "";
     layoutRegistrations.push(
-      `  { pattern: ${JSON.stringify(layout.pattern)}${groupFields}, Component: ${layout.hasIsolatedClientBoundaries ? "null" : `Layout${index}`}, shouldHydrate: ${JSON.stringify(layout.shouldHydrate)}, islandStrategy: ${JSON.stringify(layout.islandStrategy)} }`
+      `  { pattern: ${JSON.stringify(layout.pattern)}${groupFields}, Component: ${rendersOnClient ? `Layout${index}` : "null"}, shouldHydrate: ${JSON.stringify(layout.shouldHydrate)}, islandStrategy: ${JSON.stringify(layout.islandStrategy)} }`
     );
   });
   const layoutImports = layoutImportStatements.join("\n");
@@ -5807,7 +5827,7 @@ import * as farmDocsConfigModule from ${toVirtualEntryImportSpecifier(docsConfig
 import { dirname as farmDocsDirname, join as farmDocsJoin } from "node:path";
 import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
   const markdownHandlerImport = config.md?.enabled ? `import { applyMarkdownNegotiationHeaders, createMarkdownMirrorResponse, getFarmMarkdownAlternatePath } from "@farm.js/core/markdown";` : "";
-  const appMarkdownImport = hasMarkdownPages ? `import { createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse, isFarmMarkdownPublicSourceResponse } from "@farm.js/core/internal/app-markdown-runtime";` : "const createFarmMarkdownSourceResponse = null;\nconst isFarmMarkdownPublicSourceResponse = null;";
+  const appMarkdownImport = hasMarkdownPages ? `import { FARM_MARKDOWN_ANONYMOUS_CLIENT_ADDRESS, createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse, isFarmMarkdownPublicSourceResponse } from "@farm.js/core/internal/app-markdown-runtime";` : "const createFarmMarkdownSourceResponse = null;\nconst isFarmMarkdownPublicSourceResponse = null;";
   const markdownErrorImport = `import { FARM_MARKDOWN_CONTENT_TYPE, createFarmMarkdownErrorBody, farmRequestWantsMarkdown } from "@farm.js/core/markdown";`;
   const mdxComponentsPath = typeof config.mdx?.components === "string" ? path6.isAbsolute(config.mdx.components) ? config.mdx.components : path6.join(config.root, config.mdx.components) : null;
   const mdxComponentsImport = mdxComponentsPath ? `import * as FarmMdxComponentsModule from ${toVirtualEntryImportSpecifier(mdxComponentsPath)};` : "";
@@ -6262,7 +6282,18 @@ const apiRoutes = ${apiRoutes.length > 0 ? "mergePluginAPIRoutes(" : ""}[${apiRe
 function dispatchFarmPluginAPIRequest(request) {
   const url = new URL(request.url);
   url.pathname = applyFarmBasePath(url.pathname);
-  return handleFarmRequest(url.href === request.url ? request : new Request(url, request));
+  return fetchFarmInnerRequest(url.href === request.url ? request : new Request(url, request));
+}
+// A request the app makes to itself (a Markdown page check, a plugin's endpoint call) enters
+// through this module's outer \`fetch\`, as a direct request does: plugin runtime hooks run and
+// it gets its own request context, so \`cookies()\` and \`headers()\` are its own, never the
+// caller's. It asks for an identity body: the caller reads it, and the outer response is
+// compressed once.
+function fetchFarmInnerRequest(request, context) {
+  if (!request.headers.has("accept-encoding")) return fetch(request, context);
+  const headers = new Headers(request.headers);
+  headers.delete("accept-encoding");
+  return fetch(new Request(request, { headers }), context);
 }
 const farmLocalAPIBasePath = ${JSON.stringify(resolveFarmAPIServerBasePath(config.api))};
 const farmOpenAPIReference = ${JSON.stringify(openAPIReference)};
@@ -7234,7 +7265,9 @@ async function handleFarmDefaultMCP(request) {
     },
   });
 }
-const farmDefaultMCPReadMarkdown = createFarmLlmsMarkdownReader((page) => handleFarmRequest(page));
+// \`fetch\` is this module's outer request entry: plugin runtime hooks run and the page
+// gets its own request context, as for a direct request.
+const farmDefaultMCPReadMarkdown = createFarmLlmsMarkdownReader((page) => fetch(page));
 ` : ""}
 // Static pages and root metadata for llms.txt, built the same way as in development.
 function createFarmLlmsTxtContext(request, full) {
@@ -7261,14 +7294,15 @@ function createFarmLlmsTxtContext(request, full) {
         apiServerBasePath: farmLocalAPIBasePath,${servesDefaultMCP ? "\n        defaultMCP: getFarmDefaultMCPServer," : ""}
       }),` : ""}
     }),
-    // llms-full.txt reads each page's .md mirror through this same handler,
-    // with a fresh request so the caller's cookies never shape its content.
-    // HEAD discards the body, so it reads nothing.
+    // llms-full.txt reads each page's .md mirror through this module's outer
+    // request entry, so plugin runtime hooks run and each read has a fresh request
+    // context: the caller's cookies never shape its content. HEAD discards the
+    // body, so it reads nothing.
     ...(full
       ? {
           markdown: request.method.toUpperCase() === "HEAD"
             ? async () => null
-            : createFarmLlmsMarkdownReader((page) => handleFarmRequest(page)),
+            : createFarmLlmsMarkdownReader((page) => fetch(page)),
         }
       : {}),
   };
@@ -8058,7 +8092,13 @@ async function handleFarmRequestInContext(
       const match = matchPageRoute(getFarmRoutePathname(targetPathname));
       return match?.route?.markdownSource || null;
     },
-    renderPage: (targetRequest) => handleFarmRequest(targetRequest, adapterContext),
+    clientAddress: adapterContext?.clientAddress,
+    // An anonymous visitor's request: guards never see the caller's address.
+    renderPage: (targetRequest) =>
+      fetchFarmInnerRequest(targetRequest, {
+        ...adapterContext,
+        clientAddress: FARM_MARKDOWN_ANONYMOUS_CLIENT_ADDRESS,
+      }),
   });
   if (markdownSourceResponse) {
     return isFarmMarkdownPublicSourceResponse(markdownSourceResponse)
@@ -8078,7 +8118,7 @@ async function handleFarmRequestInContext(
       config: farmMarkdownConfig,
       routeExists: (targetPathname) =>
         Boolean(matchPageRoute(getFarmRoutePathname(targetPathname))),
-      renderPage: (targetRequest) => handleFarmRequest(targetRequest, adapterContext),
+      renderPage: (targetRequest) => fetchFarmInnerRequest(targetRequest, adapterContext),
       apiServerBasePath: farmLocalAPIBasePath,
     });
     if (markdownResponse) {
@@ -10576,6 +10616,30 @@ async function copyPrismaClientForVercel(root, nitroFuncDir, fs) {
 }
 __name(copyPrismaClientForVercel, "copyPrismaClientForVercel");
 
+// src/build/project-module-runner.ts
+async function createFarmProjectModuleSsrEnvironment() {
+  const vite = await import("vite");
+  const { ModuleRunner, createNodeImportMeta } = await import("vite/module-runner");
+  return {
+    dev: {
+      createEnvironment(name, config) {
+        return vite.createRunnableDevEnvironment(name, config, {
+          runner: /* @__PURE__ */ __name((environment) => new ModuleRunner({
+            transport: {
+              ...vite.createServerModuleRunnerTransport({ channel: environment.hot }),
+              timeout: 0
+            },
+            hmr: false,
+            createImportMeta: createNodeImportMeta,
+            sourcemapInterceptor: "node"
+          }), "runner")
+        });
+      }
+    }
+  };
+}
+__name(createFarmProjectModuleSsrEnvironment, "createFarmProjectModuleSsrEnvironment");
+
 // src/build/index.ts
 async function build(config, options = {}) {
   return withProductionNodeEnv(() => buildWithProductionNodeEnv(config, options));
@@ -10836,6 +10900,14 @@ async function createProjectModuleServer(createViteServer, config, root, buildLi
     optimizeDeps: {
       ...viteConfig.optimizeDeps,
       noDiscovery: true
+    },
+    // An app or plugin that brings its own SSR environment keeps it.
+    environments: viteConfig.environments?.ssr?.dev?.createEnvironment ? viteConfig.environments : {
+      ...viteConfig.environments,
+      ssr: {
+        ...viteConfig.environments?.ssr,
+        ...await createFarmProjectModuleSsrEnvironment()
+      }
     }
   });
 }

package/dist/{chunk-KN7K4VQN.mjs → chunk-KDTBF3UU.mjs}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-CBBLJMR5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-QORUJDIV.mjs → chunk-KPFKMDM7.mjs}

@@ -1,9 +1,9 @@
 import {
   useRouter
-} from "./chunk-SC2WYWPF.mjs";
+} from "./chunk-JPNFPAZ4.mjs";
 import {
   getRouter
-} from "./chunk-XCMCS4DA.mjs";
+} from "./chunk-ND2CWPOD.mjs";
 import {
   applyFarmBasePath
 } from "./chunk-4RB44K6Z.mjs";

package/dist/{chunk-YSCV4SJF.cjs → chunk-L5H2GSUC.cjs}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
 
-var _chunkFFFW3OQ7cjs = require('./chunk-FFFW3OQ7.cjs');
+var _chunkS6FJO323cjs = require('./chunk-S6FJO323.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -14,10 +14,10 @@ var translate = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (key, valu
   const message = readOwnMessage(snapshot.messages, key);
   if (message === void 0) return key;
   const cacheKey = `${snapshot.locale}\0${key}\0${message}`;
-  let formatter = _chunkFFFW3OQ7cjs.compiledFarmI18nMessages.get(cacheKey);
+  let formatter = _chunkS6FJO323cjs.compiledFarmI18nMessages.get(cacheKey);
   if (!formatter) {
     formatter = new (0, _intlmessageformat2.default)(message, snapshot.locale);
-    _chunkFFFW3OQ7cjs.compiledFarmI18nMessages.set(cacheKey, formatter);
+    _chunkS6FJO323cjs.compiledFarmI18nMessages.set(cacheKey, formatter);
   }
   const result = formatter.format(values);
   if (rich) return Array.isArray(result) && result.length === 1 ? result[0] : result;
@@ -35,7 +35,7 @@ function createFarmClientTranslator() {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmClientTranslator, "createFarmClientTranslator");
 function requireSnapshot() {
-  const snapshot = _chunkFFFW3OQ7cjs.getFarmI18nClientState.call(void 0, );
+  const snapshot = _chunkS6FJO323cjs.getFarmI18nClientState.call(void 0, );
   if (!snapshot) {
     throw new Error("Farm i18n is not configured or has not been hydrated.");
   }

package/dist/{chunk-YDQZGSDS.mjs → chunk-LBDP3YT3.mjs}

@@ -34,7 +34,7 @@ import {
 } from "./chunk-4SIYUGRY.mjs";
 import {
   _resolveCurrentRequest
-} from "./chunk-IZY3V5XW.mjs";
+} from "./chunk-S3VWVTVA.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-LSZAVSGY.mjs → chunk-LBGILORX.mjs}

@@ -30,7 +30,7 @@ import {
 } from "./chunk-BTHHUD7Q.mjs";
 import {
   FARM_VERSION
-} from "./chunk-OO7GXVSR.mjs";
+} from "./chunk-YCKO6FRS.mjs";
 import {
   localizeFarmPathname
 } from "./chunk-L3KT7IXV.mjs";

package/dist/{chunk-ADEA7PN3.cjs → chunk-LOFKRKO7.cjs}

@@ -30,7 +30,7 @@ var _chunkKIIMAWOJcjs = require('./chunk-KIIMAWOJ.cjs');
 var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
 
 
-var _chunkDZ5ZVB2Kcjs = require('./chunk-DZ5ZVB2K.cjs');
+var _chunkNQ6QFZWDcjs = require('./chunk-NQ6QFZWD.cjs');
 
 
 var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
@@ -912,7 +912,7 @@ function createFarmAppManifest(input, { full = false } = {}) {
   const manifest = {
     schemaVersion: 1,
     app: {
-      farm: _chunkDZ5ZVB2Kcjs.FARM_VERSION,
+      farm: _chunkNQ6QFZWDcjs.FARM_VERSION,
       renderer: input.renderer,
       basePath: input.basePath,
       build: input.build

package/dist/{chunk-ZWM5KGAA.cjs → chunk-LPFV45AY.cjs}

@@ -7,13 +7,14 @@ var _chunkM7MKQXAFcjs = require('./chunk-M7MKQXAF.cjs');
 
 
 
-var _chunk3BU22U3Mcjs = require('./chunk-3BU22U3M.cjs');
+var _chunkG2TEB74Scjs = require('./chunk-G2TEB74S.cjs');
 
 
 
 
 
-var _chunkZ2HLU4IXcjs = require('./chunk-Z2HLU4IX.cjs');
+
+var _chunk4GWRFP22cjs = require('./chunk-4GWRFP22.cjs');
 
 
 var _chunkM2L4MYDQcjs = require('./chunk-M2L4MYDQ.cjs');
@@ -40,7 +41,7 @@ var _chunkKNBBQHO2cjs = require('./chunk-KNBBQHO2.cjs');
 var _chunkOX6O6WVAcjs = require('./chunk-OX6O6WVA.cjs');
 
 
-var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
+var _chunkNICDYKBScjs = require('./chunk-NICDYKBS.cjs');
 
 
 var _chunkBIDYX3SLcjs = require('./chunk-BIDYX3SL.cjs');
@@ -56,7 +57,7 @@ var _CookieJarImpl = class _CookieJarImpl {
   constructor(req, res) {
     this.req = req;
     this.res = res;
-    this.cookies = _chunk3BU22U3Mcjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
+    this.cookies = _chunkG2TEB74Scjs.parseMiddlewareCookieHeader.call(void 0, req.headers.cookie);
     const existing = res.getHeader("Set-Cookie");
     this.setCookies = Array.isArray(existing) ? existing.map(String) : existing === void 0 ? [] : [String(existing)];
   }
@@ -65,13 +66,13 @@ var _CookieJarImpl = class _CookieJarImpl {
   }
   set(name, value, options = {}) {
     this.cookies[name] = value;
-    const cookieString = _chunk3BU22U3Mcjs.serializeMiddlewareCookie.call(void 0, name, value, options);
+    const cookieString = _chunkG2TEB74Scjs.serializeMiddlewareCookie.call(void 0, name, value, options);
     this.setCookies.push(cookieString);
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   delete(name, options = {}) {
     delete this.cookies[name];
-    this.setCookies.push(_chunk3BU22U3Mcjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
+    this.setCookies.push(_chunkG2TEB74Scjs.serializeMiddlewareCookieDeletion.call(void 0, name, options));
     this.res.setHeader("Set-Cookie", this.setCookies);
   }
   getAll() {
@@ -80,8 +81,8 @@ var _CookieJarImpl = class _CookieJarImpl {
 };
 _chunkS3JO3N4Hcjs.__name.call(void 0, _CookieJarImpl, "CookieJarImpl");
 var CookieJarImpl = _CookieJarImpl;
-function createContext(req, res, viteServer, parent, server) {
-  const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
+function createContext(req, res, viteServer, parent, server, toRoutePathname) {
+  const url = _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([server, 'optionalAccess', _ => _.trustProxy]) });
   const headers = /* @__PURE__ */ new Map();
   const data = _optionalChain([parent, 'optionalAccess', _2 => _2.data]) ? new Map(parent.data) : /* @__PURE__ */ new Map();
   const locals = _optionalChain([parent, 'optionalAccess', _3 => _3.locals]) ? new Map(parent.locals) : /* @__PURE__ */ new Map();
@@ -105,6 +106,7 @@ function createContext(req, res, viteServer, parent, server) {
     response: res,
     url,
     pathname: url.pathname,
+    routePathname: _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, url.pathname, toRoutePathname),
     searchParams: url.searchParams,
     method: req.method || "GET",
     params: {},
@@ -140,6 +142,7 @@ function createContext(req, res, viteServer, parent, server) {
       const newUrl = new URL(rewriteUrl, ctx.url);
       ctx.url = newUrl;
       ctx.pathname = newUrl.pathname;
+      ctx.routePathname = _chunk4GWRFP22cjs.toMiddlewareRoutePathname.call(void 0, newUrl.pathname, toRoutePathname);
       ctx.searchParams = newUrl.searchParams;
       ctx.route = newUrl.pathname;
       req.url = rewriteUrl;
@@ -246,7 +249,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     for (const [index, entry] of entries.entries()) {
       const handlers = this.getConfigHandlers(entry);
       const middlewareConfig = this.toMiddlewareConfig(entry);
-      _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
+      _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, middlewareConfig);
       if (handlers.length === 0) {
         this.globalConfig = middlewareConfig;
         continue;
@@ -269,7 +272,7 @@ var _MiddlewareManager = class _MiddlewareManager {
       const discovered = [];
       await this.discoverInDirectory(appDir, "/", "", discovered);
       for (const entry of discovered) {
-        _chunkZ2HLU4IXcjs.compileMiddlewareRoute.call(void 0, entry.middleware);
+        _chunk4GWRFP22cjs.compileMiddlewareRoute.call(void 0, entry.middleware);
         middlewareByDirectory.set(entry.location.directory, entry);
       }
     }
@@ -334,12 +337,12 @@ var _MiddlewareManager = class _MiddlewareManager {
           _chunkSHLXACIOcjs.toFileModuleUrl.call(void 0, filePath)
         );
       }
-      const normalized = _chunk3BU22U3Mcjs.normalizeMiddlewareModule.call(void 0, module, routePath);
+      const normalized = _chunkG2TEB74Scjs.normalizeMiddlewareModule.call(void 0, module, routePath);
       if (!normalized) {
         throw new Error("must export a default handler or a named middleware handler");
       }
       if (normalized.config) {
-        _chunkZ2HLU4IXcjs.compileMiddlewareConfig.call(void 0, normalized.config);
+        _chunk4GWRFP22cjs.compileMiddlewareConfig.call(void 0, normalized.config);
       }
       return {
         path: routePath,
@@ -356,7 +359,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Execute middleware for a request
    */
   async execute(req, res) {
-    const url = _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
+    const url = _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy: _optionalChain([this, 'access', _6 => _6.server, 'optionalAccess', _7 => _7.trustProxy]) });
     const pathname = url.pathname;
     const toRoutePathname = /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, (value) => _optionalChain([this, 'access', _8 => _8.i18n, 'optionalAccess', _9 => _9.enabled]) ? _chunkBIDYX3SLcjs.stripFarmLocaleFromPathname.call(void 0, value, this.i18n) : _chunkI57LW5VZcjs.stripFarmBasePath.call(void 0, value, _nullishCoalesce(_optionalChain([this, 'access', _10 => _10.i18n, 'optionalAccess', _11 => _11.basePath]), () => ( "/"))), "toRoutePathname");
     const routePathname = toRoutePathname(pathname);
@@ -364,7 +367,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     const method = req.method || "GET";
     const startTime = Date.now();
     let parentData;
-    let ctx = createContext(req, res, this.viteServer, void 0, this.server);
+    let ctx = createContext(req, res, this.viteServer, void 0, this.server, toRoutePathname);
     if (this.globalConfig) {
       const globalMatch = this.matchesConfig(routePathname, this.globalConfig, ctx);
       if (!globalMatch.matched) {
@@ -378,7 +381,7 @@ var _MiddlewareManager = class _MiddlewareManager {
       ...this.configMiddleware.map((mw) => ({ mw, routeMatch: { matched: true } })),
       ...this.middleware.map((mw) => ({
         mw,
-        routeMatch: _chunkZ2HLU4IXcjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
+        routeMatch: _chunk4GWRFP22cjs.matchesMiddlewareRouteAt.call(void 0, toMiddlewarePathnames(routePathname), mw)
       })).filter((entry) => entry.routeMatch.matched)
     ];
     if (applicable.length === 0) {
@@ -404,17 +407,17 @@ var _MiddlewareManager = class _MiddlewareManager {
       for (; ; ) {
         for (const entry of pass) yield { ...entry, pathname: passPathname };
         const rewrittenPathname = toRoutePathname(
-          _chunkUXFQ3UDAcjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
+          _chunkNICDYKBScjs.resolveFarmRequestURL.call(void 0, req, { trustProxy }).pathname
         );
         if (rewrittenPathname === passPathname) return;
         passPathname = rewrittenPathname;
         const passPathnames = toMiddlewarePathnames(passPathname);
-        if (globalConfig && !_chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
+        if (globalConfig && !_chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, passPathnames, globalConfig, ctx).matched) {
           return;
         }
         pass = allMiddleware.filter((mw) => !ran.has(mw)).map((mw) => ({
           mw,
-          routeMatch: mw.source === "config" ? { matched: true } : _chunkZ2HLU4IXcjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
+          routeMatch: mw.source === "config" ? { matched: true } : _chunk4GWRFP22cjs.matchesMiddlewareRouteAt.call(void 0, passPathnames, mw)
         })).filter((entry) => entry.routeMatch.matched);
       }
     }
@@ -432,7 +435,7 @@ var _MiddlewareManager = class _MiddlewareManager {
         ctx.params = { ...ctx.params, ...configMatch.params };
       }
       if (parentData) {
-        ctx = createContext(req, res, this.viteServer, parentData, this.server);
+        ctx = createContext(req, res, this.viteServer, parentData, this.server, toRoutePathname);
         if (routeMatch.params) {
           ctx.params = { ...ctx.params, ...routeMatch.params };
         }
@@ -525,7 +528,7 @@ var _MiddlewareManager = class _MiddlewareManager {
    * Check if pathname matches middleware config
    */
   matchesConfig(pathname, config, ctx) {
-    return _chunkZ2HLU4IXcjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
+    return _chunk4GWRFP22cjs.matchesMiddlewareConfigAt.call(void 0, this.toMiddlewarePathnames(pathname), config, ctx);
   }
   /**
    * Reload middleware (for HMR)

package/dist/{chunk-3KZS4SUS.mjs → chunk-MCIZVNOQ.mjs}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-FUZEBRP3.mjs";
 import {
   getCurrentRequestOrNull
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   __name
 } from "./chunk-LPEX4YW6.mjs";

package/dist/{chunk-XCMCS4DA.mjs → chunk-ND2CWPOD.mjs}

@@ -1,7 +1,7 @@
 import {
   _hydrateFarmI18n,
   isFarmLocaleChangeHref
-} from "./chunk-F2SE2VDO.mjs";
+} from "./chunk-IHQIOZLC.mjs";
 import {
   getHashTargetElement
 } from "./chunk-2PQNJXFM.mjs";
@@ -9,7 +9,7 @@ import {
   isFarmBlockedNavigationURL,
   isFarmExternalNavigationURL,
   resolveFarmNavigationURL
-} from "./chunk-5SJWVY6R.mjs";
+} from "./chunk-QHSH7IH4.mjs";
 import {
   createClientCancellation
 } from "./chunk-QVYLBY73.mjs";

package/dist/{chunk-S6VYG6XU.cjs → chunk-NDILNQ4L.cjs}

@@ -34,7 +34,7 @@ var _chunkS3A45T7Fcjs = require('./chunk-S3A45T7F.cjs');
 var _chunkZEG3OPIBcjs = require('./chunk-ZEG3OPIB.cjs');
 
 
-var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
+var _chunkNICDYKBScjs = require('./chunk-NICDYKBS.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
@@ -209,7 +209,7 @@ async function invokeAPIRouteEndpoint(endpoint, request, params = {}, bodySizeLi
     if (response2) return response2;
     throw error;
   }
-  const response = await _chunkUXFQ3UDAcjs._runWithCurrentRequest.call(void 0, 
+  const response = await _chunkNICDYKBScjs._runWithCurrentRequest.call(void 0, 
     request,
     () => invokeAPIRouteEndpointInContext(endpoint, request, params)
   );

package/dist/{chunk-BPOF5U4N.mjs → chunk-NFMDCAOS.mjs}

@@ -7,13 +7,14 @@ import {
   parseMiddlewareCookieHeader,
   serializeMiddlewareCookie,
   serializeMiddlewareCookieDeletion
-} from "./chunk-2NNMOPDN.mjs";
+} from "./chunk-J3ANCZKA.mjs";
 import {
   compileMiddlewareConfig,
   compileMiddlewareRoute,
   matchesMiddlewareConfigAt,
-  matchesMiddlewareRouteAt
-} from "./chunk-JG6DJF5A.mjs";
+  matchesMiddlewareRouteAt,
+  toMiddlewareRoutePathname
+} from "./chunk-HZFM2LWQ.mjs";
 import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
@@ -40,7 +41,7 @@ import {
 } from "./chunk-CBBLJMR5.mjs";
 import {
   resolveFarmRequestURL
-} from "./chunk-FDR64H6B.mjs";
+} from "./chunk-3KGDJLJK.mjs";
 import {
   stripFarmLocaleFromPathname
 } from "./chunk-L3KT7IXV.mjs";
@@ -80,7 +81,7 @@ var _CookieJarImpl = class _CookieJarImpl {
 };
 __name(_CookieJarImpl, "CookieJarImpl");
 var CookieJarImpl = _CookieJarImpl;
-function createContext(req, res, viteServer, parent, server) {
+function createContext(req, res, viteServer, parent, server, toRoutePathname) {
   const url = resolveFarmRequestURL(req, { trustProxy: server?.trustProxy });
   const headers = /* @__PURE__ */ new Map();
   const data = parent?.data ? new Map(parent.data) : /* @__PURE__ */ new Map();
@@ -105,6 +106,7 @@ function createContext(req, res, viteServer, parent, server) {
     response: res,
     url,
     pathname: url.pathname,
+    routePathname: toMiddlewareRoutePathname(url.pathname, toRoutePathname),
     searchParams: url.searchParams,
     method: req.method || "GET",
     params: {},
@@ -140,6 +142,7 @@ function createContext(req, res, viteServer, parent, server) {
       const newUrl = new URL(rewriteUrl, ctx.url);
       ctx.url = newUrl;
       ctx.pathname = newUrl.pathname;
+      ctx.routePathname = toMiddlewareRoutePathname(newUrl.pathname, toRoutePathname);
       ctx.searchParams = newUrl.searchParams;
       ctx.route = newUrl.pathname;
       req.url = rewriteUrl;
@@ -364,7 +367,7 @@ var _MiddlewareManager = class _MiddlewareManager {
     const method = req.method || "GET";
     const startTime = Date.now();
     let parentData;
-    let ctx = createContext(req, res, this.viteServer, void 0, this.server);
+    let ctx = createContext(req, res, this.viteServer, void 0, this.server, toRoutePathname);
     if (this.globalConfig) {
       const globalMatch = this.matchesConfig(routePathname, this.globalConfig, ctx);
       if (!globalMatch.matched) {
@@ -432,7 +435,7 @@ var _MiddlewareManager = class _MiddlewareManager {
         ctx.params = { ...ctx.params, ...configMatch.params };
       }
       if (parentData) {
-        ctx = createContext(req, res, this.viteServer, parentData, this.server);
+        ctx = createContext(req, res, this.viteServer, parentData, this.server, toRoutePathname);
         if (routeMatch.params) {
           ctx.params = { ...ctx.params, ...routeMatch.params };
         }