@farm.js/core 0.1.60 → 0.1.62

package/dist/{chunk-ILMTRGBG.mjs → chunk-IQIKPKFP.mjs}

@@ -3,14 +3,9 @@ import {
   farmDesktopDevGuardPlugin,
   isFarmReactRefreshActive
 } from "./chunk-QOSDWGKT.mjs";
-import {
-  createFarmServerFnBoundaryModule,
-  isFarmServerFnBoundaryId,
-  transformFarmServerFns
-} from "./chunk-GNZIAJGB.mjs";
 import {
   createFarmImageHandler
-} from "./chunk-ANHZ6SUL.mjs";
+} from "./chunk-3TXKFRSO.mjs";
 import {
   FARM_LAYOUT_ELEMENT_CLIENT_SOURCE,
   FARM_NAVIGATION_STREAM_READER_SOURCE,
@@ -30,6 +25,7 @@ import {
   hasUseClientDirective,
   inferFarmIslandStrategy,
   isFarmDocsClientConfigModule,
+  isFarmPackageClientBoundary,
   isIsolatableClientBoundarySource,
   redactFarmDocsClientConfig,
   resolveDevGlobalStylesheetHref,
@@ -39,8 +35,9 @@ import {
   resolveFarmIsolatedClientHydrationMode,
   resolveFarmRouteRootStrategy,
   resolveModuleSourcePath,
+  rewriteFarmPackageClientImports,
   stripUseClientDirective
-} from "./chunk-ZFUKPWFC.mjs";
+} from "./chunk-2JYBLE63.mjs";
 import {
   loadTailwindVitePlugin
 } from "./chunk-OM7WILES.mjs";
@@ -53,7 +50,7 @@ import {
 import {
   generateFarmTypeArtifacts,
   resolveRouteRenderingConfig
-} from "./chunk-LJVNMGE3.mjs";
+} from "./chunk-BM2LH2JM.mjs";
 import {
   createFarmRouteRenderPlan,
   farmPathGuardCoversEndpoint,
@@ -85,10 +82,15 @@ import {
   resolveFarmMCPRouteLabel,
   resolveFarmMarkdownRouteLabel,
   setFarmRouteLabel
-} from "./chunk-ZMHAFH4R.mjs";
+} from "./chunk-VM7X5CKC.mjs";
 import {
   FARM_DEFAULT_MCP_PATH
 } from "./chunk-UZZ6IEQP.mjs";
+import {
+  createFarmServerFnBoundaryModule,
+  isFarmServerFnBoundaryId,
+  transformFarmServerFns
+} from "./chunk-GNZIAJGB.mjs";
 import {
   resolveFarmLayoutFonts
 } from "./chunk-HZOMT5DY.mjs";
@@ -170,7 +172,7 @@ import {
   getIntegrationDocumentNavigationMatchers,
   getIntegrationProviders,
   matchIntegrationRoute
-} from "./chunk-IFHPDLIS.mjs";
+} from "./chunk-TGULJSHD.mjs";
 import {
   MiddlewareManager
 } from "./chunk-A2MN5PQJ.mjs";
@@ -189,7 +191,7 @@ import {
 } from "./chunk-IYEY3JWJ.mjs";
 import {
   APIRouteManager
-} from "./chunk-BHJAYPYU.mjs";
+} from "./chunk-3UZVPO72.mjs";
 import {
   getFarmI18nClientSnapshot
 } from "./chunk-CV6MFQ4Y.mjs";
@@ -199,7 +201,7 @@ import {
 } from "./chunk-NR63PD3P.mjs";
 import {
   isFarmAPIPathname
-} from "./chunk-RPUJHJHE.mjs";
+} from "./chunk-ZFWYCVKS.mjs";
 import {
   registerFarmMCPServer
 } from "./chunk-C7GJDVN4.mjs";
@@ -247,10 +249,10 @@ import {
   createFarmRequestBodyErrorResponse,
   readNodeRequestBody,
   resolveFarmServerConfig
-} from "./chunk-GFT5AHAT.mjs";
+} from "./chunk-QDWMCFTH.mjs";
 import {
   FARM_VERSION
-} from "./chunk-HPWB57PZ.mjs";
+} from "./chunk-NT3QDN2E.mjs";
 import {
   DEFAULT_FARM_API_BASE_PATH
 } from "./chunk-W6QLRQ3V.mjs";
@@ -322,8 +324,13 @@ var VITE_DEFAULT_FS_DENY = [
   ".yarnrc.yml",
   "**/.git/**"
 ];
+var FARM_DEV_FS_DENY = [
+  "**/.farm/!(client-references)/**",
+  "**/.farm/client-references?*/**",
+  "**/.farm/*"
+];
 function getFarmDevFsDeny(userDeny, options) {
-  const deny = ["**/.farm/**"];
+  const deny = [...FARM_DEV_FS_DENY];
   const root = path2.resolve(options.root || process.cwd());
   const distDir = options.distDir ? path2.resolve(root, options.distDir) : void 0;
   const relativeDistDir = distDir ? path2.relative(root, distDir) : "";
@@ -424,7 +431,7 @@ function isInside(directory, file) {
 
 // src/vite.ts
 import * as fs2 from "fs";
-import * as path5 from "path";
+import * as path6 from "path";
 import { pathToFileURL } from "url";
 
 // src/dev-static.ts
@@ -678,6 +685,52 @@ async function createBlurDataURL(bytes) {
   }
 }
 
+// src/vite.ts
+import { rewriteFormStatusImports } from "@farm.js/islx/compiler";
+
+// src/islands-react-cache-transform.ts
+import path5 from "path";
+import { parseAst } from "rolldown/parseAst";
+var FARM_REACT_CACHE_MODULE = "@farm.js/core/internal/react-cache";
+function rewriteFarmReactCacheImport(code, file) {
+  if (!code.includes("cache") || !code.includes("react")) return null;
+  const extension = path5.extname(file).slice(1);
+  const lang = extension === "ts" || extension === "mts" || extension === "cts" ? "ts" : "tsx";
+  let program;
+  try {
+    program = parseAst(code, { lang });
+  } catch {
+    return null;
+  }
+  let output = code;
+  const declarations = (program.body ?? []).filter(
+    (node) => node.type === "ImportDeclaration" && node.source?.value === "react" && node.importKind !== "type"
+  );
+  let changed = false;
+  for (const node of [...declarations].sort((left, right) => right.start - left.start)) {
+    const specifiers = node.specifiers ?? [];
+    const caches = specifiers.filter(
+      (specifier) => specifier.type === "ImportSpecifier" && specifier.importKind !== "type" && (specifier.imported?.name ?? specifier.imported?.value) === "cache"
+    );
+    if (caches.length === 0) continue;
+    const others = specifiers.filter((specifier) => !caches.includes(specifier));
+    const text = (specifier) => code.slice(specifier.start, specifier.end);
+    const defaults = others.filter((specifier) => specifier.type !== "ImportSpecifier");
+    const named = others.filter((specifier) => specifier.type === "ImportSpecifier");
+    const clause = [
+      ...defaults.map(text),
+      ...named.length > 0 ? [`{ ${named.map(text).join(", ")} }`] : []
+    ].join(", ");
+    const lines = [
+      ...clause ? [`import ${clause} from "react";`] : [],
+      `import { ${caches.map((specifier) => `cache as ${specifier.local.name}`).join(", ")} } from ${JSON.stringify(FARM_REACT_CACHE_MODULE)};`
+    ];
+    output = output.slice(0, node.start) + lines.join("\n") + output.slice(node.end);
+    changed = true;
+  }
+  return changed ? output : null;
+}
+
 // src/navigation/page-data-error.ts
 function resolveFarmPageDataFailure(error) {
   if (isFarmNotFoundError(error)) {
@@ -771,7 +824,7 @@ function loadFarmWorkflowsDevRuntime() {
   return import("./workflows.mjs");
 }
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-KQZ6SRCJ.mjs");
+  return import("./devtools-NUVXYG7I.mjs");
 }
 function loadFarmDevtoolsUIRuntime() {
   return import("./devtools-ui-CYBVFLPH.mjs");
@@ -796,6 +849,8 @@ function farmI18nClientBridgePlugin() {
   };
 }
 var FARM_SERVER_ONLY_ENTRIES = /* @__PURE__ */ new Set(["@farm.js/core/og"]);
+var SERVER_ONLY_PACKAGE = "server-only";
+var FARM_SERVER_ONLY_PACKAGE_ID = "\0farm:server-only";
 var FARM_PLATFORM_ENTRY = "@farm.js/core/platform";
 var FARM_PLATFORM_CLIENT_ID = "\0farm:platform-client";
 function createFarmPlatformClientModule(platform) {
@@ -813,7 +868,9 @@ function farmServerOnlyEntriesPlugin(options = {}) {
     enforce: "pre",
     config() {
       return {
-        optimizeDeps: { rolldownOptions: { plugins: [farmBrowserBuiltinsOptimizerPlugin()] } }
+        optimizeDeps: { rolldownOptions: { plugins: [farmBrowserBuiltinsOptimizerPlugin()] } },
+        // Resolve `server-only` here rather than in Node, which would load its throwing build.
+        ssr: { noExternal: [SERVER_ONLY_PACKAGE] }
       };
     },
     configResolved(config) {
@@ -821,6 +878,14 @@ function farmServerOnlyEntriesPlugin(options = {}) {
     },
     resolveId(id, importer, options2) {
       if (id === FARM_PLATFORM_ENTRY) return options2?.ssr ? null : FARM_PLATFORM_CLIENT_ID;
+      if (id === SERVER_ONLY_PACKAGE) {
+        if (options2?.ssr || options2?.scan) {
+          return FARM_SERVER_ONLY_PACKAGE_ID;
+        }
+        this.error(
+          `${importer ?? "A module"} imports "server-only", so it must not reach the browser, but client code imports it. Move what the client needs out of that module, or call it from a server component, server function or API route.`
+        );
+      }
       if (!options2?.ssr && isBuiltin(id)) {
         return resolveFarmBrowserBuiltin(this, id, importer, options2);
       }
@@ -840,6 +905,7 @@ function farmServerOnlyEntriesPlugin(options = {}) {
       return null;
     },
     load(id) {
+      if (id === FARM_SERVER_ONLY_PACKAGE_ID) return "export {};";
       if (id === FARM_PLATFORM_CLIENT_ID) {
         return createFarmPlatformClientModule(options.platform ?? resolveFarmPlatform());
       }
@@ -1205,7 +1271,7 @@ function fileContainsProgrammaticPageRoute(file) {
 }
 function rewriteEarlySsrRelativeImports(options) {
   const cleanId = options.id.split("?", 1)[0];
-  if (!path5.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
+  if (!path6.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
     return null;
   }
   const replacements = [];
@@ -1225,7 +1291,7 @@ function rewriteEarlySsrRelativeImports(options) {
     const suffixIndex = source.value.search(/[?#]/);
     const sourcePath = suffixIndex === -1 ? source.value : source.value.slice(0, suffixIndex);
     const suffix = suffixIndex === -1 ? "" : source.value.slice(suffixIndex);
-    const resolvedPath = path5.resolve(path5.dirname(cleanId), sourcePath);
+    const resolvedPath = path6.resolve(path6.dirname(cleanId), sourcePath);
     const moduleId = toViteModuleId(resolvedPath, options.root);
     const specifier = moduleId.startsWith("/@fs/") ? toPosixPath(resolvedPath) : moduleId;
     replacements.push({
@@ -1242,6 +1308,19 @@ function rewriteEarlySsrRelativeImports(options) {
   return output;
 }
 function transformIsolatedClientBoundaryModule(options) {
+  if (options.slots) {
+    try {
+      const rewritten = rewriteFormStatusImports({
+        code: options.code,
+        id: options.moduleReference,
+        parse: options.parse,
+        from: "@farm.js/core/internal/islx-react"
+      });
+      if (rewritten) options = { ...options, code: rewritten.code };
+    } catch {
+      return null;
+    }
+  }
   let ast;
   try {
     ast = options.parse(options.code);
@@ -1465,7 +1544,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         },
         server: {
           fs: {
-            ...layerRoots.length ? { allow: [path5.resolve(options.root || process.cwd()), ...layerRoots] } : {},
+            ...layerRoots.length ? { allow: [path6.resolve(options.root || process.cwd()), ...layerRoots] } : {},
             deny: getFarmDevFsDeny(userConfig.server?.fs?.deny, options)
           }
         }
@@ -1554,7 +1633,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         });
       }
       const sourceRoots = getFarmSourceRoots(farmConfig);
-      server.watcher.add(sourceRoots.map((source) => path5.join(source.root, source.srcDir)));
+      server.watcher.add(sourceRoots.map((source) => path6.join(source.root, source.srcDir)));
       if (farmConfig.i18n.enabled) {
         server.watcher.add(
           farmConfig.i18n.locales.map(
@@ -1569,7 +1648,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         ...farmDocsDevRuntime?.getFarmDocsRouteTypeEntries(farmConfig.docs) ?? []
       ];
       const appDirSlugs = sourceRoots.map(
-        (source) => path5.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
+        (source) => path6.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
       );
       const generateTypeArtifacts = async (reason, selection = ALL_TYPE_ARTIFACTS, log = false) => {
         try {
@@ -1610,7 +1689,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       };
       await generateTypeArtifacts("startup");
       const srcDirSlugs = sourceRoots.map(
-        (source) => path5.join(source.root, source.srcDir).replace(/\\/g, "/")
+        (source) => path6.join(source.root, source.srcDir).replace(/\\/g, "/")
       );
       const layerConfigFiles = new Set(
         farmConfig.layers.map((layer) => layer.configFile?.replace(/\\/g, "/")).filter((file) => Boolean(file))
@@ -1741,6 +1820,17 @@ function farmPlugin(options = {}, initialPluginManager) {
         });
       }
       const dispatchToDevServer = createFarmDevServerDispatch(server);
+      if (options.mobileClient) {
+        const { FARM_DEV_SERVER_MODULE_LOADER } = await import("./internal/native-server-fns.mjs");
+        const load = (file) => loadFarmDevModule(server, file);
+        globalThis[FARM_DEV_SERVER_MODULE_LOADER] = load;
+        server.httpServer?.once("close", () => {
+          const globals = globalThis;
+          if (globals[FARM_DEV_SERVER_MODULE_LOADER] === load) {
+            delete globals[FARM_DEV_SERVER_MODULE_LOADER];
+          }
+        });
+      }
       apiRouteManager = new APIRouteManager(appDirs, server, {
         plugins: farmConfig.plugins,
         i18n: farmApp.getI18nRuntime(),
@@ -1758,7 +1848,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       farmApp.getServerRenderer().setAPIRouteLookup((routePath) => apiRouteManager.getRoutes().has(routePath));
       let discoveredWorkflows = [];
       const hasWorkflowDirectory = workflowConfig.enabled && workflowConfig.dirs.some(
-        (dir) => fs2.existsSync(path5.isAbsolute(dir) ? dir : path5.join(farmConfig.root, dir))
+        (dir) => fs2.existsSync(path6.isAbsolute(dir) ? dir : path6.join(farmConfig.root, dir))
       );
       if (hasWorkflowDirectory) {
         const { createFarmWorkflowRequestHandler, discoverFarmWorkflows } = await loadFarmWorkflowsDevRuntime();
@@ -2257,12 +2347,12 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                   }),
                   defaultMCP: () => farmApp.getServerRenderer().getDefaultMCPServer(),
                   // A guard written for an MCP server's path keeps its tools out of the public view.
-                  guardCoversPath: (path6) => farmPathGuardCoversEndpoint(
+                  guardCoversPath: (path7) => farmPathGuardCoversEndpoint(
                     {
                       config: farmConfig,
                       middlewareRoutes: middlewareManager.getMiddlewares().filter((entry) => entry.source !== "config")
                     },
-                    path6,
+                    path7,
                     apiServerBasePath
                   )
                 }
@@ -2341,7 +2431,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-VWNW2MQ2.mjs");
+            const { createFarmNativeTreeResponse } = await import("./native-tree-AS5L3ID3.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.
@@ -3528,6 +3618,28 @@ export const manifest = getManifest();
     },
     async transform(code, id, transformOptions) {
       const actionConfig = farmApp?.getConfig() ?? options;
+      let rewrotePackageImports = false;
+      if (resolveFarmServerComponentsMode(actionConfig.experimental?.serverComponents) === "islands" && !id.includes("/node_modules/") && !id.startsWith("\0") && /\.[cm]?[jt]sx?(?:$|\?)/.test(id) && !hasUseClientDirective(code)) {
+        const file = id.split("?", 1)[0];
+        const projectRoot = actionConfig.root || server?.config.root || process.cwd();
+        const referenced = rewriteFarmPackageClientImports({
+          code,
+          file,
+          root: projectRoot,
+          isClientPackage: (specifier) => isFarmPackageClientBoundary(file, specifier, projectRoot)
+        });
+        if (referenced !== null) {
+          code = referenced;
+          rewrotePackageImports = true;
+        }
+        if (transformOptions?.ssr === true) {
+          const cached = rewriteFarmReactCacheImport(code, file);
+          if (cached !== null) {
+            code = cached;
+            rewrotePackageImports = true;
+          }
+        }
+      }
       if (islandsServerFns() && !isFarmServerFnBoundaryId(id) && !id.includes("/node_modules/") && /\.[cm]?[jt]sx?(?:$|\?)/.test(id)) {
         const serverFns = transformFarmServerFns(code, id, {
           environment: transformOptions?.ssr === true ? "rsc" : "client"
@@ -3573,7 +3685,7 @@ export const manifest = getManifest();
         if (imageModule) return imageModule;
       }
       let transformedCode = code;
-      let transformed = false;
+      let transformed = rewrotePackageImports;
       if (typeof fontImports.transform === "function") {
         const fontResult = await fontImports.transform.call(
           this,
@@ -3612,7 +3724,7 @@ export const manifest = getManifest();
         const root = currentConfig.root || server?.config.root || process.cwd();
         const cleanId = id.split("?", 1)[0];
         const selectedIsolatedModules = options.isolatedClientBoundaryModules ?? farmApp?.getRouteManager().getIsolatedClientBoundaryModules(root);
-        const selectedForIsolatedHydration = selectedIsolatedModules?.has(path5.resolve(cleanId)) === true;
+        const selectedForIsolatedHydration = selectedIsolatedModules?.has(path6.resolve(cleanId)) === true;
         if (isReactRenderer(resolveFarmRenderer(currentConfig.renderer)) && selectedForIsolatedHydration && isIsolatableClientBoundarySource(clientBoundarySource)) {
           isolatedModuleReference = toViteModuleId(cleanId, root);
           const islandsMode = resolveFarmServerComponentsMode(currentConfig.experimental?.serverComponents) === "islands";
@@ -3620,7 +3732,7 @@ export const manifest = getManifest();
           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);
+              if (file !== path6.resolve(cleanId)) this.addWatchFile(file);
               recordFarmIslandInferenceDependency(file, cleanId);
             }
           }
@@ -3715,8 +3827,8 @@ if (import.meta.hot) {
         }
         logger.info(`Found ${ssgPages.length} SSG pages, ${ssrRoutes.length} SSR routes`);
         logger.info("Pre-rendering SSG pages...");
-        const outDir = path5.join(server?.config.root || process.cwd(), options.outDir || "dist");
-        const clientDir = path5.join(outDir, "client");
+        const outDir = path6.join(server?.config.root || process.cwd(), options.outDir || "dist");
+        const clientDir = path6.join(outDir, "client");
         for (const page of ssgPages) {
           try {
             const staticRequest = new Request(new URL(page.urlPath, "http://farm.static"));
@@ -3768,8 +3880,8 @@ if (import.meta.hot) {
   <script type="module" src="/assets/client.js"></script>
 </body>
 </html>`;
-              const outputPath = page.urlPath === "/" ? path5.join(clientDir, "index.html") : path5.join(clientDir, page.urlPath + ".html");
-              fs2.mkdirSync(path5.dirname(outputPath), { recursive: true });
+              const outputPath = page.urlPath === "/" ? path6.join(clientDir, "index.html") : path6.join(clientDir, page.urlPath + ".html");
+              fs2.mkdirSync(path6.dirname(outputPath), { recursive: true });
               fs2.writeFileSync(outputPath, fullHtml);
               const revalidateInfo = page.revalidate ? ` (revalidate: ${page.revalidate}s)` : "";
               logger.success(`  \u2713 ${page.urlPath}${revalidateInfo}`);
@@ -3778,7 +3890,7 @@ if (import.meta.hot) {
             logger.error(`  \u2717 ${page.urlPath}: ${error}`);
           }
         }
-        const manifestPath = path5.join(outDir, "__ssg_manifest.json");
+        const manifestPath = path6.join(outDir, "__ssg_manifest.json");
         fs2.writeFileSync(
           manifestPath,
           JSON.stringify(
@@ -3812,8 +3924,8 @@ if (import.meta.hot) {
           });
         }
       }
-      for (const island of farmIslandInferenceDependents.get(path5.resolve(file)) ?? []) {
-        if (island === path5.resolve(file)) continue;
+      for (const island of farmIslandInferenceDependents.get(path6.resolve(file)) ?? []) {
+        if (island === path6.resolve(file)) continue;
         for (const mod of server2.moduleGraph.getModulesByFile(toPosixPath(island)) ?? []) {
           server2.moduleGraph.invalidateModule(mod);
         }
@@ -3828,9 +3940,9 @@ if (import.meta.hot) {
         server2.ws.send({ type: "full-reload", path: "*" });
         return [];
       }
-      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path5.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
+      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path6.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
       if (currentSrcRoot && normalizedFile.startsWith(`${currentSrcRoot}/`) && isProgrammaticRoutesFileName(normalizedFile)) {
-        logUpdate("PAGE", `updated ${path5.basename(file)}`);
+        logUpdate("PAGE", `updated ${path6.basename(file)}`);
         for (const mod of modules) {
           server2.moduleGraph.invalidateModule(mod);
         }
@@ -3961,10 +4073,10 @@ function createPageDataMiddlewareRequest(req, target) {
 }
 function resolveDevelopmentRoot(farmRoot, viteRoot) {
   if (!farmRoot) return viteRoot;
-  if (path5.resolve(farmRoot) === path5.resolve(viteRoot)) return farmRoot;
+  if (path6.resolve(farmRoot) === path6.resolve(viteRoot)) return farmRoot;
   try {
     if (fs2.realpathSync(farmRoot) === fs2.realpathSync(viteRoot)) {
-      return path5.resolve(viteRoot);
+      return path6.resolve(viteRoot);
     }
   } catch {
   }
@@ -3972,10 +4084,10 @@ function resolveDevelopmentRoot(farmRoot, viteRoot) {
 }
 var farmIslandInferenceDependents = /* @__PURE__ */ new Map();
 function recordFarmIslandInferenceDependency(file, island) {
-  const key = path5.resolve(file);
+  const key = path6.resolve(file);
   let islands = farmIslandInferenceDependents.get(key);
   if (!islands) farmIslandInferenceDependents.set(key, islands = /* @__PURE__ */ new Set());
-  islands.add(path5.resolve(island));
+  islands.add(path6.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';
@@ -6255,7 +6367,7 @@ function generateClientManifest(bundle) {
 }
 async function defineConfig(config = {}) {
   const tailwindVitePlugin = await loadTailwindVitePlugin();
-  const appRoot = path5.resolve(config.root || process.cwd());
+  const appRoot = path6.resolve(config.root || process.cwd());
   if (config.extends?.length) {
     const { config: layeredConfig } = await import("./layers-T55SA47E.mjs").then(
       ({ resolveFarmLayers }) => resolveFarmLayers(config, {

package/dist/{chunk-5JNUYGNF.cjs → chunk-IWRLV46X.cjs}

@@ -21,7 +21,7 @@ var _chunk6JHZPB52cjs = require('./chunk-6JHZPB52.cjs');
 var _chunkLT4VAF5Zcjs = require('./chunk-LT4VAF5Z.cjs');
 
 
-var _chunkLIFUPCXWcjs = require('./chunk-LIFUPCXW.cjs');
+var _chunkCFG4QERRcjs = require('./chunk-CFG4QERR.cjs');
 
 // src/docs/handler.ts
 
@@ -1890,7 +1890,7 @@ function createFarmDocsHandler(docs, options) {
         ETag: etag,
         "X-Content-Type-Options": "nosniff"
       });
-      if (_chunkLIFUPCXWcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), etag)) {
+      if (_chunkCFG4QERRcjs.matchesFarmIfNoneMatch.call(void 0, request.headers.get("if-none-match"), etag)) {
         return new Response(null, { status: 304, headers });
       }
       if (request.method === "HEAD") return new Response(null, { status: 200, headers });

package/dist/{chunk-KPOMS5RO.cjs → chunk-J3GFOQOL.cjs}

@@ -1,6 +1,6 @@
 "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 _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return 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; }
 
-var _chunk3YMLUNL2cjs = require('./chunk-3YMLUNL2.cjs');
+var _chunkSVXOCTQ2cjs = require('./chunk-SVXOCTQ2.cjs');
 
 
 
@@ -43,7 +43,7 @@ function scanFarmMobileAppModules(options) {
     specs.push({ name: match[2], file });
   }
   const android = entries.filter((entry) => entry.endsWith(".kt")).map((entry) => path.join(dir, entry));
-  const ios = entries.filter((entry) => entry.endsWith(".swift")).map((entry) => path.join(dir, entry));
+  const ios = entries.filter((entry) => /\.(?:mm|m|h|swift)$/.test(entry)).map((entry) => path.join(dir, entry));
   if (specs.length === 0 && android.length === 0 && ios.length === 0) return void 0;
   return { dir, specs, android, ios };
 }
@@ -198,7 +198,7 @@ function readFarmMobileWebModules(appModules, modules, options) {
     const where = `modules[${JSON.stringify(spec.name)}].web`;
     let web;
     try {
-      web = _chunk3YMLUNL2cjs.readFarmNativeWebSpec.call(void 0, { root: options.root, file: spec.file });
+      web = _chunkSVXOCTQ2cjs.readFarmNativeWebSpec.call(void 0, { root: options.root, file: spec.file });
     } catch (error) {
       issues.push(`${where}: ${error.message}`);
       return spec;

package/dist/{chunk-NHD7BAKD.mjs → chunk-JCEFKP5M.mjs}

@@ -926,17 +926,50 @@ function splitFarmCssDeclarations(css) {
   push(css.length);
   return out;
 }
-function resolveFarmNativeInlineStyle(css) {
+function substituteFarmNativeVars(value, vars, depth = 0) {
+  if (!value.includes("var(")) return value;
+  if (depth > 8) return void 0;
+  let missing = false;
+  const replaced = value.replace(
+    /var\(\s*(--[\w-]+)\s*(?:,\s*([^()]*(?:\([^()]*\))?[^()]*))?\)/g,
+    (_, name, fallback) => {
+      const resolved = vars[name] ?? fallback?.trim();
+      if (resolved === void 0) {
+        missing = true;
+        return "";
+      }
+      return resolved;
+    }
+  );
+  return missing ? void 0 : substituteFarmNativeVars(replaced, vars, depth + 1);
+}
+function resolveFarmNativeInlineStyle(css, vars = {
+  light: {},
+  dark: {}
+}) {
   const style = {};
+  const dark = {};
   const unsupported = [];
+  const themes = [
+    [style, vars.light],
+    [dark, { ...vars.light, ...vars.dark }]
+  ];
   for (const [property, raw] of splitFarmCssDeclarations(css)) {
-    const value = raw.toLowerCase();
     if (!property) continue;
-    const resolved = resolveFarmNativeDeclaration(property, value);
-    if (resolved) Object.assign(style, resolved);
-    else if (resolved === void 0) unsupported.push(`${property}: ${value}`);
+    for (const [target, themeVars] of themes) {
+      const value = substituteFarmNativeVars(raw, themeVars)?.toLowerCase();
+      const resolved = value === void 0 ? void 0 : resolveFarmNativeDeclaration(property, value);
+      if (resolved === void 0) {
+        unsupported.push(`${property}: ${raw.toLowerCase()}`);
+        break;
+      }
+      if (resolved) Object.assign(target, resolved);
+    }
+  }
+  for (const key of Object.keys(dark)) {
+    if (dark[key] === style[key]) delete dark[key];
   }
-  return { style, unsupported };
+  return { style, dark, unsupported };
 }
 function oklchToHex(value) {
   const match = /^oklch\(\s*([\d.]+)(%?)\s+([\d.]+)\s+([\d.]+|none)(?:deg)?\s*(?:\/\s*([\d.]+)(%?))?\s*\)$/.exec(
@@ -1302,23 +1335,6 @@ function matches(selector, element) {
   };
   return step(0, element);
 }
-function substitute(value, vars, depth = 0) {
-  if (!value.includes("var(")) return value;
-  if (depth > 8) return void 0;
-  let missing = false;
-  const replaced = value.replace(
-    /var\(\s*(--[\w-]+)\s*(?:,\s*([^()]*(?:\([^()]*\))?[^()]*))?\)/g,
-    (_, name, fallback) => {
-      const resolved = vars[name] ?? fallback?.trim();
-      if (resolved === void 0) {
-        missing = true;
-        return "";
-      }
-      return resolved;
-    }
-  );
-  return missing ? void 0 : substitute(replaced, vars, depth + 1);
-}
 function cascadeFarmNativeStylesheets(sheets, element) {
   const style = {};
   const dark = {};
@@ -1342,7 +1358,7 @@ function cascadeFarmNativeStylesheets(sheets, element) {
       const themes = rule.dark ? [dark] : [style, dark];
       for (const target of themes) {
         const vars = target === dark ? { ...sheet.vars.light, ...sheet.vars.dark } : sheet.vars.light;
-        const value = substitute(raw, vars);
+        const value = substituteFarmNativeVars(raw, vars);
         const resolved = value === void 0 ? void 0 : resolveFarmNativeDeclaration(property, value.toLowerCase().trim());
         if (resolved === void 0) {
           const message = `${property}: ${raw}`;
@@ -1369,7 +1385,7 @@ function inspectFarmNativeStylesheets(sheets, target) {
       styled = true;
       for (const [property, raw] of rule.declarations) {
         for (const vars of [sheet.vars.light, { ...sheet.vars.light, ...sheet.vars.dark }]) {
-          const value = substitute(raw, vars);
+          const value = substituteFarmNativeVars(raw, vars);
           if (value === void 0 || resolveFarmNativeDeclaration(property, value.toLowerCase().trim()) === void 0) {
             const message = `"${rule.text} { ${property}: ${raw} }" has no native-tier style`;
             if (!problems.includes(message)) problems.push(message);