@farm.js/core 0.1.0-beta.5 → 0.1.0-beta.7

package/dist/{chunk-2NHCNRF6.mjs → chunk-GFMBXLGP.mjs}

@@ -9,7 +9,7 @@ import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsLastModifiedManifest,
   getFarmDocsRouteTypeEntries
-} from "./chunk-HNIQFZKB.mjs";
+} from "./chunk-ME4MO2RJ.mjs";
 import {
   generateFarmDocsSearchClientRuntime,
   isFarmDocsSearchEnabled,
@@ -21,17 +21,17 @@ import {
 import {
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-NM3CRAAL.mjs";
+} from "./chunk-B4W3BNTL.mjs";
 import {
   PluginManager
-} from "./chunk-C3DLZMBU.mjs";
+} from "./chunk-DJSGLHCN.mjs";
 import {
   createFarmApp,
   generateFarmClientPluginEntryCode,
   generateFarmTypeArtifacts,
   getClientModuleMetadata,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-A2LUXHD2.mjs";
+} from "./chunk-5VYHFKWE.mjs";
 import {
   farmEnvironmentFunctionsPlugin
 } from "./chunk-V6WE6JSZ.mjs";
@@ -43,7 +43,7 @@ import {
 } from "./chunk-YW7OBE6Q.mjs";
 import {
   isFarmMarkdownPageFile
-} from "./chunk-QGQX7SFC.mjs";
+} from "./chunk-ZVWA4ZQ3.mjs";
 import {
   applyFarmWorkflowVercelCrons,
   prepareFarmWorkflowsForNitro
@@ -743,10 +743,14 @@ async function buildUniversal(config, routeManager, apiRouteManager, serverRende
     const routeRuntimeManifestResultPromise = Promise.allSettled([routeRuntimeManifestPromise]);
     const pageRoutes = [];
     for (const [pattern, entry] of routeManager.getRoutes()) {
+      const markdownSourcePath = entry.markdownSourcePath || (isFarmMarkdownPageFile(entry.modulePath) ? entry.modulePath : void 0);
       pageRoutes.push({
         pattern,
         modulePath: entry.modulePath,
-        ...isFarmMarkdownPageFile(entry.modulePath) ? { source: readFileSync(entry.modulePath, "utf8") } : {}
+        ...markdownSourcePath ? {
+          source: readFileSync(markdownSourcePath, "utf8"),
+          markdownSourcePath
+        } : {}
       });
     }
     const routeSlots = Array.from(
@@ -2657,15 +2661,13 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   });
   const pageImports = [];
   const pageRegistrations = [];
-  const hasMarkdownPages = pageRoutes.some(
-    (route) => route.source !== void 0 || isFarmMarkdownPageFile(route.modulePath)
-  );
+  const hasMarkdownPages = pageRoutes.some((route) => route.source !== void 0);
   const orderedPageRoutes = pageRoutes.map((route, index) => ({ route, index })).sort(
     (left, right) => routePatternSpecificity(right.route.pattern) - routePatternSpecificity(left.route.pattern) || left.index - right.index
   ).map(({ route }) => route);
   orderedPageRoutes.forEach((route, index) => {
     const varName = `pageRoute${index}`;
-    if (route.source !== void 0 || isFarmMarkdownPageFile(route.modulePath)) {
+    if (isFarmMarkdownPageFile(route.modulePath)) {
       pageRegistrations.push(`
   {
     pattern: ${JSON.stringify(route.pattern)},
@@ -2677,7 +2679,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
     }),
     markdownSource: {
       source: ${JSON.stringify(route.source ?? "")},
-      filePath: ${JSON.stringify(route.modulePath)},
+      filePath: ${JSON.stringify(route.markdownSourcePath ?? route.modulePath)},
     },
   }`);
       return;
@@ -2689,6 +2691,10 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
     pattern: ${JSON.stringify(route.pattern)},
     module: ${varName},
     shouldHydrate: ${JSON.stringify(shouldHydrate)},
+    ${route.source !== void 0 ? `markdownSource: {
+      source: ${JSON.stringify(route.source)},
+      filePath: ${JSON.stringify(route.markdownSourcePath)},
+    },` : ""}
   }`);
   });
   const layoutImports = [];
@@ -2794,7 +2800,7 @@ function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlot
   const docsRuntimeImport = config.docs?.enabled ? `import { existsSync as farmDocsExistsSync } from "node:fs";
 import { dirname as farmDocsDirname, join as farmDocsJoin } from "node:path";
 import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
-  const markdownHandlerImport = config.md?.enabled ? `import { createMarkdownMirrorResponse } from "@farm.js/core/markdown";` : "";
+  const markdownHandlerImport = config.md?.enabled ? `import { applyMarkdownNegotiationHeaders, createMarkdownMirrorResponse } from "@farm.js/core/markdown";` : "";
   const appMarkdownImport = hasMarkdownPages ? `import { createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse } from "@farm.js/core/app-markdown";` : "const createFarmMarkdownSourceResponse = null;";
   const mdxComponentsPath = typeof config.mdx?.components === "string" ? path3.isAbsolute(config.mdx.components) ? config.mdx.components : path3.join(config.root, config.mdx.components) : null;
   const mdxComponentsImport = mdxComponentsPath ? `import * as FarmMdxComponentsModule from "${mdxComponentsPath.replace(/\\/g, "/")}";` : "";
@@ -3044,10 +3050,12 @@ function serializeFarmInlineValue(value) {
     .replace(/\\u2029/g, "\\\\u2029");
 }
 
-function renderFarmClientBootstrapScript(canonicalPath, selectedRouteSlots) {
+function renderFarmClientBootstrapScript(canonicalPath, selectedRouteSlots, pageProps) {
   const integrationManifest = ${hasRuntimeIntegrationConfig ? "getRegisteredIntegrationAPIManifest()" : "{}"};
   const serializedRouteSlots = serializeFarmInlineValue(selectedRouteSlots || []);
-  let source = 'window.__FARM_INTEGRATION_API_MANIFEST__=' +
+  const serializedPageProps = serializeFarmInlineValue(pageProps || {});
+  let source = 'window.__FARM_PROPS__=' + serializedPageProps +
+    ';window.__FARM_INTEGRATION_API_MANIFEST__=' +
     serializeFarmInlineValue(integrationManifest) +
     ';window.__FARM_ROUTE_SLOTS__=' + serializedRouteSlots + ';';
   if (typeof canonicalPath === "string" && canonicalPath.startsWith("/")) {
@@ -4098,7 +4106,7 @@ async function getCachedPPRShell(cacheKey) {
  * Main request handler - created at runtime with bundled routes
  */
 async function handleFarmRequest(request) {
-  ${config.i18n.enabled ? `return _runWithFarmI18nRequest(
+  const response = await ${config.i18n.enabled ? `_runWithFarmI18nRequest(
     farmI18nRuntime,
     request,
     async function(farmLocaleResolution) {
@@ -4117,7 +4125,15 @@ async function handleFarmRequest(request) {
       const response = await handleFarmRequestInContext(request, farmLocaleResolution);
       return applyFarmI18nResponse(response, farmLocaleResolution);
     }
-  );` : "return handleFarmRequestInContext(request, null);"}
+  )` : "handleFarmRequestInContext(request, null)"};
+  ${config.md?.enabled ? `const pathname = getFarmRoutePathname(new URL(request.url).pathname);
+  if (matchPageRoute(pathname)) {
+    return applyMarkdownNegotiationHeaders(response, {
+      config: farmMarkdownConfig,
+      pathname,
+    });
+  }` : ""}
+  return response;
 }
 
 async function handleFarmRequestInContext(
@@ -4479,6 +4495,23 @@ async function handleFarmRequestInContext(
             return { ...slot, props: slotProps };
           }),
         );
+        const clientMiddleware = middlewareData?.size
+          ? { data: Object.fromEntries(middlewareData) }
+          : undefined;
+        const clientPageProps = {
+          params: pageProps.params,
+          search: pageProps.search ?? searchParamsObj,
+          searchParams: pageProps.search ?? searchParamsObj,
+          ...("data" in pageProps ? { data: pageProps.data } : {}),
+          ...(pageProps.__farmCanonicalPath
+            ? { __farmCanonicalPath: pageProps.__farmCanonicalPath }
+            : {}),
+          ...(pageProps.__farmRoutePropsResolved
+            ? { __farmRoutePropsResolved: true }
+            : {}),
+          path: pathname,
+          ...(clientMiddleware ? { middleware: clientMiddleware } : {}),
+        };
         const routeSlotPayload = renderedRouteSlots.map(function(slot) {
           return {
             name: slot.name,
@@ -4493,6 +4526,7 @@ async function handleFarmRequestInContext(
               searchParams: slot.props.search || searchParamsObj,
               ...("data" in slot.props ? { data: slot.props.data } : {}),
               path: pathname,
+              ...(clientMiddleware ? { middleware: clientMiddleware } : {}),
             },
           };
         });
@@ -4648,7 +4682,8 @@ async function handleFarmRequestInContext(
           const streamSuffix = '</div>\\n' +
             '  ' + renderFarmClientBootstrapScript(
               pageProps.__farmCanonicalPath,
-              routeSlotPayload
+              routeSlotPayload,
+              clientPageProps
             ) + '\\n' +
             '  <script type="module" src="/farm-client.js"></script>\\n' +
             '</body>\\n</html>';
@@ -4708,7 +4743,8 @@ async function handleFarmRequestInContext(
               /<\\/body>/i,
               '  ' + renderFarmClientBootstrapScript(
                 pageProps.__farmCanonicalPath,
-                routeSlotPayload
+                routeSlotPayload,
+                clientPageProps
               ) + '\\n' +
                 '  <script type="module" src="/farm-client.js"></script>\\n</body>',
             );
@@ -4730,7 +4766,7 @@ async function handleFarmRequestInContext(
 </head>
 <body>
   <div id="root">\${html}</div>
-  \${renderFarmClientBootstrapScript(pageProps.__farmCanonicalPath, routeSlotPayload)}
+  \${renderFarmClientBootstrapScript(pageProps.__farmCanonicalPath, routeSlotPayload, clientPageProps)}
   <script type="module" src="/farm-client.js"></script>
 </body>
 </html>\`;
@@ -6238,4 +6274,4 @@ __name(buildNitro, "buildNitro");
 export {
   build
 };
-//# sourceMappingURL=chunk-2NHCNRF6.mjs.map
+//# sourceMappingURL=chunk-GFMBXLGP.mjs.map