@farm.js/core 0.1.51-beta.3 → 0.1.60

package/dist/{chunk-3WSIYBMG.mjs → chunk-ILMTRGBG.mjs}

@@ -13,6 +13,7 @@ import {
 } from "./chunk-ANHZ6SUL.mjs";
 import {
   FARM_LAYOUT_ELEMENT_CLIENT_SOURCE,
+  FARM_NAVIGATION_STREAM_READER_SOURCE,
   FARM_SERVER_TREE_LAYOUT_CLIENT_SOURCE,
   FarmApp,
   collectFarmWebMCPTools,
@@ -27,6 +28,7 @@ import {
   getClientModuleMetadata,
   getIslandStrategyExport,
   hasUseClientDirective,
+  inferFarmIslandStrategy,
   isFarmDocsClientConfigModule,
   isIsolatableClientBoundarySource,
   redactFarmDocsClientConfig,
@@ -35,12 +37,13 @@ import {
   resolveFarmClientCacheAdapterEntry,
   resolveFarmImageProviderForRuntime,
   resolveFarmIsolatedClientHydrationMode,
+  resolveFarmRouteRootStrategy,
   resolveModuleSourcePath,
   stripUseClientDirective
-} from "./chunk-3TLKUBXG.mjs";
+} from "./chunk-ZFUKPWFC.mjs";
 import {
   loadTailwindVitePlugin
-} from "./chunk-PIHKO25G.mjs";
+} from "./chunk-OM7WILES.mjs";
 import {
   FARM_NODE_RESPONSE_END_PENDING
 } from "./chunk-GHNW564E.mjs";
@@ -50,7 +53,7 @@ import {
 import {
   generateFarmTypeArtifacts,
   resolveRouteRenderingConfig
-} from "./chunk-CZ35L6PL.mjs";
+} from "./chunk-LJVNMGE3.mjs";
 import {
   createFarmRouteRenderPlan,
   farmPathGuardCoversEndpoint,
@@ -61,7 +64,7 @@ import {
   parseFarmLayoutChainHeader,
   renderFarmLocaleAlternateLinks,
   stripRouteGroups
-} from "./chunk-YUEYBL35.mjs";
+} from "./chunk-PCXIJKPM.mjs";
 import {
   FARM_NATIVE_TREE_CONTENT_TYPE
 } from "./chunk-LLZSYFOM.mjs";
@@ -82,10 +85,10 @@ import {
   resolveFarmMCPRouteLabel,
   resolveFarmMarkdownRouteLabel,
   setFarmRouteLabel
-} from "./chunk-4TKAIO2F.mjs";
+} from "./chunk-ZMHAFH4R.mjs";
 import {
   FARM_DEFAULT_MCP_PATH
-} from "./chunk-E5DXF5GE.mjs";
+} from "./chunk-UZZ6IEQP.mjs";
 import {
   resolveFarmLayoutFonts
 } from "./chunk-HZOMT5DY.mjs";
@@ -97,11 +100,6 @@ import {
   programmaticClientRouteKey,
   resolveFarmBrowserBuiltin
 } from "./chunk-ZQ5BDNKW.mjs";
-import {
-  createFarmMarkdownSourceResponse,
-  isFarmMarkdownPageFile,
-  normalizeFarmMarkdownRoutePath
-} from "./chunk-3Z63X45F.mjs";
 import {
   generateFarmDocsAdapterClientRuntime,
   getFarmDocsAdapterConfigModule
@@ -132,10 +130,15 @@ import {
   FARM_PREVIEW_ROBOTS_TAG,
   resolveFarmAgentCrawlers,
   resolveFarmAgentSitemap
-} from "./chunk-LDNSSHEG.mjs";
+} from "./chunk-T4TBK5NY.mjs";
 import {
   resolveFarmLlmsTxtConfig
-} from "./chunk-YAJTD3ZG.mjs";
+} from "./chunk-KVW2M6PI.mjs";
+import {
+  getFarmAppDirectories,
+  getFarmLayerAliases,
+  getFarmSourceRoots
+} from "./chunk-52Y3C3HG.mjs";
 import {
   getPublicFarmImageConfig,
   resolveFarmImageConfig
@@ -144,10 +147,10 @@ import {
   createBundledEnv
 } from "./chunk-N33DLJBC.mjs";
 import {
-  getFarmAppDirectories,
-  getFarmLayerAliases,
-  getFarmSourceRoots
-} from "./chunk-52Y3C3HG.mjs";
+  createFarmMarkdownSourceResponse,
+  isFarmMarkdownPageFile,
+  normalizeFarmMarkdownRoutePath
+} from "./chunk-E72UD6ME.mjs";
 import {
   FARM_MARKDOWN_CONTENT_TYPE,
   createFarmMarkdownErrorBody,
@@ -156,7 +159,7 @@ import {
   getFarmMarkdownAlternatePath,
   getFarmMarkdownMirrorPath,
   resolveMarkdownMirrorTarget
-} from "./chunk-LPDKG6RA.mjs";
+} from "./chunk-YSXTNSXS.mjs";
 import {
   resolveFarmRouteContext,
   withFarmRouteContext
@@ -167,10 +170,10 @@ import {
   getIntegrationDocumentNavigationMatchers,
   getIntegrationProviders,
   matchIntegrationRoute
-} from "./chunk-Y2G5SJFB.mjs";
+} from "./chunk-IFHPDLIS.mjs";
 import {
   MiddlewareManager
-} from "./chunk-NN3MOPSI.mjs";
+} from "./chunk-A2MN5PQJ.mjs";
 import {
   _runWithMiddlewareContext,
   _runWithMiddlewareData
@@ -186,7 +189,7 @@ import {
 } from "./chunk-IYEY3JWJ.mjs";
 import {
   APIRouteManager
-} from "./chunk-KY32FWK7.mjs";
+} from "./chunk-BHJAYPYU.mjs";
 import {
   getFarmI18nClientSnapshot
 } from "./chunk-CV6MFQ4Y.mjs";
@@ -196,10 +199,10 @@ import {
 } from "./chunk-NR63PD3P.mjs";
 import {
   isFarmAPIPathname
-} from "./chunk-LJDIFIJ2.mjs";
+} from "./chunk-RPUJHJHE.mjs";
 import {
   registerFarmMCPServer
-} from "./chunk-KJMWAUKE.mjs";
+} from "./chunk-C7GJDVN4.mjs";
 import {
   isProgrammaticRoutesFileName,
   parseProgrammaticRouteModuleId,
@@ -221,7 +224,7 @@ import {
   logger,
   toPosixPath,
   toViteModuleId
-} from "./chunk-Y3N5BFRJ.mjs";
+} from "./chunk-JSDV2NUN.mjs";
 import {
   createFarmSearchParams,
   searchParamsToObject
@@ -235,6 +238,9 @@ import {
   fetchFarmExternalRewrite,
   sendWebResponse
 } from "./chunk-CO6UYM2D.mjs";
+import {
+  resolveFarmAPIServerBasePath
+} from "./chunk-2I6PUKWJ.mjs";
 import {
   createFarmNodeRequestAbortSignal,
   createFarmNodeRequestBodyStream,
@@ -242,15 +248,12 @@ import {
   readNodeRequestBody,
   resolveFarmServerConfig
 } from "./chunk-GFT5AHAT.mjs";
-import {
-  resolveFarmAPIServerBasePath
-} from "./chunk-LM2YOGDK.mjs";
 import {
   FARM_VERSION
-} from "./chunk-R4PHCZ3G.mjs";
+} from "./chunk-HPWB57PZ.mjs";
 import {
   DEFAULT_FARM_API_BASE_PATH
-} from "./chunk-BLD5GVCG.mjs";
+} from "./chunk-W6QLRQ3V.mjs";
 import {
   addMetadataMarkdownAlternate,
   mergeMetadata,
@@ -768,7 +771,7 @@ function loadFarmWorkflowsDevRuntime() {
   return import("./workflows.mjs");
 }
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-UESYARTF.mjs");
+  return import("./devtools-KQZ6SRCJ.mjs");
 }
 function loadFarmDevtoolsUIRuntime() {
   return import("./devtools-ui-CYBVFLPH.mjs");
@@ -1255,7 +1258,7 @@ function transformIsolatedClientBoundaryModule(options) {
     const wrapperName = `__farm_isolated_boundary_${safeName || "default"}__`;
     wrapperStatements.push(
       // Islands mode renders through islx; the older isolated hydration keeps Farm's boundary.
-      options.slots ? `const ${wrapperName} = __farm_islx_island__(${localName}, ${JSON.stringify(options.moduleReference)}, ${JSON.stringify(exportName)}, ${JSON.stringify(options.islandStrategy)});` : `const ${wrapperName} = __farm_create_isolated_boundary__(__farm_isolated_react__, ${localName}, ${JSON.stringify(options.moduleReference)}, ${JSON.stringify(exportName)}, ${JSON.stringify(options.islandStrategy)});`
+      options.slots && options.inferredInteraction ? `const ${wrapperName} = __farm_islx_island__(${localName}, ${JSON.stringify(options.moduleReference)}, ${JSON.stringify(exportName)}, "interaction", { inferred: true });` : options.slots ? `const ${wrapperName} = __farm_islx_island__(${localName}, ${JSON.stringify(options.moduleReference)}, ${JSON.stringify(exportName)}, ${JSON.stringify(options.islandStrategy)});` : `const ${wrapperName} = __farm_create_isolated_boundary__(__farm_isolated_react__, ${localName}, ${JSON.stringify(options.moduleReference)}, ${JSON.stringify(exportName)}, ${JSON.stringify(options.islandStrategy)});`
     );
     wrapperStatements.push(
       isDefault ? `export default ${wrapperName};` : `export { ${wrapperName} as ${exportName} };`
@@ -2338,7 +2341,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             }
           }
           if (options.mobileClient && !viteModuleRequest && (requestMethod === "GET" || requestMethod === "HEAD") && req.headers.accept?.includes(FARM_NATIVE_TREE_CONTENT_TYPE)) {
-            const { createFarmNativeTreeResponse } = await import("./native-tree-EBPDFTRW.mjs");
+            const { createFarmNativeTreeResponse } = await import("./native-tree-VWNW2MQ2.mjs");
             const treeResponse = await createFarmNativeTreeResponse({
               request: new Request(fullUrl, { method: requestMethod, headers: docsHeaders }),
               // As for the Markdown mirror: this server's own listener, redirects not followed.
@@ -2928,9 +2931,22 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     (metadata) => metadata.shouldHydrate && metadata.islandStrategy ? [metadata.islandStrategy] : []
                   )
                 ];
-                const hydrationIslandStrategy = hydrationStrategies.every(
-                  (strategy) => strategy === hydrationStrategies[0]
-                ) ? hydrationStrategies[0] ?? "load" : "load";
+                const hydrationIslandStrategy = resolveFarmServerComponentsMode(
+                  (farmApp?.getConfig() ?? options).experimental?.serverComponents
+                ) === "islands" ? resolveFarmRouteRootStrategy(
+                  route,
+                  { shouldHydrate, islandStrategy: moduleMetadata.islandStrategy ?? null },
+                  layouts.map((layout, index) => ({
+                    pattern: layout.pattern,
+                    modulePath: layout.modulePath,
+                    shouldHydrate: layoutHydrationMetadata[index]?.shouldHydrate === true,
+                    // Manifest entries carry it; metadata read from source does not.
+                    hasIsolatedClientBoundaries: layoutHydrationMetadata[index]?.hasIsolatedClientBoundaries === true,
+                    islandStrategy: layoutHydrationMetadata[index]?.islandStrategy ?? null
+                  })),
+                  server.config.root,
+                  true
+                ) : hydrationStrategies.every((strategy) => strategy === hydrationStrategies[0]) ? hydrationStrategies[0] ?? "load" : "load";
                 const targetUrl = new URL(targetPath, "http://localhost");
                 const searchParams = searchParamsToObject(targetUrl.searchParams);
                 const routeContext = await resolveFarmRouteContext(farmApp.getConfig(), {
@@ -3339,7 +3355,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
       if (parseProgrammaticRouteModuleId(id)) {
         return id;
       }
-      if (isFarmClientVirtualId(id)) {
+      if (isFarmClientVirtualId(id) || id === FARM_DEV_CLIENT_BOOT_ID) {
         return id;
       }
       if (id === "/@farm/server") {
@@ -3378,6 +3394,9 @@ window.__FARM_MANIFEST__ = ${inlineValue({
         }
         return generateProgrammaticRouteModule(id, root, renderer);
       }
+      if (id === FARM_DEV_CLIENT_BOOT_ID) {
+        return FARM_DEV_CLIENT_BOOT_MODULE;
+      }
       if (isFarmClientVirtualId(id)) {
         const resolvedConfig = farmApp?.getConfig();
         const renderer = resolvedConfig?.renderer || resolveFarmRenderer(options.renderer);
@@ -3596,12 +3615,22 @@ export const manifest = getManifest();
         const selectedForIsolatedHydration = selectedIsolatedModules?.has(path5.resolve(cleanId)) === true;
         if (isReactRenderer(resolveFarmRenderer(currentConfig.renderer)) && selectedForIsolatedHydration && isIsolatableClientBoundarySource(clientBoundarySource)) {
           isolatedModuleReference = toViteModuleId(cleanId, root);
+          const islandsMode = resolveFarmServerComponentsMode(currentConfig.experimental?.serverComponents) === "islands";
+          const explicitStrategy = getIslandStrategyExport(clientBoundarySource);
+          const inference = islandsMode && explicitStrategy === null ? inferFarmIslandStrategy(cleanId, root) : null;
+          if (inference) {
+            for (const file of inference.files) {
+              if (file !== path5.resolve(cleanId)) this.addWatchFile(file);
+              recordFarmIslandInferenceDependency(file, cleanId);
+            }
+          }
           const transformedBoundary = transformIsolatedClientBoundaryModule({
             code: transformedCode,
             moduleReference: isolatedModuleReference,
-            islandStrategy: getIslandStrategyExport(clientBoundarySource) ?? "load",
+            islandStrategy: explicitStrategy ?? "load",
             parse: (source) => this.parse(source),
-            slots: resolveFarmServerComponentsMode(currentConfig.experimental?.serverComponents) === "islands"
+            slots: islandsMode,
+            inferredInteraction: inference?.strategy === "interaction"
           });
           if (!transformedBoundary) {
             this.error(
@@ -3783,6 +3812,12 @@ if (import.meta.hot) {
           });
         }
       }
+      for (const island of farmIslandInferenceDependents.get(path5.resolve(file)) ?? []) {
+        if (island === path5.resolve(file)) continue;
+        for (const mod of server2.moduleGraph.getModulesByFile(toPosixPath(island)) ?? []) {
+          server2.moduleGraph.invalidateModule(mod);
+        }
+      }
       const currentFarmConfig = farmApp?.getConfig();
       const normalizedFile = file.replace(/\\/g, "/");
       if (currentFarmConfig && /\/route\.(?:ts|tsx|js|jsx)$/.test(normalizedFile) && getFarmAppDirectories(currentFarmConfig).some(
@@ -3935,6 +3970,15 @@ function resolveDevelopmentRoot(farmRoot, viteRoot) {
   }
   return farmRoot;
 }
+var farmIslandInferenceDependents = /* @__PURE__ */ new Map();
+function recordFarmIslandInferenceDependency(file, island) {
+  const key = path5.resolve(file);
+  let islands = farmIslandInferenceDependents.get(key);
+  if (!islands) farmIslandInferenceDependents.set(key, islands = /* @__PURE__ */ new Set());
+  islands.add(path5.resolve(island));
+}
+var FARM_DEV_CLIENT_BOOT_ID = "/@farm/client-boot.js";
+var FARM_DEV_CLIENT_BOOT_MODULE = 'import { startFarmIslandsBoot } from "@farm.js/core/internal/islands-boot";\nstartFarmIslandsBoot();\n';
 function isFarmClientVirtualId(id) {
   const pathname = id.split("?", 1)[0];
   return pathname === "/@farm/client" || pathname === "/@farm/client.js";
@@ -4387,6 +4431,7 @@ import {
   createFarmDeploymentRequestHeaders,
   isFarmDeploymentMismatchResponse,
 } from '@farm.js/core/deployment'
+${islandValues ? "import { getFarmIslandValueHeaders } from '@farm.js/core/internal/client-runtime'" : ""}
 ${providerClientCode.imports}
 ${clientPluginEntry.imports}
 
@@ -4853,6 +4898,7 @@ class LegacyManifestSPARouter {
 // Initialize the SPA router
 const spaRouter = new SPARouter({
   shouldUseDocumentNavigation: matchesDocumentNavigation,
+  ${islandValues ? "fetchNavigationDocument: fetchFarmNavigationDocument," : ""}
 });
 window.__FARM_SPA_ROUTER__ = spaRouter;
 
@@ -5471,7 +5517,14 @@ function parseNavigationFragment(html) {
   return template.content;
 }
 
-function replaceNavigationBoundary(container, fragment, currentPatterns, nextPatterns, refresh = false) {
+function replaceNavigationBoundary(
+  container,
+  fragment,
+  currentPatterns,
+  nextPatterns,
+  refresh = false,
+  find = findLayoutBoundary,
+) {
   let sharedCount = 0;
   while (
     sharedCount < currentPatterns.length &&
@@ -5482,13 +5535,13 @@ function replaceNavigationBoundary(container, fragment, currentPatterns, nextPat
   }
 
   const fragmentTreeRoot = nextPatterns.length > 0
-    ? findLayoutBoundary(fragment, nextPatterns[0])
+    ? find(fragment, nextPatterns[0])
     : fragment.querySelector('#__farm_page__');
   const currentTarget = sharedCount < currentPatterns.length
-    ? findLayoutBoundary(container, currentPatterns[sharedCount])
+    ? find(container, currentPatterns[sharedCount])
     : container.querySelector('#__farm_page__');
   const nextTarget = sharedCount < nextPatterns.length
-    ? findLayoutBoundary(fragment, nextPatterns[sharedCount])
+    ? find(fragment, nextPatterns[sharedCount])
     : fragment.querySelector('#__farm_page__');
 
   if (!currentTarget || !nextTarget) {
@@ -5519,6 +5572,184 @@ function replaceNavigationBoundary(container, fragment, currentPatterns, nextPat
   return nextTarget;
 }
 
+${islandValues ? `${FARM_NAVIGATION_STREAM_READER_SOURCE}
+
+// Islands mode navigates as the production client does: it fetches the page itself, names the
+// layouts it shows by key (F-Layouts), and asks for flush markers (F-Stream), so the shell arrives
+// before slow Suspense content. Other pages (a client page, a layout that hydrates, route slots)
+// keep the page-data request.
+function farmLayoutIdentity(boundary) {
+  return boundary.getAttribute('data-farm-layout-key') || boundary.getAttribute('data-farm-layout-pattern');
+}
+
+function findLayoutBoundaryByIdentity(root, identity) {
+  const boundaries = root.querySelectorAll
+    ? root.querySelectorAll('[data-farm-layout-boundary="true"]')
+    : [];
+  for (const boundary of boundaries) {
+    if (farmLayoutIdentity(boundary) === identity) return boundary;
+  }
+  return null;
+}
+
+function readLayoutIdentities(root) {
+  return Array.from(root.querySelectorAll ? root.querySelectorAll('[data-farm-layout-boundary="true"]') : [])
+    .map(farmLayoutIdentity)
+    .filter(Boolean);
+}
+
+// A segment response leaves out the layouts the browser said it shows. It fits this page only if
+// the page still shows each of them, at the same depth.
+function fitsFarmSegment(currentRoot, nextRoot) {
+  const nextBoundaries = Array.from(nextRoot.querySelectorAll('[data-farm-layout-boundary="true"]'));
+  const lastKept = nextBoundaries
+    .map((boundary) => boundary.getAttribute('data-farm-layout-kept') === 'true')
+    .lastIndexOf(true);
+  if (lastKept === -1) return true;
+  const current = readLayoutIdentities(currentRoot);
+  for (let index = 0; index <= lastKept; index++) {
+    if (current[index] !== farmLayoutIdentity(nextBoundaries[index])) return false;
+  }
+  return true;
+}
+
+// Each navigation starts a new generation, so a page left while it streams stops adding content.
+let farmNavigationStreamGeneration = 0;
+
+function farmDocumentNavigationRoute(pathname) {
+  const match = findRoute(pathname);
+  if (!match) return null;
+  const route = match.route;
+  if (route.isClientComponent || route.shouldHydrate) return null;
+  if (route.renderPlan && route.renderPlan.hydration !== 'none') return null;
+  const layouts = findLayouts(pathname);
+  if (layouts.some((layout) => layout.shouldHydrate)) return null;
+  const owners = new Set([route.pattern, ...layouts.map((layout) => layout.pattern)]);
+  if ((getManifest().slots || []).some((slot) => owners.has(slot.ownerPattern))) return null;
+  return { ...match, layouts };
+}
+
+async function fetchFarmNavigationDocument(path, context) {
+  farmNavigationStreamGeneration++;
+  const url = new URL(path, window.location.href);
+  const match = farmDocumentNavigationRoute(url.pathname);
+  const container = document.getElementById('root');
+  if (!match || !container) return null;
+  const deploymentId = window.__FARM_DEPLOYMENT_ID__;
+  const request = async (keepLayouts) => {
+    // A refresh renders every layout; so does a page whose layout React owns, which the swap
+    // replaces whole.
+    const identities =
+      keepLayouts && !context.refresh && !activeLayoutShouldHydrate
+        ? readLayoutIdentities(container)
+        : [];
+    const response = await fetch(url.pathname + url.search, {
+      signal: context.signal,
+      redirect: 'manual',
+      headers: createFarmDeploymentRequestHeaders(deploymentId, {
+        Accept: 'text/html',
+        'F-Stream': 'flush',
+        ...getFarmIslandValueHeaders(),
+        ...(identities.length ? { 'F-Layouts': JSON.stringify(identities) } : {}),
+      }),
+    });
+    if (isFarmDeploymentMismatchResponse(response, deploymentId)) {
+      const error = createFarmDeploymentMismatchError(response, deploymentId || 'unknown');
+      window.dispatchEvent(new CustomEvent('farm:deployment-mismatch', { detail: error }));
+      throw error;
+    }
+    // A redirect, an error or anything but HTML: the router loads the document instead.
+    if (
+      !response.ok ||
+      !response.body ||
+      !(response.headers.get('content-type') || '').includes('text/html')
+    ) {
+      throw new Error('Failed to fetch the page: ' + response.status);
+    }
+    const stream = await readFarmNavigationStream(response.body, response.headers.get('F-Flush'));
+    const doc = new DOMParser().parseFromString(stream.shell, 'text/html');
+    return { stream, doc, nextRoot: doc.getElementById('root') };
+  };
+  let result = await request(true);
+  if (result.nextRoot && !fitsFarmSegment(container, result.nextRoot)) {
+    result.stream.cancel?.();
+    result = await request(false);
+  }
+  if (!result.nextRoot) {
+    result.stream.cancel?.();
+    throw new Error('The page has no #root');
+  }
+  const { stream, doc, nextRoot } = result;
+  const description = doc.querySelector('meta[name="description"]')?.getAttribute('content');
+  return {
+    props: { params: match.params },
+    modulePath: match.route.modulePath,
+    isClientComponent: false,
+    pageShouldHydrate: false,
+    layoutShouldHydrate: false,
+    shouldHydrate: false,
+    islandStrategy: 'load',
+    renderPlan: match.route.renderPlan,
+    fragment: {
+      html: nextRoot.innerHTML,
+      layoutPatterns: Array.from(nextRoot.querySelectorAll('[data-farm-layout-boundary="true"]'))
+        .map((boundary) => boundary.getAttribute('data-farm-layout-pattern'))
+        .filter(Boolean),
+    },
+    metadata: { title: doc.title, ...(description ? { description } : {}) },
+    layoutModules: match.layouts.map((layout) => layout.modulePath),
+    farmDocument: { stream: stream.next ? stream : null },
+  };
+}
+
+// Adds the flushes after a streamed navigation's shell, as the production client does: React's
+// staged Suspense content and the scripts that reveal it.${isolatedHydrationEnabled ? " The islands React reveals hydrate as they\n// appear, and the ones it removes (a replaced fallback) are released." : ""}
+async function streamFarmDevNavigation(stream, root, generation) {
+  const isCurrent = () => generation === farmNavigationStreamGeneration && root.isConnected;
+  ${isolatedHydrationEnabled ? `let streaming = true;
+  const removed = new Set();
+  let queued = false;
+  const run = () => {
+    queued = false;
+    if (!isCurrent()) return observer.disconnect();
+    for (const node of removed) if (!node.isConnected) disposeFarmIsolatedClientBoundaries(node);
+    removed.clear();
+    if (!streaming && !root.querySelector('div[hidden][id^="S:"]')) observer.disconnect();
+    hydrateFarmIsolatedClientBoundaries(root).catch((error) => {
+      console.error('[Farm.js] Hydrating streamed islands failed:', error);
+    });
+  };
+  const observer = new MutationObserver((records) => {
+    for (const record of records) for (const node of record.removedNodes) removed.add(node);
+    if (queued) return;
+    queued = true;
+    queueMicrotask(run);
+  });
+  observer.observe(root, { childList: true, subtree: true });` : "const observer = { disconnect() {} };"}
+  try {
+    for (let flush = await stream.next(); flush !== null; flush = await stream.next()) {
+      if (!isCurrent()) {
+        observer.disconnect();
+        return stream.cancel();
+      }
+      const parsed = new DOMParser().parseFromString('<div id="root">' + flush, 'text/html');
+      const fragment = document.createDocumentFragment();
+      for (const node of Array.from(parsed.getElementById('root').childNodes)) fragment.appendChild(node);
+      activateFragmentScripts(fragment);
+      root.appendChild(fragment);
+    }
+  } catch (error) {
+    ${isolatedHydrationEnabled ? "streaming = false;" : ""}
+    if (!isCurrent()) return observer.disconnect();
+    console.error('[Farm.js] A streamed navigation failed:', error);
+    ${isolatedHydrationEnabled ? "farmIsolatedHydrationRuntime.endStream?.(root);\n    if (!queued) run();" : ""}
+    return;
+  }
+  if (!isCurrent()) return observer.disconnect();
+  ${isolatedHydrationEnabled ? "streaming = false;\n  farmIsolatedHydrationRuntime.endStream?.(root);\n  if (!queued) run();" : "observer.disconnect();"}
+}
+` : ""}
+
 let activeLayoutPatterns = readActiveLayoutPatterns();
 let activeLayoutShouldHydrate = window.__FARM_LAYOUT_SHOULD_HYDRATE__ === true;
 
@@ -5528,6 +5759,7 @@ async function renderPage(pageData, info) {
   const container = document.getElementById('root');
   if (!container) return;
   cancelPendingPageHydration();
+  ${islandValues ? "const farmStreamGeneration = ++farmNavigationStreamGeneration;" : ""}
   const destination = window.location.pathname + window.location.search;
 
   if (pageData.interception) {
@@ -5657,7 +5889,7 @@ async function renderPage(pageData, info) {
         if (appRoot) { try { appRoot.unmount(); } catch (error) {} appRoot = null; }
         if (reactRoot) { try { reactRoot.unmount(); } catch (error) {} reactRoot = null; }
         delete window.__FARM_REACT_ROOT__;
-        ${isolatedHydrationEnabled ? "isolatedHydrationScope = replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns, info?.refresh === true) || container;" : "replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns);"}
+        ${isolatedHydrationEnabled ? islandValues ? "isolatedHydrationScope = (pageData.farmDocument ? replaceNavigationBoundary(container, fragment, readLayoutIdentities(container), readLayoutIdentities(fragment), info?.refresh === true, findLayoutBoundaryByIdentity) : replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns, info?.refresh === true)) || container;" : "isolatedHydrationScope = replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns, info?.refresh === true) || container;" : islandValues ? "if (pageData.farmDocument) replaceNavigationBoundary(container, fragment, readLayoutIdentities(container), readLayoutIdentities(fragment), false, findLayoutBoundaryByIdentity); else replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns);" : "replaceNavigationBoundary(container, fragment, activeLayoutPatterns, layoutPatterns);"}
       }
 
       const hydrationController = new AbortController();
@@ -5712,6 +5944,7 @@ async function renderPage(pageData, info) {
     activeLayoutPatterns = layoutPatterns;
     activeLayoutShouldHydrate = layoutShouldHydrate;
     window.__FARM_LOADING_MODULE__ = route.loadingModulePath || null;
+    ${islandValues ? "if (pageData.farmDocument?.stream) void streamFarmDevNavigation(pageData.farmDocument.stream, container, farmStreamGeneration);" : ""}
     return true;
   };
 
@@ -5798,12 +6031,10 @@ function farmIslandsOnlyDocument() {
       (window.__FARM_SHOULD_HYDRATE__ === true || pageShouldHydrate || layoutShouldHydrate);
     const hydratedSlots = await hydrateInitialRouteSlots();
     ${isolatedHydrationEnabled ? `if (hasIsolatedClientBoundaries && !pageShouldHydrate && !layoutShouldHydrate) {
-      const hydrationController = new AbortController();
-      pendingPageHydrationController = hydrationController;
       // Islands mode hydrates the document, as production does, so islx also watches the islands
-      // that stream in after this runs.
-      await hydrateFarmIsolatedClientBoundaries(${islandValues ? "document" : "rootContainer"}, hydrationController.signal);
-      if (hydrationController.signal.aborted) return;
+      // that stream in after this runs. Not cancelled by a navigation: an island it removes is
+      // disposed with its DOM, and one in a layout it keeps still waits for its trigger.
+      await hydrateFarmIsolatedClientBoundaries(${islandValues ? "document" : "rootContainer"});
       // The rest of the document is static server HTML with nothing to hydrate, so
       // stop holding its clicks and submits once the load-strategy islands are live.
       // Deferred islands capture their own interactions, and held targets outside an

package/dist/{chunk-HLWOWZFX.cjs → chunk-JBK7UJOI.cjs}

@@ -1,20 +1,20 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } async function _asyncOptionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunkSJ23LJ3Ncjs = require('./chunk-SJ23LJ3N.cjs');
+var _chunkVVTJTMGQcjs = require('./chunk-VVTJTMGQ.cjs');
 
 
-var _chunkXPMC4E2Gcjs = require('./chunk-XPMC4E2G.cjs');
+var _chunkXVSBALOYcjs = require('./chunk-XVSBALOY.cjs');
 
 
-var _chunkKLNFJDFMcjs = require('./chunk-KLNFJDFM.cjs');
+var _chunkNQJDO7K7cjs = require('./chunk-NQJDO7K7.cjs');
 
 
 
 var _chunk65Y5SIBHcjs = require('./chunk-65Y5SIBH.cjs');
 
 
-var _chunkLNM57D3Hcjs = require('./chunk-LNM57D3H.cjs');
+var _chunkR53QDV6Tcjs = require('./chunk-R53QDV6T.cjs');
 
 
 var _chunkAQLHD6HZcjs = require('./chunk-AQLHD6HZ.cjs');
@@ -54,7 +54,7 @@ function pickImportTarget(entry) {
   return void 0;
 }
 async function importFromApp(root, packageName, subpath = ".") {
-  const packageDir = _chunkSJ23LJ3Ncjs.findFarmAppPackageDir.call(void 0, root, packageName);
+  const packageDir = _chunkVVTJTMGQcjs.findFarmAppPackageDir.call(void 0, root, packageName);
   if (!packageDir) return void 0;
   const manifest = JSON.parse(_fs.readFileSync.call(void 0, _path2.default.join(packageDir, "package.json"), "utf8"));
   const exportsMap = manifest.exports;
@@ -81,9 +81,9 @@ async function createFarmRscViteConfig(userConfig, options) {
     importFromApp(root, "@vitejs/plugin-rsc"),
     importFromApp(root, "@vitejs/plugin-react")
   ]);
-  if (!pluginRsc || !viteRsc || !_chunkSJ23LJ3Ncjs.findFarmAppPackageDir.call(void 0, root, "react-server-dom-webpack")) {
+  if (!pluginRsc || !viteRsc || !_chunkVVTJTMGQcjs.findFarmAppPackageDir.call(void 0, root, "react-server-dom-webpack")) {
     throw new Error(
-      `[Farm.js] experimental.serverComponents runs on @farm.js/plugin and the official @vitejs/plugin-rsc. Install them: ${_chunkSJ23LJ3Ncjs.FARM_RSC_INSTALL_HINT}`
+      `[Farm.js] experimental.serverComponents runs on @farm.js/plugin and the official @vitejs/plugin-rsc. Install them: ${_chunkVVTJTMGQcjs.FARM_RSC_INSTALL_HINT}`
     );
   }
   const { plugins: vitePlugins = [], ...viteOptions } = _nullishCoalesce(userConfig.vite, () => ( {}));
@@ -92,13 +92,16 @@ async function createFarmRscViteConfig(userConfig, options) {
     if (userConfig[key] !== void 0) rscConfig[key] = userConfig[key];
   }
   const createReactPlugin = hasPluginNamed(vitePlugins, "vite:react") ? void 0 : await _asyncNullishCoalesce(await _asyncOptionalChain([viteReact, 'optionalAccess', async _2 => _2.default]), async () => ( (options.command === "serve" ? (await _chunk65Y5SIBHcjs.loadFarmReactPlugin.call(void 0, )).default : void 0)));
-  const tailwind = hasPluginNamed(vitePlugins, "@tailwindcss/vite") ? void 0 : await _chunkLNM57D3Hcjs.loadTailwindVitePlugin.call(void 0, );
+  const tailwind = hasPluginNamed(vitePlugins, "@tailwindcss/vite") ? void 0 : await _chunkR53QDV6Tcjs.loadTailwindVitePlugin.call(void 0, );
+  const platform = _chunkAQLHD6HZcjs.resolveFarmPlatform.call(void 0, );
+  const mobileClient = userConfig.mobile === void 0 || platform === "desktop" ? void 0 : options.command === "build" ? "entry" : platform === "mobile" ? "inline" : void 0;
   const farmConfig = pluginRsc.defineConfig({
     ...rscConfig,
+    ...mobileClient ? { mobileClient } : {},
     experimental: { ...userConfig.experimental, serverComponents: true },
     port: _nullishCoalesce(options.port, () => ( _optionalChain([userConfig, 'access', _3 => _3.server, 'optionalAccess', _4 => _4.port]))),
     plugins: [
-      ...options.command === "serve" && _chunkAQLHD6HZcjs.resolveFarmPlatform.call(void 0, ) === "desktop" ? [
+      ...options.command === "serve" && platform === "desktop" ? [
         _chunk65Y5SIBHcjs.farmDesktopDevGuardPlugin.call(void 0, 
           typeof userConfig.basePath === "string" ? userConfig.basePath : void 0
         )
@@ -111,7 +114,7 @@ async function createFarmRscViteConfig(userConfig, options) {
         server: { environmentName: "rsc" },
         config: {
           preset: options.preset,
-          outputDir: options.outputDir && _chunkKLNFJDFMcjs.resolveDeployOutputPath.call(void 0, root, options.outputDir)
+          outputDir: options.outputDir && _chunkNQJDO7K7cjs.resolveDeployOutputPath.call(void 0, root, options.outputDir)
         }
       })
     ]
@@ -134,7 +137,7 @@ async function createFarmRscDevServer(userConfig, options) {
   const config = await createFarmRscViteConfig(userConfig, { ...configOptions, command: "serve" });
   return createServer({
     ...config,
-    plugins: [..._nullishCoalesce(config.plugins, () => ( [])), _chunkXPMC4E2Gcjs.createFarmDevLoopbackPlugin.call(void 0, )],
+    plugins: [..._nullishCoalesce(config.plugins, () => ( [])), _chunkXVSBALOYcjs.createFarmDevLoopbackPlugin.call(void 0, )],
     ...host === void 0 ? {} : { server: { ...config.server, host } }
   });
 }