@farm.js/core 0.1.0-beta.96 → 0.1.0-beta.97

package/dist/{chunk-54XSGLKT.mjs → chunk-D7F7YZ7L.mjs}

@@ -9,7 +9,7 @@ import {
   FARM_DOCS_LAST_MODIFIED_MANIFEST,
   createFarmDocsLastModifiedManifest,
   getFarmDocsRouteTypeEntries
-} from "./chunk-Q7GPJZCO.mjs";
+} from "./chunk-YIBV77KZ.mjs";
 import {
   generateFarmDocsSearchClientRuntime,
   isFarmDocsSearchEnabled,
@@ -20,7 +20,7 @@ import {
   getDeployTargetForPreset,
   hasCustomFarmRouteContext,
   resolveDeployOutputPath
-} from "./chunk-TKQCJMY7.mjs";
+} from "./chunk-X4SFHKFH.mjs";
 import {
   resolveFarmInstrumentationFile
 } from "./chunk-5NAM3OTS.mjs";
@@ -32,6 +32,7 @@ import {
   createFarmThemeCssPlugin,
   enforceFarmIsolatedHydrationRouteBudget,
   farmFontImportsPlugin,
+  generateClientCachePersistenceCode,
   generateFarmClientPluginEntryCode,
   generateFarmIntegrationProviderClientCode,
   generateFarmIntegrationProviderServerModules,
@@ -40,10 +41,11 @@ import {
   getClientModuleMetadata,
   mergeFarmFontCss,
   mergeFarmViteConfig,
+  resolveFarmClientCacheAdapterEntry,
   resolveFarmIsolatedClientHydrationMode,
   resolveFarmNotFoundComponentPath,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-GZHKWHCH.mjs";
+} from "./chunk-FP5Q67FO.mjs";
 import {
   farmEnvironmentFunctionsPlugin
 } from "./chunk-V6WE6JSZ.mjs";
@@ -82,13 +84,13 @@ import {
 } from "./chunk-AAC66ILR.mjs";
 import {
   appendMiddlewareRoutePath
-} from "./chunk-RWYRFCLG.mjs";
+} from "./chunk-4X57GXQA.mjs";
 import {
   APIRouteManager
-} from "./chunk-WMAYETRD.mjs";
+} from "./chunk-TT3E2JOF.mjs";
 import {
   readFarmI18nCatalogs
-} from "./chunk-WB75GIX2.mjs";
+} from "./chunk-TQTB33JS.mjs";
 import {
   createFarmRouteRuntimeKey,
   getFarmRouteRuntimeConfig,
@@ -435,6 +437,34 @@ function createFarmVercelImmutableAssetRoute() {
   };
 }
 __name(createFarmVercelImmutableAssetRoute, "createFarmVercelImmutableAssetRoute");
+function buildFarmVercelRoutes(options) {
+  const { presetRoutes, runtimeRoutes, apiBasePath } = options;
+  const filesystemIndex = presetRoutes.findIndex((route) => route.handle === "filesystem");
+  const sourceRoutes = filesystemIndex >= 0 ? presetRoutes.slice(0, filesystemIndex) : [];
+  const preservedSourceRoutes = sourceRoutes.filter((route) => route.continue !== true);
+  return [
+    ...preservedSourceRoutes,
+    createFarmVercelImmutableAssetRoute(),
+    { handle: "filesystem" },
+    ...runtimeRoutes,
+    ...apiBasePath === "/" ? [] : [
+      {
+        src: `${apiBasePath}/(.*)`,
+        dest: "/__nitro",
+        headers: {
+          "Access-Control-Allow-Origin": "*",
+          "Access-Control-Allow-Methods": "*",
+          "Access-Control-Allow-Headers": "*"
+        }
+      }
+    ],
+    {
+      src: "/(.*)",
+      dest: "/__nitro"
+    }
+  ];
+}
+__name(buildFarmVercelRoutes, "buildFarmVercelRoutes");
 
 // src/nitro/node-server-entry.ts
 function createFarmNodeServerEntry(options) {
@@ -1598,7 +1628,8 @@ async function buildClient(productionVite, config, root, srcDir, outputDir, page
     config.publicRuntimeConfig,
     config.trailingSlash,
     getIntegrationProviders(config.integrations),
-    config.basePath
+    config.basePath,
+    generateClientCachePersistenceCode(resolveFarmClientCacheAdapterEntry(root, config.cache))
   );
   await fs.writeFile(clientEntryPath, clientHydrationCode);
   const hasScopedPostcssConfig = hasProjectPostcssConfig(root);
@@ -1909,6 +1940,46 @@ function matchRuntimePathPattern(pattern, pathname) {
 `.trim();
 }
 __name(generateRuntimePathMatcherSource, "generateRuntimePathMatcherSource");
+function generateRedirectInterpolationSource() {
+  return `
+function encodeRuntimePathSegment(value) {
+  return encodeURIComponent(String(value)).replace(
+    /[!'()*]/g,
+    function(character) {
+      return "%" + character.charCodeAt(0).toString(16).toUpperCase();
+    },
+  );
+}
+
+function interpolateRedirectDestination(destination, params) {
+  let result = destination;
+  const catchAllParamSegments = params[farmCatchAllParamSegments] || {};
+  const orderedCaptures = [];
+  for (const [key, value] of Object.entries(params)) {
+    const segments = catchAllParamSegments[key];
+    const encodedValue = Array.isArray(segments)
+      ? segments.map(encodeRuntimePathSegment).join("/")
+      : encodeRuntimePathSegment(value);
+    orderedCaptures.push(encodedValue);
+    result = result.split("[[..." + key + "]]").join(encodedValue);
+    result = result.split("[..." + key + "]").join(encodedValue);
+    result = result.split("[" + key + "]").join(encodedValue);
+    result = result.split(":" + key + "*").join(encodedValue);
+    result = result.split(":" + key).join(encodedValue);
+    if (key === "wildcard") result = result.split("*").join(encodedValue);
+  }
+  // Numbered captures resolve after the named substitutions. Encoded values
+  // never contain "$", so this cannot rewrite an already-injected value. An
+  // out-of-range index resolves to "", matching the development path.
+  result = result.replace(/\\$(\\d+)/g, function(_whole, group) {
+    const captured = orderedCaptures[Number(group) - 1];
+    return captured === undefined ? "" : captured;
+  });
+  return result;
+}
+`.trim();
+}
+__name(generateRedirectInterpolationSource, "generateRedirectInterpolationSource");
 function generateUniversalRouterStateProperties() {
   return `
   blockers: new Set(),
@@ -2200,7 +2271,7 @@ function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlot
     secure: false
   },
   direction: {}
-}, plugins = [], renderer = REACT_RENDERER, publicRuntimeConfig = void 0, trailingSlash = false, integrationProviders = [], basePath = "/") {
+}, plugins = [], renderer = REACT_RENDERER, publicRuntimeConfig = void 0, trailingSlash = false, integrationProviders = [], basePath = "/", clientCachePersistence = { imports: "", init: "" }) {
   const toImportPath = /* @__PURE__ */ __name((targetPath) => targetPath.replace(/\\/g, "/"), "toImportPath");
   const clientPluginEntry = generateFarmClientPluginEntryCode(
     plugins,
@@ -2212,8 +2283,7 @@ function generateClientHydrationEntry(clientPages, layoutRoutes, clientRouteSlot
 import { createRoot, hydrateRoot } from "react-dom/client";` : `import React, { createRoot, hydrateRoot } from ${JSON.stringify(renderer.client)};`;
   const providerClientCode = generateFarmIntegrationProviderClientCode(integrationProviders, root);
   const globalsCssPath = path4.join(root, srcDir, "app", "globals.css");
-  const cssImportPath = toImportPath(globalsCssPath);
-  const cssImport = `import ${JSON.stringify(cssImportPath)};`;
+  const cssImport = existsSync(globalsCssPath) ? `import ${JSON.stringify(toImportPath(globalsCssPath))};` : "";
   const layoutImportStatements = [];
   const layoutRegistrations = [];
   layoutRoutes.forEach((layout, index) => {
@@ -2298,6 +2368,7 @@ ${layoutImports}
 import { createClientPluginManager, getHashTargetElement, installChunkErrorRecovery, isFarmExternalNavigationURL, reconcileFarmDocumentHead, setFarmBasePath, setFarmTrailingSlashPreference, stripFarmBasePath } from "@farm.js/core/internal/client-runtime";
 import { createFarmDeploymentMismatchError, createFarmDeploymentRequestHeaders, isFarmDeploymentMismatchResponse } from "@farm.js/core/deployment";
 ${clientPluginEntry.imports}
+${clientCachePersistence.imports}
 ${i18nClientRuntime}
 ${docsNavigationRuntime}
 ${docsAdapterRuntime}
@@ -2306,6 +2377,7 @@ ${generateFarmDocsSearchClientRuntime(docsSearchEnabled, docsSearchModuleId)}
 setFarmBasePath(${JSON.stringify(basePath)});
 setFarmTrailingSlashPreference(${JSON.stringify(trailingSlash)});
 installChunkErrorRecovery();
+${clientCachePersistence.init}
 mountFarmDocsSearch();
 
 ${generateUniversalRouterStateRuntime()}
@@ -2660,6 +2732,7 @@ import { createClientPluginManager, getHashTargetElement, installChunkErrorRecov
 import { createFarmDeploymentMismatchError, createFarmDeploymentRequestHeaders, isFarmDeploymentMismatchResponse } from "@farm.js/core/deployment";
 import { isFarmRouteActive, matchFarmRoute } from "@farm.js/core/router";
 ${clientPluginEntry.imports}
+${clientCachePersistence.imports}
 ${i18nClientRuntime}
 ${docsNavigationRuntime}
 ${docsAdapterRuntime}
@@ -2672,6 +2745,7 @@ ${providerClientCode.runtime}
 setFarmBasePath(${JSON.stringify(basePath)});
 setFarmTrailingSlashPreference(${JSON.stringify(trailingSlash)});
 installChunkErrorRecovery();
+${clientCachePersistence.init}
 
 // Client component routes
 const clientRoutes = [
@@ -5416,32 +5490,7 @@ async function handleApplicationMetadataRouteRequest(request, routePathname) {
   }
 }
 
-function encodeRuntimePathSegment(value) {
-  return encodeURIComponent(String(value)).replace(
-    /[!'()*]/g,
-    function(character) {
-      return "%" + character.charCodeAt(0).toString(16).toUpperCase();
-    },
-  );
-}
-
-function interpolateRedirectDestination(destination, params) {
-  let result = destination;
-  const catchAllParamSegments = params[farmCatchAllParamSegments] || {};
-  for (const [key, value] of Object.entries(params)) {
-    const segments = catchAllParamSegments[key];
-    const encodedValue = Array.isArray(segments)
-      ? segments.map(encodeRuntimePathSegment).join("/")
-      : encodeRuntimePathSegment(value);
-    result = result.split("[[..." + key + "]]").join(encodedValue);
-    result = result.split("[..." + key + "]").join(encodedValue);
-    result = result.split("[" + key + "]").join(encodedValue);
-    result = result.split(":" + key + "*").join(encodedValue);
-    result = result.split(":" + key).join(encodedValue);
-    if (key === "wildcard") result = result.split("*").join(encodedValue);
-  }
-  return result;
-}
+${generateRedirectInterpolationSource()}
 
 function matchRedirectRoute(pathname, locale, search) {
   for (const redirect of redirectRoutes) {
@@ -5864,9 +5913,10 @@ ${config.docs?.enabled ? `async function wrapFarmDocsResponseWithLayouts(request
 }` : ""}
 
 const pprShellCache = getFarmDataCache();
+const experimentalPPREnabled = ${JSON.stringify(config.experimental?.ppr === true)};
 
 function resolvePPRConfig(routeModule) {
-  if (!routeModule || routeModule.dynamic === "force-dynamic") {
+  if (!experimentalPPREnabled || !routeModule || routeModule.dynamic === "force-dynamic") {
     return { enabled: false };
   }
 
@@ -7955,35 +8005,11 @@ async function postProcessVercelOutput(root, outputDir, fs, config, farmWorkflow
     routeRuntimeManifest,
     fs
   );
-  vercelConfig.routes = [
-    // Apply the header before the filesystem handler. `continue` lets Vercel
-    // serve the matching file while preserving the immutable cache policy.
-    // Hashed client assets ship at the root regardless of basePath, so the
-    // route is deliberately not basePath-scoped.
-    createFarmVercelImmutableAssetRoute(),
-    // Serve static files first
-    {
-      handle: "filesystem"
-    },
-    ...runtimeRoutes,
-    // API routes
-    ...resolveFarmAPIServerBasePath(config.api) === "/" ? [] : [
-      {
-        src: `${resolveFarmAPIServerBasePath(config.api)}/(.*)`,
-        dest: "/__nitro",
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "*",
-          "Access-Control-Allow-Headers": "*"
-        }
-      }
-    ],
-    // All other routes go to the serverless function
-    {
-      src: "/(.*)",
-      dest: "/__nitro"
-    }
-  ];
+  vercelConfig.routes = buildFarmVercelRoutes({
+    presetRoutes: Array.isArray(vercelConfig.routes) ? vercelConfig.routes : [],
+    runtimeRoutes,
+    apiBasePath: resolveFarmAPIServerBasePath(config.api)
+  });
   const vercelConfigWithWorkflowCrons = applyFarmWorkflowVercelCrons(
     vercelConfig,
     farmWorkflows.workflows
@@ -8582,4 +8608,4 @@ __name(buildNitro, "buildNitro");
 export {
   build
 };
-//# sourceMappingURL=chunk-54XSGLKT.mjs.map
+//# sourceMappingURL=chunk-D7F7YZ7L.mjs.map