@farm.js/core 0.1.26 → 0.1.27

package/dist/server.d.mts

@@ -1,14 +1,13 @@
-export { F as FarmApp, R as RouteManager, S as ServerRenderer, c as createFarmApp } from './app-29vG5tmY.mjs';
-import { G as FarmConfig } from './client-plugins-B8RPJnot.mjs';
-export { K as AppRoutePattern, ab as BuildOptions, a3 as ErrorBoundary, Y as ErrorProps, m as FarmAppContext, J as FarmComponentType, B as FarmContextFactory, V as FarmContextFactoryInput, W as FarmIsolatedClientHydrationMode, ag as FarmLayerEntry, ak as FarmLayerResolution, Q as FarmMigrationCommand, S as FarmMigrationsConfig, T as FarmMigrationsUserConfig, e as FarmRequest, f as FarmResponse, ai as FarmSourceRoot, a7 as GenerateStaticParams, a1 as Layout, $ as LayoutMetadataProps, a8 as LayoutModule, L as LayoutProps, a2 as Loading, X as LoadingProps, M as Metadata, a9 as MetadataJsonLd, _ as MetadataProps, af as MetadataRobots, ae as MetadataRobotsDirectives, C as MiddlewareProps, O as NitroPreset, a0 as Page, o as PageProps, Z as PagePropsWithMiddleware, N as PageRouteParams, P as ParsedRoute, q as PluginContextProps, aj as ResolveFarmLayersOptions, ah as ResolvedFarmLayer, U as ResolvedFarmMigrationsConfig, s as RouteModule, R as RouteSegment, ad as SSGCollectionResult, ac as SSGPage, aa as ServerAction, a5 as StaticPathParams, a4 as StaticPathPrimitive, a6 as StaticRouteParams, ap as createFarmConfigResolutionPlugin, I as defineConfig, H as farmPlugin, an as getFarmAppDirectories, ao as getFarmLayerAliases, am as getFarmSourceRoots, aq as loadFarmConfigFile, al as resolveFarmLayers } from './client-plugins-B8RPJnot.mjs';
-export { g as fileExists, h as globFiles, l as logger, m as matchRoute, b as matchRouteParts, c as matchRoutePrefix, d as matchRoutePrefixParts, p as parseRoutePath, i as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, a as splitRoutePath, e as toPosixPath, t as toRootRelativeUrlPath, f as toViteModuleId } from './utils-CS3ZLnEJ.mjs';
+export { F as FarmApp, R as RouteManager, S as ServerRenderer, c as createFarmApp } from './app-BfzZdjgX.mjs';
+import { J as FarmConfig, C as FarmUserConfig } from './client-plugins-1GS4zubE.mjs';
+export { Q as AppRoutePattern, ae as BuildOptions, a6 as ErrorBoundary, $ as ErrorProps, m as FarmAppContext, O as FarmComponentType, E as FarmContextFactory, Y as FarmContextFactoryInput, Z as FarmIsolatedClientHydrationMode, aj as FarmLayerEntry, an as FarmLayerResolution, U as FarmMigrationCommand, V as FarmMigrationsConfig, W as FarmMigrationsUserConfig, e as FarmRequest, f as FarmResponse, al as FarmSourceRoot, aa as GenerateStaticParams, a4 as Layout, a2 as LayoutMetadataProps, ab as LayoutModule, L as LayoutProps, a5 as Loading, _ as LoadingProps, M as Metadata, ac as MetadataJsonLd, a1 as MetadataProps, ai as MetadataRobots, ah as MetadataRobotsDirectives, G as MiddlewareProps, T as NitroPreset, a3 as Page, o as PageProps, a0 as PagePropsWithMiddleware, S as PageRouteParams, P as ParsedRoute, q as PluginContextProps, am as ResolveFarmLayersOptions, ak as ResolvedFarmLayer, X as ResolvedFarmMigrationsConfig, s as RouteModule, R as RouteSegment, ag as SSGCollectionResult, af as SSGPage, ad as ServerAction, a8 as StaticPathParams, a7 as StaticPathPrimitive, a9 as StaticRouteParams, as as createFarmConfigResolutionPlugin, N as defineConfig, K as farmPlugin, aq as getFarmAppDirectories, ar as getFarmLayerAliases, ap as getFarmSourceRoots, at as loadFarmConfigFile, ao as resolveFarmLayers } from './client-plugins-1GS4zubE.mjs';
+export { g as fileExists, h as globFiles, l as logger, m as matchRoute, b as matchRouteParts, c as matchRoutePrefix, d as matchRoutePrefixParts, p as parseRoutePath, i as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, a as splitRoutePath, e as toPosixPath, t as toRootRelativeUrlPath, f as toViteModuleId } from './utils-B_Rmr0-n.mjs';
 export { createFarmStorage, createStorageClient, databaseStorage, defineStorageClient, disposeStorage, driverStorage, getStorage, initStorage, libsqlStorage, localStorage, memoryStorage, mongodbStorage, mysql2Storage, mysqlStorage, netlifyBlobsStorage, pgStorage, pgliteStorage, planetscaleStorage, postgresStorage, redisStorage, resolveStorageRuntimeClient, s3Storage, sqliteStorage, upstashStorage, vercelBlobStorage, vercelKVStorage } from './storage.mjs';
 export { CacheKeyFactory, DefinedCacheKey, FarmCacheAdapter, FarmCacheEntry, FarmCacheInvalidationStreamOptions, FarmCacheInvalidationTarget, FarmCacheOptions, FarmCacheSetOptions, FarmCacheStorage, FarmCacheUserConfig, FarmClientCacheUserConfig, FarmDataCache, GetFarmCacheEntryOptions, InferCacheKeyData, RevalidateTagProfile, RouteDataCacheKey, StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, applyFarmCacheInvalidations, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag } from './cache.mjs';
 export { AfterCallback, FarmAfterPlatformContext, _runWithAfterNodeResponse, _runWithAfterRequest, _withAfterNodeMiddleware, after } from './after.mjs';
 export { FARM_SERVER_QUERY_SYMBOL, ServerQuery, ServerQueryKey, ServerQueryOptions, ServerQueryOutputOptions, ServerQueryStaleTime, createServerQuery } from './server-query.mjs';
 import { ViteDevServer } from 'vite';
-import './types-Z0aotQ8w.mjs';
-export { g as getCurrentRequest } from './request-CrBCcPZZ.mjs';
+export { g as getCurrentRequest } from './request-DlLVBKe3.mjs';
 import { ServerResponse } from 'node:http';
 export { getTheme, getThemeSnapshot } from './theme/server.mjs';
 export { DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT, FarmServerActionsConfig, PreparedServerActionRequest, ResolvedFarmServerActionsConfig, SanitizedServerActionError, ServerActionRequestError, ServerActionRequestKind, createServerActionRequestErrorResponse, getServerActionExecutionContext, getServerActionInvalidations, getServerActionSignal, prepareServerActionRequest, resolveServerActionsConfig, runWithServerActionRequest, sanitizeServerActionError, validateServerActionRequest } from './server-action-security.mjs';
@@ -18,7 +17,6 @@ export { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage, StorageMeta,
 export { ConnectorName, ConnectorOptions, Database } from 'db0';
 import './types-DFbjpjXX.mjs';
 import '@farming-labs/docs';
-import './markdown.mjs';
 import './workflows-CR9ex-gz.mjs';
 import './cron.mjs';
 import './image-config-Duob7wER.mjs';
@@ -26,14 +24,14 @@ import './routes.mjs';
 import 'react';
 import './server-fn.mjs';
 import './server-fn-error-DDh14a0V.mjs';
-import './endpoint-DAc96i93.mjs';
+import './endpoint-CCHFqyTE.mjs';
 import './renderer.mjs';
 import './deployment.mjs';
 import './lifecycle-DK06VuKP.mjs';
-import './route-B0XrsrFk.mjs';
+import './integration-api-0y4FXJpC.mjs';
 import 'http';
+import './types-Z0aotQ8w.mjs';
 import './schema.mjs';
-import './integration-api-BbaiokCC.mjs';
 import '@farming-labs/orm';
 import './observability-BupkiN0m.mjs';
 import '@opentelemetry/api';
@@ -43,8 +41,8 @@ import 'rolldown';
 import './types-DQnyD3VD.mjs';
 import './font.mjs';
 import './island-CfGru1MO.mjs';
-import './metadata-C3na4CBj.mjs';
-import './render-plan-CKAJg0jC.mjs';
+import './metadata-B9mCxKgp.mjs';
+import './render-plan-CtQB-zHS.mjs';
 import './runtime-AOJge4vQ.mjs';
 import './resolver-DhW0CqZN.mjs';
 
@@ -52,13 +50,13 @@ declare const DEFAULT_FARM_DEV_SERVER_PORT = 3000;
 /**
  * Create a Vite development server with Farm.js integration
  */
-declare function createServer(config?: FarmConfig, options?: {
+declare function createServer(config?: FarmConfig | FarmUserConfig, options?: {
     port?: number;
 }): Promise<ViteDevServer>;
 /**
  * Start the development server
  */
-declare function startDevServer(config?: FarmConfig, port?: number): Promise<ViteDevServer>;
+declare function startDevServer(config?: FarmConfig | FarmUserConfig, port?: number): Promise<ViteDevServer>;
 
 declare function sendWebResponse(res: ServerResponse, response: Response): Promise<void>;
 

package/dist/server.d.ts

@@ -1,14 +1,13 @@
-export { F as FarmApp, R as RouteManager, S as ServerRenderer, c as createFarmApp } from './app-Cx71s_PT.js';
-import { G as FarmConfig } from './client-plugins-bPBf4haK.js';
-export { K as AppRoutePattern, ab as BuildOptions, a3 as ErrorBoundary, Y as ErrorProps, m as FarmAppContext, J as FarmComponentType, B as FarmContextFactory, V as FarmContextFactoryInput, W as FarmIsolatedClientHydrationMode, ag as FarmLayerEntry, ak as FarmLayerResolution, Q as FarmMigrationCommand, S as FarmMigrationsConfig, T as FarmMigrationsUserConfig, e as FarmRequest, f as FarmResponse, ai as FarmSourceRoot, a7 as GenerateStaticParams, a1 as Layout, $ as LayoutMetadataProps, a8 as LayoutModule, L as LayoutProps, a2 as Loading, X as LoadingProps, M as Metadata, a9 as MetadataJsonLd, _ as MetadataProps, af as MetadataRobots, ae as MetadataRobotsDirectives, C as MiddlewareProps, O as NitroPreset, a0 as Page, o as PageProps, Z as PagePropsWithMiddleware, N as PageRouteParams, P as ParsedRoute, q as PluginContextProps, aj as ResolveFarmLayersOptions, ah as ResolvedFarmLayer, U as ResolvedFarmMigrationsConfig, s as RouteModule, R as RouteSegment, ad as SSGCollectionResult, ac as SSGPage, aa as ServerAction, a5 as StaticPathParams, a4 as StaticPathPrimitive, a6 as StaticRouteParams, ap as createFarmConfigResolutionPlugin, I as defineConfig, H as farmPlugin, an as getFarmAppDirectories, ao as getFarmLayerAliases, am as getFarmSourceRoots, aq as loadFarmConfigFile, al as resolveFarmLayers } from './client-plugins-bPBf4haK.js';
-export { g as fileExists, h as globFiles, l as logger, m as matchRoute, b as matchRouteParts, c as matchRoutePrefix, d as matchRoutePrefixParts, p as parseRoutePath, i as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, a as splitRoutePath, e as toPosixPath, t as toRootRelativeUrlPath, f as toViteModuleId } from './utils-D3rdsIvM.js';
+export { F as FarmApp, R as RouteManager, S as ServerRenderer, c as createFarmApp } from './app-CXK7Prrt.js';
+import { J as FarmConfig, C as FarmUserConfig } from './client-plugins-B1Za6F5x.js';
+export { Q as AppRoutePattern, ae as BuildOptions, a6 as ErrorBoundary, $ as ErrorProps, m as FarmAppContext, O as FarmComponentType, E as FarmContextFactory, Y as FarmContextFactoryInput, Z as FarmIsolatedClientHydrationMode, aj as FarmLayerEntry, an as FarmLayerResolution, U as FarmMigrationCommand, V as FarmMigrationsConfig, W as FarmMigrationsUserConfig, e as FarmRequest, f as FarmResponse, al as FarmSourceRoot, aa as GenerateStaticParams, a4 as Layout, a2 as LayoutMetadataProps, ab as LayoutModule, L as LayoutProps, a5 as Loading, _ as LoadingProps, M as Metadata, ac as MetadataJsonLd, a1 as MetadataProps, ai as MetadataRobots, ah as MetadataRobotsDirectives, G as MiddlewareProps, T as NitroPreset, a3 as Page, o as PageProps, a0 as PagePropsWithMiddleware, S as PageRouteParams, P as ParsedRoute, q as PluginContextProps, am as ResolveFarmLayersOptions, ak as ResolvedFarmLayer, X as ResolvedFarmMigrationsConfig, s as RouteModule, R as RouteSegment, ag as SSGCollectionResult, af as SSGPage, ad as ServerAction, a8 as StaticPathParams, a7 as StaticPathPrimitive, a9 as StaticRouteParams, as as createFarmConfigResolutionPlugin, N as defineConfig, K as farmPlugin, aq as getFarmAppDirectories, ar as getFarmLayerAliases, ap as getFarmSourceRoots, at as loadFarmConfigFile, ao as resolveFarmLayers } from './client-plugins-B1Za6F5x.js';
+export { g as fileExists, h as globFiles, l as logger, m as matchRoute, b as matchRouteParts, c as matchRoutePrefix, d as matchRoutePrefixParts, p as parseRoutePath, i as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, a as splitRoutePath, e as toPosixPath, t as toRootRelativeUrlPath, f as toViteModuleId } from './utils-Dv0OuLtF.js';
 export { createFarmStorage, createStorageClient, databaseStorage, defineStorageClient, disposeStorage, driverStorage, getStorage, initStorage, libsqlStorage, localStorage, memoryStorage, mongodbStorage, mysql2Storage, mysqlStorage, netlifyBlobsStorage, pgStorage, pgliteStorage, planetscaleStorage, postgresStorage, redisStorage, resolveStorageRuntimeClient, s3Storage, sqliteStorage, upstashStorage, vercelBlobStorage, vercelKVStorage } from './storage.js';
 export { CacheKeyFactory, DefinedCacheKey, FarmCacheAdapter, FarmCacheEntry, FarmCacheInvalidationStreamOptions, FarmCacheInvalidationTarget, FarmCacheOptions, FarmCacheSetOptions, FarmCacheStorage, FarmCacheUserConfig, FarmClientCacheUserConfig, FarmDataCache, GetFarmCacheEntryOptions, InferCacheKeyData, RevalidateTagProfile, RouteDataCacheKey, StorageFarmCacheAdapterOptions, applyFarmCacheInvalidationTargets, applyFarmCacheInvalidations, configureFarmCache, createFarmCacheInvalidationStream, createFarmCacheKey, createPathCacheTag, createRouteDataCacheKey, createRouteDataCacheTag, defineCacheKey, getFarmDataCache, invalidate, invalidateRouteData, normalizeRevalidatePath, revalidatePath, revalidateTag, storageCacheAdapter, unstable_cache, updateTag } from './cache.js';
 export { AfterCallback, FarmAfterPlatformContext, _runWithAfterNodeResponse, _runWithAfterRequest, _withAfterNodeMiddleware, after } from './after.js';
 export { FARM_SERVER_QUERY_SYMBOL, ServerQuery, ServerQueryKey, ServerQueryOptions, ServerQueryOutputOptions, ServerQueryStaleTime, createServerQuery } from './server-query.js';
 import { ViteDevServer } from 'vite';
-import './types-Z0aotQ8w.js';
-export { g as getCurrentRequest } from './request-CR-Bp1Px.js';
+export { g as getCurrentRequest } from './request-BVGGeQv4.js';
 import { ServerResponse } from 'node:http';
 export { getTheme, getThemeSnapshot } from './theme/server.js';
 export { DEFAULT_SERVER_ACTION_BODY_SIZE_LIMIT, FarmServerActionsConfig, PreparedServerActionRequest, ResolvedFarmServerActionsConfig, SanitizedServerActionError, ServerActionRequestError, ServerActionRequestKind, createServerActionRequestErrorResponse, getServerActionExecutionContext, getServerActionInvalidations, getServerActionSignal, prepareServerActionRequest, resolveServerActionsConfig, runWithServerActionRequest, sanitizeServerActionError, validateServerActionRequest } from './server-action-security.js';
@@ -18,7 +17,6 @@ export { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage, StorageMeta,
 export { ConnectorName, ConnectorOptions, Database } from 'db0';
 import './types-DFbjpjXX.js';
 import '@farming-labs/docs';
-import './markdown.js';
 import './workflows-CR9ex-gz.js';
 import './cron.js';
 import './image-config-Duob7wER.js';
@@ -26,14 +24,14 @@ import './routes.js';
 import 'react';
 import './server-fn.js';
 import './server-fn-error-DDh14a0V.js';
-import './endpoint-1zA994xL.js';
+import './endpoint-CA-TNX60.js';
 import './renderer.js';
 import './deployment.js';
 import './lifecycle-DK06VuKP.js';
-import './route-DOEpbyWZ.js';
+import './integration-api-BPJo5oXb.js';
 import 'http';
+import './types-Z0aotQ8w.js';
 import './schema.js';
-import './integration-api-BbaiokCC.js';
 import '@farming-labs/orm';
 import './observability-BupkiN0m.js';
 import '@opentelemetry/api';
@@ -43,8 +41,8 @@ import 'rolldown';
 import './types-DQnyD3VD.js';
 import './font.js';
 import './island-CfGru1MO.js';
-import './metadata-CzBP4Mfp.js';
-import './render-plan-Bl6Fzg5z.js';
+import './metadata-7LKgQEWF.js';
+import './render-plan-CpW32tOL.js';
 import './runtime-BirxPwbZ.js';
 import './resolver-PPEeiJ6M.js';
 
@@ -52,13 +50,13 @@ declare const DEFAULT_FARM_DEV_SERVER_PORT = 3000;
 /**
  * Create a Vite development server with Farm.js integration
  */
-declare function createServer(config?: FarmConfig, options?: {
+declare function createServer(config?: FarmConfig | FarmUserConfig, options?: {
     port?: number;
 }): Promise<ViteDevServer>;
 /**
  * Start the development server
  */
-declare function startDevServer(config?: FarmConfig, port?: number): Promise<ViteDevServer>;
+declare function startDevServer(config?: FarmConfig | FarmUserConfig, port?: number): Promise<ViteDevServer>;
 
 declare function sendWebResponse(res: ServerResponse, response: Response): Promise<void>;
 

package/dist/server.mjs

@@ -16,9 +16,10 @@ import {
   loadFarmDocsEngine
 } from "./chunk-2VQKKQ6D.mjs";
 import {
+  isResolvedFarmConfig,
   loadConfig,
   resolveConfig
-} from "./chunk-YMUH2BLR.mjs";
+} from "./chunk-WIVTGKLY.mjs";
 import "./chunk-XZNTNMHT.mjs";
 import {
   loadFarmInstrumentation,
@@ -45,14 +46,14 @@ import {
   loadTailwindVitePlugin,
   mergeFarmViteConfig,
   resolveFarmImageProviderForRuntime
-} from "./chunk-UXQXGB5A.mjs";
+} from "./chunk-OGHTEYXS.mjs";
 import "./chunk-VVJCWBIE.mjs";
 import {
   readSchemaTables
 } from "./chunk-HALDNTIV.mjs";
 import "./chunk-ZMSZZXOR.mjs";
 import "./chunk-F3VB7ONA.mjs";
-import "./chunk-ARXCHQLX.mjs";
+import "./chunk-HG237IEY.mjs";
 import "./chunk-DAO7JGTS.mjs";
 import "./chunk-BOYNDCZL.mjs";
 import "./chunk-YQVSHTMR.mjs";
@@ -86,7 +87,7 @@ import {
   loadFarmRendererVitePlugins,
   resolveFarmRenderer
 } from "./chunk-DAATZTKJ.mjs";
-import "./chunk-RAI7NULA.mjs";
+import "./chunk-JT25KHDI.mjs";
 import "./chunk-G2KY33I6.mjs";
 import "./chunk-YHOCRI4H.mjs";
 import {
@@ -102,11 +103,13 @@ import {
   sanitizeServerActionError,
   validateServerActionRequest
 } from "./chunk-QCFFHV5H.mjs";
-import "./chunk-4OOBRCJX.mjs";
-import "./chunk-74RZNRY6.mjs";
-import "./chunk-JM5GQL4H.mjs";
+import {
+  setEnv
+} from "./chunk-4OOBRCJX.mjs";
+import "./chunk-3PTVHMLD.mjs";
+import "./chunk-MBFURXAC.mjs";
 import "./chunk-FA2W42OV.mjs";
-import "./chunk-OOIL3BWR.mjs";
+import "./chunk-POXI72VV.mjs";
 import "./chunk-MVL2RAJW.mjs";
 import "./chunk-SFGWNC43.mjs";
 import "./chunk-3ATMYLLJ.mjs";
@@ -155,17 +158,18 @@ import {
   _withAfterNodeMiddleware,
   after
 } from "./chunk-IOEH4VWN.mjs";
-import "./chunk-QGG336NI.mjs";
+import "./chunk-Q4BHBO6V.mjs";
 import "./chunk-YOYF2E4U.mjs";
 import "./chunk-CU625VAY.mjs";
 import "./chunk-JNGIWIY6.mjs";
 import "./chunk-FV45CKBC.mjs";
 import "./chunk-YOZYCI6Z.mjs";
-import "./chunk-GDUYXFIS.mjs";
+import "./chunk-6EG7U4NF.mjs";
 import "./chunk-SYGGPS4A.mjs";
 import "./chunk-W3B4PKAW.mjs";
-import "./chunk-I6XDAKWQ.mjs";
 import "./chunk-5WI2S4CO.mjs";
+import "./chunk-O6XNAMBV.mjs";
+import "./chunk-I6XDAKWQ.mjs";
 import "./chunk-EA5K5BKU.mjs";
 import "./chunk-2J7W2WND.mjs";
 import "./chunk-XF7Q24PF.mjs";
@@ -197,13 +201,13 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   FARM_VERSION
-} from "./chunk-PPIW3MH6.mjs";
+} from "./chunk-QQQNJS2E.mjs";
 import "./chunk-54UPOYFS.mjs";
 import "./chunk-WNSDDRNU.mjs";
 import "./chunk-JPLUGGRV.mjs";
 import "./chunk-G4MWPDSE.mjs";
-import "./chunk-O7BH5O46.mjs";
 import "./chunk-EMLAPBEM.mjs";
+import "./chunk-O7BH5O46.mjs";
 import "./chunk-7LTCDQRS.mjs";
 import "./chunk-IXUY2F5U.mjs";
 import "./chunk-CEYUWDWA.mjs";
@@ -261,11 +265,30 @@ import {
   __name
 } from "./chunk-LPEX4YW6.mjs";
 
-// src/server/create-server.ts
-import { createServer as createViteServer } from "vite";
-
 // src/server/dev-lifecycle.ts
+import {
+  createServer,
+  resolveConfig as resolveConfig2
+} from "vite";
 var VITE_CLOSE_TIMEOUT_MS = 1e4;
+async function createViteDevServer(config, capture) {
+  const resolved = await resolveConfig2(
+    config,
+    "serve",
+    void 0,
+    void 0,
+    false,
+    void 0,
+    (plugins) => {
+      plugins.unshift({
+        name: "farm:dev-construction",
+        configureServer: { order: "pre", handler: capture }
+      });
+    }
+  );
+  return createServer(resolved);
+}
+__name(createViteDevServer, "createViteDevServer");
 async function drainVitePendingWork(server) {
   const environments = Object.values(server.environments ?? {});
   await Promise.allSettled(
@@ -285,6 +308,44 @@ async function drainVitePendingWork(server) {
   }
 }
 __name(drainVitePendingWork, "drainVitePendingWork");
+async function closeViteDevServer(server, closeViteServer) {
+  const closingHttpServer = server.httpServer;
+  const closingWatcher = server.watcher;
+  const closingWebSocket = server.ws;
+  let timer;
+  const timedOut = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), VITE_CLOSE_TIMEOUT_MS);
+    timer.unref?.();
+  });
+  try {
+    const outcome = await Promise.race([
+      (async () => {
+        await drainVitePendingWork(server);
+        await closeViteServer();
+        return "closed";
+      })(),
+      timedOut
+    ]);
+    if (outcome === "timeout") {
+      logger.error(
+        `Vite server close did not settle within ${VITE_CLOSE_TIMEOUT_MS}ms; continuing shutdown without it (https://github.com/farming-labs/farm.js/issues/1263)`
+      );
+      await Promise.allSettled([
+        new Promise((resolve) => {
+          if (!closingHttpServer || !closingHttpServer.listening) return resolve();
+          closingHttpServer.close(() => resolve());
+        }),
+        Promise.resolve(closingWatcher?.close?.()).catch(() => {
+        }),
+        Promise.resolve(closingWebSocket?.close?.()).catch(() => {
+        })
+      ]);
+    }
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+__name(closeViteDevServer, "closeViteDevServer");
 function createFarmDevLifecyclePlugin(pluginManager, instrumentation) {
   let runtimeServer;
   const pendingRestarts = /* @__PURE__ */ new Set();
@@ -294,9 +355,6 @@ function createFarmDevLifecyclePlugin(pluginManager, instrumentation) {
     shutdownPromise ?? (shutdownPromise = (async () => {
       await Promise.allSettled(pendingRestarts);
       const closeViteServer = viteClosers.get(server.environments);
-      const closingHttpServer = server.httpServer;
-      const closingWatcher = server.watcher;
-      const closingWebSocket = server.ws;
       const failures = [];
       const step = /* @__PURE__ */ __name(async (label, run) => {
         try {
@@ -305,40 +363,7 @@ function createFarmDevLifecyclePlugin(pluginManager, instrumentation) {
           failures.push({ label, error });
         }
       }, "step");
-      await step("Vite server close", async () => {
-        let timer;
-        const timedOut = new Promise((resolve) => {
-          timer = setTimeout(() => resolve("timeout"), VITE_CLOSE_TIMEOUT_MS);
-          timer.unref?.();
-        });
-        try {
-          const outcome = await Promise.race([
-            (async () => {
-              await drainVitePendingWork(server);
-              await closeViteServer();
-              return "closed";
-            })(),
-            timedOut
-          ]);
-          if (outcome === "timeout") {
-            logger.error(
-              `Vite server close did not settle within ${VITE_CLOSE_TIMEOUT_MS}ms; continuing shutdown without it (https://github.com/farming-labs/farm.js/issues/1263)`
-            );
-            await Promise.allSettled([
-              new Promise((resolve) => {
-                if (!closingHttpServer || !closingHttpServer.listening) return resolve();
-                closingHttpServer.close(() => resolve());
-              }),
-              Promise.resolve(closingWatcher?.close?.()).catch(() => {
-              }),
-              Promise.resolve(closingWebSocket?.close?.()).catch(() => {
-              })
-            ]);
-          }
-        } finally {
-          if (timer) clearTimeout(timer);
-        }
-      });
+      await step("Vite server close", () => closeViteDevServer(server, closeViteServer));
       await step("Plugin runtime shutdown", () => pluginManager.closeRuntime("dev-server-closed"));
       await step("Instrumentation shutdown", () => instrumentation.shutdown());
       if (failures.length === 1) throw failures[0].error;
@@ -477,19 +502,66 @@ function withPortFlag(vite, port) {
   return port === void 0 ? vite : { ...vite, server: { ...vite?.server, port } };
 }
 __name(withPortFlag, "withPortFlag");
-async function createServer(config = {}, options = {}) {
+function inlineEnvScope(scope) {
+  return Object.fromEntries(
+    Object.entries(scope || {}).map(([key, value]) => [
+      key,
+      typeof value === "function" || value && typeof value === "object" && "parse" in value && typeof value.parse === "function" ? value : () => value
+    ])
+  );
+}
+__name(inlineEnvScope, "inlineEnvScope");
+async function resolveInlineConfig(config, mode) {
+  if (isResolvedFarmConfig(config)) {
+    setEnv(config.env);
+    return { ...config };
+  }
+  const docs = config.docs;
+  const resolvedDocs = docs && typeof docs === "object" && "enabled" in docs && "entry" in docs && "config" in docs ? docs : void 0;
+  const i18n = config.i18n;
+  const resolvedI18n = i18n && "enabled" in i18n ? i18n : void 0;
+  const auth = config.auth;
+  const resolvedAuth = auth && typeof auth === "object" && typeof auth.emailAndPassword === "object" && "enabled" in auth.emailAndPassword ? auth : void 0;
+  const resolved = await resolveConfig(
+    {
+      ...config,
+      ...resolvedDocs ? { docs: false } : {},
+      ...resolvedI18n ? { i18n: false } : {},
+      ...resolvedAuth ? { auth: false } : {},
+      ...config.layers ? { extends: [] } : {},
+      // FarmConfig also accepts literal runtime env values. Adapt only inline
+      // input; file/layer config keeps the normal parser validation contract.
+      env: config.env && {
+        server: inlineEnvScope(config.env.server),
+        public: inlineEnvScope(config.env.public)
+      }
+    },
+    mode
+  );
+  if (resolvedDocs) resolved.docs = resolvedDocs;
+  if (resolvedI18n) resolved.i18n = resolvedI18n;
+  if (resolvedAuth) resolved.auth = resolvedAuth;
+  if (config.layers) {
+    resolved.extends = config.extends || [];
+    resolved.layers = [...config.layers];
+  }
+  return resolved;
+}
+__name(resolveInlineConfig, "resolveInlineConfig");
+async function createServer2(config = {}, options = {}) {
   let pluginManager = null;
   let instrumentation = null;
+  let server;
+  let pendingViteServer;
   try {
     const root = config.root || process.cwd();
     const mode = process.env.NODE_ENV === "production" ? "production" : "development";
     const userConfig = await loadConfig(root, void 0, mode);
-    const resolvedConfig = userConfig ? await resolveConfig(userConfig, mode) : null;
-    const instrumentationConfig = resolvedConfig || config;
-    const instrumentationRoot = instrumentationConfig.root || root;
+    const resolvedConfig = userConfig ? await resolveConfig(userConfig, mode) : await resolveInlineConfig(config, mode);
+    const instrumentationRoot = resolvedConfig.root;
     const instrumentationFile = resolveFarmInstrumentationFile(
       instrumentationRoot,
-      instrumentationConfig.srcDir || "src"
+      resolvedConfig.srcDir
     );
     const instrumentationModule = await loadFarmInstrumentation(
       instrumentationFile,
@@ -502,31 +574,27 @@ async function createServer(config = {}, options = {}) {
     });
     await instrumentation.start();
     pluginManager = new PluginManager({
-      config: resolvedConfig || config,
+      config: resolvedConfig,
       isDev: mode === "development",
       isProd: mode === "production"
     });
-    if (resolvedConfig) {
-      const redirects = await resolvedConfig.redirects();
-      const headers = await resolvedConfig.headers();
-      const rewrites = await resolvedConfig.rewrites();
-      if (redirects.length > 0) {
-        pluginManager.addPlugin(createRedirectsPlugin(redirects, { i18n: resolvedConfig.i18n }));
-      }
-      if (headers.length > 0) {
-        pluginManager.addPlugin(createHeadersPlugin(headers, { i18n: resolvedConfig.i18n }));
-      }
-      if (rewrites.length > 0) {
-        pluginManager.addPlugin(createRewritesPlugin(rewrites, { i18n: resolvedConfig.i18n }));
-      }
-      if (resolvedConfig.compress && mode === "production") {
-        pluginManager.addPlugin(createCompressionPlugin());
-      }
-      if (resolvedConfig.plugins) {
-        pluginManager.addPlugins(resolvedConfig.plugins);
-      }
+    const redirects = await resolvedConfig.redirects();
+    const headers = await resolvedConfig.headers();
+    const rewrites = await resolvedConfig.rewrites();
+    if (redirects.length > 0) {
+      pluginManager.addPlugin(createRedirectsPlugin(redirects, { i18n: resolvedConfig.i18n }));
+    }
+    if (headers.length > 0) {
+      pluginManager.addPlugin(createHeadersPlugin(headers, { i18n: resolvedConfig.i18n }));
     }
-    const infraAnalytics = (resolvedConfig || config).analytics !== false ? createFarmInfraAnalyticsPlugin() : null;
+    if (rewrites.length > 0) {
+      pluginManager.addPlugin(createRewritesPlugin(rewrites, { i18n: resolvedConfig.i18n }));
+    }
+    if (resolvedConfig.compress && mode === "production") {
+      pluginManager.addPlugin(createCompressionPlugin());
+    }
+    pluginManager.addPlugins(resolvedConfig.plugins);
+    const infraAnalytics = resolvedConfig.analytics !== false ? createFarmInfraAnalyticsPlugin() : null;
     if (infraAnalytics) pluginManager.addPlugin(infraAnalytics);
     if (mode === "development") {
       const hasLogger = pluginManager.getPlugins().some((p) => p.name === "farm:logger");
@@ -535,7 +603,7 @@ async function createServer(config = {}, options = {}) {
       }
     }
     await pluginManager.runHookParallel("init");
-    let finalConfig = resolvedConfig || config;
+    let finalConfig = resolvedConfig;
     finalConfig = await pluginManager.runHookSerial("config", finalConfig);
     finalConfig.renderer = resolveFarmRenderer(finalConfig.renderer);
     const projectRoot = finalConfig.root || process.cwd();
@@ -558,7 +626,7 @@ async function createServer(config = {}, options = {}) {
     } else {
       tailwindVitePlugin = await loadTailwindVitePlugin();
     }
-    const server = await createViteServer(
+    server = await createViteDevServer(
       mergeFarmViteConfig(
         {
           root: projectRoot,
@@ -630,8 +698,12 @@ async function createServer(config = {}, options = {}) {
           }
         },
         withPortFlag(finalConfig.vite, options.port)
-      )
+      ),
+      (candidate) => {
+        pendingViteServer = candidate;
+      }
     );
+    pendingViteServer = void 0;
     server.__farmPluginManager = pluginManager;
     server.__farmResolvedConfig = resolvedConfig;
     server.__farmInstrumentation = instrumentation;
@@ -642,19 +714,41 @@ async function createServer(config = {}, options = {}) {
     await pluginManager.runHookParallel("buildStart");
     return server;
   } catch (error) {
-    if (pluginManager) {
-      await pluginManager.runHookParallel("onError", {
+    const attempt = /* @__PURE__ */ __name(async (operation, run) => {
+      try {
+        await run();
+      } catch (cleanupError) {
+        console.error(`Failed to ${operation} after a server creation failure:`, cleanupError);
+      }
+    }, "attempt");
+    await attempt(
+      "run plugin error hooks",
+      () => pluginManager?.runHookParallel("onError", {
         phase: "createServer",
         error
-      });
+      })
+    );
+    if (server) {
+      await attempt("close the dev server", server.close.bind(server));
+    } else {
+      const partialServer = pendingViteServer;
+      if (partialServer) {
+        await attempt(
+          "close the partially created Vite server",
+          () => closeViteDevServer(partialServer, partialServer.close.bind(partialServer))
+        );
+      }
+      await attempt(
+        "close the plugin runtime",
+        () => pluginManager?.closeRuntime("dev-server-creation-failed")
+      );
+      await attempt("shut down instrumentation", () => instrumentation?.shutdown());
     }
-    await instrumentation?.shutdown().catch(() => {
-    });
     logger.error(`Failed to create server: ${error}`);
     throw error;
   }
 }
-__name(createServer, "createServer");
+__name(createServer2, "createServer");
 function noticeSchemaChangesInBackground(config) {
   if (!config) return false;
   const candidates = [
@@ -668,7 +762,7 @@ function noticeSchemaChangesInBackground(config) {
 }
 __name(noticeSchemaChangesInBackground, "noticeSchemaChangesInBackground");
 async function startDevServer(config = {}, port) {
-  const server = await createServer(config, { port });
+  const server = await createServer2(config, { port });
   try {
     await server.listen(port);
     const pluginManager = server.__farmPluginManager;
@@ -712,7 +806,7 @@ export {
   createPathCacheTag,
   createRouteDataCacheKey,
   createRouteDataCacheTag,
-  createServer,
+  createServer2 as createServer,
   createServerActionRequestErrorResponse,
   createServerOnlyFn,
   createServerQuery,

package/dist/{spa-router-DTdbuinx.d.mts → spa-router-DVfSJZ5o.d.mts}

@@ -1,8 +1,8 @@
-import { M as Metadata } from './client-plugins-B8RPJnot.mjs';
+import { M as Metadata } from './client-plugins-1GS4zubE.mjs';
 import { F as FarmClientPluginManager } from './lifecycle-DK06VuKP.mjs';
 import { F as FarmI18nClientSnapshot } from './types-Z0aotQ8w.mjs';
 import { F as FarmIslandStrategy } from './island-CfGru1MO.mjs';
-import { F as FarmRouteRenderPlan } from './render-plan-CKAJg0jC.mjs';
+import { F as FarmRouteRenderPlan } from './render-plan-CtQB-zHS.mjs';
 
 type NavigationMetadata = (Metadata & Record<string, any>) | undefined;
 

package/dist/{spa-router-BstQUO6Q.d.ts → spa-router-DmwP_7QL.d.ts}

@@ -1,8 +1,8 @@
-import { M as Metadata } from './client-plugins-bPBf4haK.js';
+import { M as Metadata } from './client-plugins-B1Za6F5x.js';
 import { F as FarmClientPluginManager } from './lifecycle-DK06VuKP.js';
 import { F as FarmI18nClientSnapshot } from './types-Z0aotQ8w.js';
 import { F as FarmIslandStrategy } from './island-CfGru1MO.js';
-import { F as FarmRouteRenderPlan } from './render-plan-Bl6Fzg5z.js';
+import { F as FarmRouteRenderPlan } from './render-plan-CpW32tOL.js';
 
 type NavigationMetadata = (Metadata & Record<string, any>) | undefined;