astro 6.0.0-beta.16 → 6.0.0-beta.17

package/dist/actions/runtime/server.js

@@ -99,9 +99,10 @@ function getActionContext(context) {
           }
           throw error;
         }
+        const bodySizeLimit = pipeline.manifest.actionBodySizeLimit;
         let input;
         try {
-          input = await parseRequestBody(context.request);
+          input = await parseRequestBody(context.request, bodySizeLimit);
         } catch (e) {
           if (e instanceof ActionError) {
             return { data: void 0, error: e };
@@ -149,22 +150,21 @@ function getCallerInfo(ctx) {
   }
   return void 0;
 }
-const DEFAULT_ACTION_BODY_SIZE_LIMIT = 1024 * 1024;
-async function parseRequestBody(request) {
+async function parseRequestBody(request, bodySizeLimit) {
   const contentType = request.headers.get("content-type");
   const contentLengthHeader = request.headers.get("content-length");
   const contentLength = contentLengthHeader ? Number.parseInt(contentLengthHeader, 10) : void 0;
   const hasContentLength = typeof contentLength === "number" && Number.isFinite(contentLength);
   if (!contentType) return void 0;
-  if (hasContentLength && contentLength > DEFAULT_ACTION_BODY_SIZE_LIMIT) {
+  if (hasContentLength && contentLength > bodySizeLimit) {
     throw new ActionError({
       code: "CONTENT_TOO_LARGE",
-      message: `Request body exceeds ${DEFAULT_ACTION_BODY_SIZE_LIMIT} bytes`
+      message: `Request body exceeds ${bodySizeLimit} bytes`
     });
   }
   if (hasContentType(contentType, formContentTypes)) {
     if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), DEFAULT_ACTION_BODY_SIZE_LIMIT);
+      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
       const formRequest = new Request(request.url, {
         method: request.method,
         headers: request.headers,
@@ -177,7 +177,7 @@ async function parseRequestBody(request) {
   if (hasContentType(contentType, ["application/json"])) {
     if (contentLength === 0) return void 0;
     if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), DEFAULT_ACTION_BODY_SIZE_LIMIT);
+      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
       if (body.byteLength === 0) return void 0;
       return JSON.parse(new TextDecoder().decode(body));
     }

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.0.0-beta.16";
+  version = "6.0.0-beta.17";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/index.js

@@ -33,6 +33,7 @@ function createManifest(manifest, renderers, middleware) {
     compressHTML: manifest?.compressHTML ?? ASTRO_CONFIG_DEFAULTS.compressHTML,
     assetsDir: manifest?.assetsDir ?? ASTRO_CONFIG_DEFAULTS.build.assets,
     serverLike: manifest?.serverLike ?? true,
+    middlewareMode: manifest?.middlewareMode ?? "classic",
     assets: manifest?.assets ?? /* @__PURE__ */ new Set(),
     assetsPrefix: manifest?.assetsPrefix ?? void 0,
     entryModules: manifest?.entryModules ?? {},
@@ -47,6 +48,7 @@ function createManifest(manifest, renderers, middleware) {
     i18n: manifest?.i18n,
     checkOrigin: false,
     allowedDomains: manifest?.allowedDomains ?? [],
+    actionBodySizeLimit: 1024 * 1024,
     middleware: manifest?.middleware ?? middlewareInstance,
     key: createKey(),
     csp: manifest?.csp,

package/dist/content/content-layer.d.ts

@@ -3,15 +3,17 @@ import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { RefreshContentOptions } from '../types/public/content.js';
 import type { MutableDataStore } from './mutable-data-store.js';
-interface ContentLayerOptions {
+import { type ContentObservable } from './utils.js';
+export interface ContentLayerOptions {
     store: MutableDataStore;
     settings: AstroSettings;
     logger: Logger;
     watcher?: FSWatcher;
+    contentConfigObserver?: ContentObservable;
 }
-declare class ContentLayer {
+export declare class ContentLayer {
     #private;
-    constructor({ settings, logger, store, watcher }: ContentLayerOptions);
+    constructor({ settings, logger, store, watcher, contentConfigObserver, }: ContentLayerOptions);
     /**
      * Whether the content layer is currently loading content
      */
@@ -37,9 +39,3 @@ declare class ContentLayer {
  * In production, it's in the cache directory so that it's preserved between builds.
  */
 export declare function getDataStoreFile(settings: AstroSettings, isDev: boolean): URL;
-export declare const globalContentLayer: {
-    init: (options: ContentLayerOptions) => ContentLayer;
-    get: () => ContentLayer | null;
-    dispose: () => void;
-};
-export {};

package/dist/content/content-layer.js

@@ -30,12 +30,20 @@ class ContentLayer {
   #unsubscribe;
   #markdownProcessor;
   #generateDigest;
+  #contentConfigObserver;
   #queue;
-  constructor({ settings, logger, store, watcher }) {
+  constructor({
+    settings,
+    logger,
+    store,
+    watcher,
+    contentConfigObserver = globalContentConfigObserver
+  }) {
     watcher?.setMaxListeners(50);
     this.#logger = logger;
     this.#store = store;
     this.#settings = settings;
+    this.#contentConfigObserver = contentConfigObserver;
     if (watcher) {
       this.#watcher = createWatcherWrapper(watcher);
     }
@@ -52,7 +60,7 @@ class ContentLayer {
    */
   watchContentConfig() {
     this.#unsubscribe?.();
-    this.#unsubscribe = globalContentConfigObserver.subscribe(async (ctx) => {
+    this.#unsubscribe = this.#contentConfigObserver.subscribe(async (ctx) => {
       if (ctx.status === "loaded" && ctx.config.digest !== this.#lastConfigDigest) {
         this.sync();
       }
@@ -122,12 +130,12 @@ class ContentLayer {
     return this.#queue.add(() => this.#doSync(options));
   }
   async #doSync(options) {
-    let contentConfig = globalContentConfigObserver.get();
+    let contentConfig = this.#contentConfigObserver.get();
     const logger = this.#logger.forkIntegrationLogger("content");
     if (contentConfig?.status === "loading") {
       contentConfig = await Promise.race([
         new Promise((resolve) => {
-          const unsub = globalContentConfigObserver.subscribe((ctx) => {
+          const unsub = this.#contentConfigObserver.subscribe((ctx) => {
             unsub();
             resolve(ctx);
           });
@@ -170,9 +178,9 @@ ${contentConfig.error.message}`
     const { digest: currentConfigDigest } = contentConfig.config;
     this.#lastConfigDigest = currentConfigDigest;
     let shouldClear = false;
-    const previousConfigDigest = await this.#store.metaStore().get("content-config-digest");
-    const previousAstroConfigDigest = await this.#store.metaStore().get("astro-config-digest");
-    const previousAstroVersion = await this.#store.metaStore().get("astro-version");
+    const previousConfigDigest = this.#store.metaStore().get("content-config-digest");
+    const previousAstroConfigDigest = this.#store.metaStore().get("astro-config-digest");
+    const previousAstroVersion = this.#store.metaStore().get("astro-version");
     if (previousAstroConfigDigest && previousAstroConfigDigest !== astroConfigDigest) {
       logger.info("Astro config changed");
       shouldClear = true;
@@ -181,7 +189,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.16") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.17") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -189,14 +197,14 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-beta.16") {
-      await this.#store.metaStore().set("astro-version", "6.0.0-beta.16");
+    if ("6.0.0-beta.17") {
+      this.#store.metaStore().set("astro-version", "6.0.0-beta.17");
     }
     if (currentConfigDigest) {
-      await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
+      this.#store.metaStore().set("content-config-digest", currentConfigDigest);
     }
     if (astroConfigDigest) {
-      await this.#store.metaStore().set("astro-config-digest", astroConfigDigest);
+      this.#store.metaStore().set("astro-config-digest", astroConfigDigest);
     }
     if (!options?.loaders?.length) {
       this.#watcher?.removeAllTrackedListeners();
@@ -354,23 +362,7 @@ ${JSON.stringify({ ...raw, id: void 0 }, null, 2)}`
 function getDataStoreFile(settings, isDev) {
   return new URL(DATA_STORE_FILE, isDev ? settings.dotAstroDir : settings.config.cacheDir);
 }
-function contentLayerSingleton() {
-  let instance = null;
-  return {
-    init: (options) => {
-      instance?.dispose();
-      instance = new ContentLayer(options);
-      return instance;
-    },
-    get: () => instance,
-    dispose: () => {
-      instance?.dispose();
-      instance = null;
-    }
-  };
-}
-const globalContentLayer = contentLayerSingleton();
 export {
-  getDataStoreFile,
-  globalContentLayer
+  ContentLayer,
+  getDataStoreFile
 };

package/dist/content/instance.d.ts

@@ -0,0 +1,17 @@
+import type { FSWatcher } from 'vite';
+import { ContentLayer } from './content-layer.js';
+import type { Logger } from '../core/logger/core.js';
+import type { AstroSettings } from '../types/astro.js';
+import type { MutableDataStore } from './mutable-data-store.js';
+interface ContentLayerOptions {
+    store: MutableDataStore;
+    settings: AstroSettings;
+    logger: Logger;
+    watcher?: FSWatcher;
+}
+export declare const globalContentLayer: {
+    init: (options: ContentLayerOptions) => ContentLayer;
+    get: () => ContentLayer | null;
+    dispose: () => void;
+};
+export {};

package/dist/content/instance.js

@@ -0,0 +1,20 @@
+import { ContentLayer } from "./content-layer.js";
+function contentLayerSingleton() {
+  let instance = null;
+  return {
+    init: (options) => {
+      instance?.dispose();
+      instance = new ContentLayer(options);
+      return instance;
+    },
+    get: () => instance,
+    dispose: () => {
+      instance?.dispose();
+      instance = null;
+    }
+  };
+}
+const globalContentLayer = contentLayerSingleton();
+export {
+  globalContentLayer
+};

package/dist/core/app/types.d.ts

@@ -9,6 +9,7 @@ import type { LoggerLevel } from '../logger/core.js';
 import type { RoutingStrategies } from './common.js';
 import type { BaseSessionConfig, SessionDriverFactory } from '../session/types.js';
 import type { DevToolbarPlacement } from '../../types/public/toolbar.js';
+import type { MiddlewareMode } from '../../types/public/integrations.js';
 import type { BaseApp } from './base.js';
 type ComponentPath = string;
 export type StylesheetAsset = {
@@ -74,6 +75,12 @@ export type SSRManifest = {
      * the creation of `dist/client` and `dist/server` folders.
      */
     serverLike: boolean;
+    /**
+     * The middleware mode determines when and how middleware executes.
+     * - 'classic' (default): Build-time for prerendered pages, request-time for SSR pages
+     * - 'edge': Middleware deployed as separate edge function
+     */
+    middlewareMode: MiddlewareMode;
     /**
      * Map of directive name (e.g. `load`) to the directive script code
      */
@@ -94,6 +101,7 @@ export type SSRManifest = {
     }>;
     checkOrigin: boolean;
     allowedDomains?: Partial<RemotePattern>[];
+    actionBodySizeLimit: number;
     sessionConfig?: SSRManifestSession;
     cacheDir: URL;
     srcDir: URL;

package/dist/core/base-pipeline.js

@@ -60,7 +60,8 @@ class Pipeline {
   async getMiddleware() {
     if (this.resolvedMiddleware) {
       return this.resolvedMiddleware;
-    } else if (this.middleware) {
+    }
+    if (this.middleware) {
       const middlewareInstance = await this.middleware();
       const onRequest = middlewareInstance.onRequest ?? NOOP_MIDDLEWARE_FN;
       const internalMiddlewares = [onRequest];

package/dist/core/build/plugins/plugin-manifest.js

@@ -2,6 +2,7 @@ import { fileURLToPath } from "node:url";
 import { glob } from "tinyglobby";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
+import { resolveMiddlewareMode } from "../../../integrations/adapter-utils.js";
 import { runHookBuildSsr } from "../../../integrations/hooks.js";
 import { SERIALIZED_MANIFEST_RESOLVED_ID } from "../../../manifest/serialized.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
@@ -37,7 +38,8 @@ async function manifestBuildPostHook(options, internals, {
     (c) => !c.prerender && c.moduleIds.includes(SERIALIZED_MANIFEST_RESOLVED_ID)
   );
   if (ssrManifestChunk) {
-    const shouldPassMiddlewareEntryPoint = options.settings.adapter?.adapterFeatures?.edgeMiddleware;
+    const middlewareMode = resolveMiddlewareMode(options.settings.adapter?.adapterFeatures);
+    const shouldPassMiddlewareEntryPoint = middlewareMode === "edge";
     await runHookBuildSsr({
       config: options.settings.config,
       manifest,
@@ -196,6 +198,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
       internalFetchHeaders = headers;
     }
   }
+  const middlewareMode = resolveMiddlewareMode(opts.settings.adapter?.adapterFeatures);
   return {
     rootDir: opts.settings.config.root.toString(),
     cacheDir: opts.settings.config.cacheDir.toString(),
@@ -208,6 +211,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     assetsDir: opts.settings.config.build.assets,
     routes,
     serverLike: opts.settings.buildOutput === "server",
+    middlewareMode,
     site: settings.config.site,
     base: settings.config.base,
     userAssetsBase: settings.config?.vite?.base,
@@ -228,6 +232,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     i18n: i18nManifest,
     buildFormat: settings.config.build.format,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
+    actionBodySizeLimit: settings.config.security?.actionBodySizeLimit && settings.buildOutput === "server" ? settings.config.security.actionBodySizeLimit : 1024 * 1024,
     allowedDomains: settings.config.security?.allowedDomains,
     key: encodedKey,
     sessionConfig: sessionConfigToManifest(settings.config.session),

package/dist/core/config/schemas/base.d.ts

@@ -65,6 +65,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         checkOrigin: true;
         allowedDomains: never[];
         csp: false;
+        actionBodySizeLimit: number;
     };
     env: {
         schema: {};
@@ -349,6 +350,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             protocol: z.ZodOptional<z.ZodString>;
             port: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>>>;
+        actionBodySizeLimit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         csp: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodDefault<z.ZodOptional<z.ZodBoolean>>, z.ZodObject<{
             algorithm: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
                 "SHA-256": "SHA-256";

package/dist/core/config/schemas/base.js

@@ -48,7 +48,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   security: {
     checkOrigin: true,
     allowedDomains: [],
-    csp: false
+    csp: false,
+    actionBodySizeLimit: 1024 * 1024
   },
   env: {
     schema: {},
@@ -253,6 +254,7 @@ const AstroConfigSchema = z.object({
         port: z.string().optional()
       })
     ).optional().default(ASTRO_CONFIG_DEFAULTS.security.allowedDomains),
+    actionBodySizeLimit: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.security.actionBodySizeLimit),
     csp: z.union([
       z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.security.csp),
       z.object({

package/dist/core/config/schemas/relative.d.ts

@@ -237,6 +237,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             protocol: z.ZodOptional<z.ZodString>;
             port: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>>>>;
+        actionBodySizeLimit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         csp: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodDefault<z.ZodOptional<z.ZodBoolean>>, z.ZodObject<{
             algorithm: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
                 "SHA-256": "SHA-256";
@@ -491,6 +492,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             protocol?: string | undefined;
             port?: string | undefined;
         }[];
+        actionBodySizeLimit: number;
         csp: boolean | {
             algorithm: "SHA-256" | "SHA-384" | "SHA-512";
             directives?: (`base-uri${string}` | `child-src${string}` | `connect-src${string}` | `default-src${string}` | `fenced-frame-src${string}` | `font-src${string}` | `form-action${string}` | `frame-ancestors${string}` | `frame-src${string}` | `img-src${string}` | `manifest-src${string}` | `media-src${string}` | `object-src${string}` | `referrer${string}` | `report-to${string}` | `report-uri${string}` | `require-trusted-types-for${string}` | `sandbox${string}` | `trusted-types${string}` | `upgrade-insecure-requests${string}` | `worker-src${string}`)[] | undefined;
@@ -719,6 +721,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             protocol?: string | undefined;
             port?: string | undefined;
         }[];
+        actionBodySizeLimit: number;
         csp: boolean | {
             algorithm: "SHA-256" | "SHA-384" | "SHA-512";
             directives?: (`base-uri${string}` | `child-src${string}` | `connect-src${string}` | `default-src${string}` | `fenced-frame-src${string}` | `font-src${string}` | `form-action${string}` | `frame-ancestors${string}` | `frame-src${string}` | `img-src${string}` | `manifest-src${string}` | `media-src${string}` | `object-src${string}` | `referrer${string}` | `report-to${string}` | `report-uri${string}` | `require-trusted-types-for${string}` | `sandbox${string}` | `trusted-types${string}` | `upgrade-insecure-requests${string}` | `worker-src${string}`)[] | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.0.0-beta.16";
+const ASTRO_VERSION = "6.0.0-beta.17";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -2,7 +2,8 @@ import fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import colors from "piccolore";
 import { gt, major, minor, patch } from "semver";
-import { getDataStoreFile, globalContentLayer } from "../../content/content-layer.js";
+import { getDataStoreFile } from "../../content/content-layer.js";
+import { globalContentLayer } from "../../content/instance.js";
 import { attachContentServerListeners } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
 import { globalContentConfigObserver } from "../../content/utils.js";
@@ -25,7 +26,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.0.0-beta.16";
+  const currentVersion = "6.0.0-beta.17";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/dev/restart.js

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "node:url";
 import * as vite from "vite";
-import { globalContentLayer } from "../../content/content-layer.js";
+import { globalContentLayer } from "../../content/instance.js";
 import { attachContentServerListeners } from "../../content/server-listeners.js";
 import { eventCliSession, telemetry } from "../../events/index.js";
 import { SETTINGS_FILE } from "../../preferences/constants.js";

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.0.0-beta.16"}`
+        `v${"6.0.0-beta.17"}`
       )} ${headline}`
     );
   }

package/dist/core/sync/index.js

@@ -6,7 +6,8 @@ import colors from "piccolore";
 import { createServer } from "vite";
 import { syncFonts } from "../../assets/fonts/sync.js";
 import { CONTENT_TYPES_FILE } from "../../content/consts.js";
-import { getDataStoreFile, globalContentLayer } from "../../content/content-layer.js";
+import { getDataStoreFile } from "../../content/content-layer.js";
+import { globalContentLayer } from "../../content/instance.js";
 import { createContentTypesGenerator } from "../../content/index.js";
 import { MutableDataStore } from "../../content/mutable-data-store.js";
 import { getContentPaths, globalContentConfigObserver } from "../../content/utils.js";

package/dist/integrations/adapter-utils.d.ts

@@ -0,0 +1,19 @@
+import type { AstroAdapterFeatures, MiddlewareMode } from '../types/public/integrations.js';
+/**
+ * Resolves the middleware mode from adapter features.
+ * Handles backward compatibility with the deprecated `edgeMiddleware` flag.
+ *
+ * @example
+ * ```ts
+ * // New way
+ * resolveMiddlewareMode({ middlewareMode: 'always' }) // 'always'
+ *
+ * // Backward compatibility
+ * resolveMiddlewareMode({ edgeMiddleware: true }) // 'edge'
+ * resolveMiddlewareMode({ edgeMiddleware: false }) // 'classic'
+ *
+ * // Default
+ * resolveMiddlewareMode({}) // 'classic'
+ * ```
+ */
+export declare function resolveMiddlewareMode(features?: AstroAdapterFeatures): MiddlewareMode;

package/dist/integrations/adapter-utils.js

@@ -0,0 +1,12 @@
+function resolveMiddlewareMode(features) {
+  if (features?.middlewareMode) {
+    return features.middlewareMode;
+  }
+  if (features?.edgeMiddleware === true) {
+    return "edge";
+  }
+  return "classic";
+}
+export {
+  resolveMiddlewareMode
+};

package/dist/integrations/hooks.js

@@ -5,7 +5,7 @@ import { mergeConfig as mergeViteConfig } from "vite";
 import astroIntegrationActionsRouteHandler from "../actions/integration.js";
 import { isActionsFilePresent } from "../actions/utils.js";
 import { CONTENT_LAYER_TYPE } from "../content/consts.js";
-import { globalContentLayer } from "../content/content-layer.js";
+import { globalContentLayer } from "../content/instance.js";
 import { globalContentConfigObserver } from "../content/utils.js";
 import { buildClientDirectiveEntrypoint } from "../core/client-directive/index.js";
 import { mergeConfig } from "../core/config/merge.js";

package/dist/manifest/serialized.js

@@ -21,6 +21,7 @@ import { ASTRO_RENDERERS_MODULE_ID } from "../vite-plugin-renderers/index.js";
 import { ASTRO_ROUTES_MODULE_ID } from "../vite-plugin-routes/index.js";
 import { sessionConfigToManifest } from "../core/session/utils.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
+import { resolveMiddlewareMode } from "../integrations/adapter-utils.js";
 const SERIALIZED_MANIFEST_ID = "virtual:astro:manifest";
 const SERIALIZED_MANIFEST_RESOLVED_ID = "\0" + SERIALIZED_MANIFEST_ID;
 function serializedManifestPlugin({
@@ -133,6 +134,7 @@ async function createSerializedManifest(settings) {
     buildFormat: settings.config.build.format,
     compressHTML: settings.config.compressHTML,
     serverLike: settings.buildOutput === "server",
+    middlewareMode: resolveMiddlewareMode(settings.adapter?.adapterFeatures),
     assets: [],
     entryModules: {},
     routes: [],
@@ -147,6 +149,8 @@ async function createSerializedManifest(settings) {
     inlinedScripts: [],
     i18n: i18nManifest,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
+    actionBodySizeLimit: settings.config.security?.actionBodySizeLimit ? settings.config.security.actionBodySizeLimit : 1024 * 1024,
+    // 1mb default
     key: await encodeKey(hasEnvironmentKey() ? await getEnvironmentKey() : await createKey()),
     sessionConfig: sessionConfigToManifest(settings.config.session),
     csp,

package/dist/types/public/config.d.ts

@@ -600,6 +600,30 @@ export interface AstroUserConfig<TLocales extends Locales = never, TDriver exten
          * When not configured, `X-Forwarded-Host` headers are not trusted and will be ignored.
          */
         allowedDomains?: Partial<RemotePattern>[];
+        /**
+         * @docs
+         * @name security.actionBodySizeLimit
+         * @kind h4
+         * @type {number}
+         * @default `1048576` (1 MB)
+         * @version 5.18.0
+         * @description
+         *
+         * Sets the maximum size in bytes allowed for action request bodies.
+         *
+         * By default, action request bodies are limited to 1 MB (1048576 bytes) to prevent abuse.
+         * You can increase this limit if your actions need to accept larger payloads, for example when handling file uploads.
+         *
+         * ```js
+         * // astro.config.mjs
+         * export default defineConfig({
+         *   security: {
+         *     actionBodySizeLimit: 10 * 1024 * 1024 // 10 MB
+         *   }
+         * })
+         * ```
+         */
+        actionBodySizeLimit?: number;
         /**
          * @docs
          * @name security.csp

package/dist/types/public/integrations.d.ts

@@ -65,12 +65,22 @@ export type AdapterSupportWithMessage = {
     suppress?: 'all' | 'default';
 };
 export type AdapterSupport = AdapterSupportsKind | AdapterSupportWithMessage;
+export type MiddlewareMode = 'classic' | 'edge';
 export interface AstroAdapterFeatures {
     /**
-     * Defines whether any on-demand rendering middleware code will be bundled when built. When enabled, this prevents
-     * middleware code from being bundled and imported by all pages during the build.
+     * Creates an edge function that will communicate with the Astro middleware
+     *
+     * @deprecated Use `middlewareMode: 'edge'` instead
+     */
+    edgeMiddleware?: boolean;
+    /**
+     * Determines when and how middleware executes:
+     * - `'classic'` (default): Middleware runs for prerendered pages at build time, and for SSR pages at request time. Does not run for prerendered pages at request time.
+     * - `'edge'`: Middleware is deployed as a separate edge function. Middleware code will not be bundled and imported by all pages during the build.
+     *
+     * @default 'classic'
      */
-    edgeMiddleware: boolean;
+    middlewareMode?: MiddlewareMode;
     /**
      * Allows you to force a specific output shape for the build. This can be useful for adapters that only work with
      * a specific output type. For example, your adapter might expect a static website so it can create host-specific

package/dist/vite-plugin-astro-server/plugin.js

@@ -19,6 +19,7 @@ import { getViteErrorPayload } from "../core/errors/dev/index.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "../core/middleware/noop-middleware.js";
 import { createViteLoader } from "../core/module-loader/index.js";
+import { resolveMiddlewareMode } from "../integrations/adapter-utils.js";
 import { SERIALIZED_MANIFEST_ID } from "../manifest/serialized.js";
 import { ASTRO_DEV_SERVER_APP_ID } from "../vite-plugin-app/index.js";
 import { baseMiddleware } from "./base.js";
@@ -137,6 +138,7 @@ async function createDevelopmentManifest(settings) {
     compressHTML: settings.config.compressHTML,
     assetsDir: settings.config.build.assets,
     serverLike: settings.buildOutput === "server",
+    middlewareMode: resolveMiddlewareMode(settings.adapter?.adapterFeatures),
     assets: /* @__PURE__ */ new Set(),
     entryModules: {},
     routes: [],
@@ -151,6 +153,8 @@ async function createDevelopmentManifest(settings) {
     inlinedScripts: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
+    actionBodySizeLimit: settings.config.security?.actionBodySizeLimit ? settings.config.security.actionBodySizeLimit : 1024 * 1024,
+    // 1mb default
     key: hasEnvironmentKey() ? getEnvironmentKey() : createKey(),
     middleware() {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.0-beta.16",
+  "version": "6.0.0-beta.17",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -151,9 +151,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/markdown-remark": "7.0.0-beta.7",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/internal-helpers": "0.8.0-beta.1"
+    "@astrojs/internal-helpers": "0.8.0-beta.1",
+    "@astrojs/markdown-remark": "7.0.0-beta.8",
+    "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"