astro 6.0.0-beta.19 → 6.0.0-beta.20

package/components/ClientRouter.astro

@@ -115,14 +115,14 @@ const { fallback = 'animate' } = Astro.props;
 			const form = el as HTMLFormElement;
 			const formData = new FormData(form, submitter);
 			// form.action and form.method can point to an <input name="action"> or <input name="method">
-			// in which case should fallback to the form attribute
+			// in which case should fall back to the form attribute
 			const formAction =
 				typeof form.action === 'string' ? form.action : form.getAttribute('action');
 			const formMethod =
 				typeof form.method === 'string' ? form.method : form.getAttribute('method');
-			// Use the form action, if defined, otherwise fallback to current path.
+			// Use the form action, if defined; otherwise, fall back to current path.
 			let action = submitter?.getAttribute('formaction') ?? formAction ?? location.pathname;
-			// Use the form method, if defined, otherwise fallback to "get"
+			// Use the form method, if defined; otherwise, fall back to "get"
 			const method = submitter?.getAttribute('formmethod') ?? formMethod ?? 'get';
 
 			// the "dialog" method is a special keyword used within <dialog> elements

package/dist/actions/runtime/server.js

@@ -9,6 +9,7 @@ import {
 } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { removeTrailingForwardSlash } from "../../core/path.js";
+import { BodySizeLimitError, readBodyWithLimit } from "../../core/request-body.js";
 import { ACTION_QUERY_PARAMS, ACTION_RPC_ROUTE_PATTERN } from "../consts.js";
 import {
   ActionError,
@@ -162,26 +163,36 @@ async function parseRequestBody(request, bodySizeLimit) {
       message: `Request body exceeds ${bodySizeLimit} bytes`
     });
   }
-  if (hasContentType(contentType, formContentTypes)) {
-    if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
-      const formRequest = new Request(request.url, {
-        method: request.method,
-        headers: request.headers,
-        body: toArrayBuffer(body)
-      });
-      return await formRequest.formData();
+  try {
+    if (hasContentType(contentType, formContentTypes)) {
+      if (!hasContentLength) {
+        const body = await readBodyWithLimit(request.clone(), bodySizeLimit);
+        const formRequest = new Request(request.url, {
+          method: request.method,
+          headers: request.headers,
+          body: toArrayBuffer(body)
+        });
+        return await formRequest.formData();
+      }
+      return await request.clone().formData();
     }
-    return await request.clone().formData();
-  }
-  if (hasContentType(contentType, ["application/json"])) {
-    if (contentLength === 0) return void 0;
-    if (!hasContentLength) {
-      const body = await readRequestBodyWithLimit(request.clone(), bodySizeLimit);
-      if (body.byteLength === 0) return void 0;
-      return JSON.parse(new TextDecoder().decode(body));
+    if (hasContentType(contentType, ["application/json"])) {
+      if (contentLength === 0) return void 0;
+      if (!hasContentLength) {
+        const body = await readBodyWithLimit(request.clone(), bodySizeLimit);
+        if (body.byteLength === 0) return void 0;
+        return JSON.parse(new TextDecoder().decode(body));
+      }
+      return await request.clone().json();
+    }
+  } catch (e) {
+    if (e instanceof BodySizeLimitError) {
+      throw new ActionError({
+        code: "CONTENT_TOO_LARGE",
+        message: `Request body exceeds ${bodySizeLimit} bytes`
+      });
     }
-    return await request.clone().json();
+    throw e;
   }
   throw new TypeError("Unsupported content type");
 }
@@ -323,33 +334,6 @@ function serializeActionResult(res) {
     body
   };
 }
-async function readRequestBodyWithLimit(request, limit) {
-  if (!request.body) return new Uint8Array();
-  const reader = request.body.getReader();
-  const chunks = [];
-  let received = 0;
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    if (value) {
-      received += value.byteLength;
-      if (received > limit) {
-        throw new ActionError({
-          code: "CONTENT_TOO_LARGE",
-          message: `Request body exceeds ${limit} bytes`
-        });
-      }
-      chunks.push(value);
-    }
-  }
-  const buffer = new Uint8Array(received);
-  let offset = 0;
-  for (const chunk of chunks) {
-    buffer.set(chunk, offset);
-    offset += chunk.byteLength;
-  }
-  return buffer;
-}
 function toArrayBuffer(buffer) {
   const copy = new Uint8Array(buffer.byteLength);
   copy.set(buffer);

package/dist/assets/fonts/providers/local.d.ts

@@ -7,7 +7,7 @@ type RawSource = string | URL | {
 };
 interface Variant extends FamilyProperties {
     /**
-     * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import or a URL. URLs are particularly useful if you inject local fonts through an integration.
+     * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import, or a URL. URLs are particularly useful if you inject local fonts through an integration.
      *
      * We recommend not putting your font files in [the `public/` directory](/en/reference/configuration-reference/#publicdir). Since Astro will copy these files into that folder at build time, this will result in duplicated files
      * in your build output. Instead, store them somewhere else in your project, such as in `src/`.

package/dist/assets/utils/imageKind.d.ts

@@ -3,14 +3,14 @@ import type { ImageMetadata, UnresolvedImageTransform } from '../types.js';
  * Determines if the given source is an ECMAScript Module (ESM) imported image.
  *
  * @param {ImageMetadata | string} src - The source to check. It can be an `ImageMetadata` object or a string.
- * @return {boolean} Returns `true` if the source is an `ImageMetadata` object, otherwise `false`.
+ * @return {boolean} Returns `true` if the source is an `ImageMetadata` object; otherwise, `false`.
  */
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 /**
  * Determines if the provided source is a remote image URL in the form of a string.
  *
  * @param {ImageMetadata | string} src - The source to check, which can either be an `ImageMetadata` object or a string.
- * @return {boolean} Returns `true` if the source is a string, otherwise `false`.
+ * @return {boolean} Returns `true` if the source is a string; otherwise, `false`.
  */
 export declare function isRemoteImage(src: ImageMetadata | string): src is string;
 /**

package/dist/assets/utils/resolveImports.d.ts

@@ -2,8 +2,8 @@
  * Resolves an image src from a content file (such as markdown) to a module ID or import that can be resolved by Vite.
  *
  * @param imageSrc The src attribute of an image tag
- * @param filePath The path to the file that contains the imagem relative to the site root
- * @returns A module id of the image that can be rsolved by Vite, or undefined if it is not a local image
+ * @param filePath The path to the file that contains the image relative to the site root
+ * @returns A module id of the image that can be resolved by Vite, or undefined if it is not a local image
  */
 export declare function imageSrcToImportId(imageSrc: string, filePath?: string): string | undefined;
 export declare const importIdToSymbolName: (importId: string) => string;

package/dist/assets/vite-plugin-assets.js

@@ -118,59 +118,64 @@ function assets({ fs, settings, sync, logger }) {
           id: new RegExp(`^(${RESOLVED_VIRTUAL_MODULE_ID})$`)
         },
         handler() {
+          const isServerEnvironment = isAstroServerEnvironment(this.environment);
+          const getImageExport = isServerEnvironment ? `import { getImage as getImageInternal } from "astro/assets";
+							export const getImage = async (options) => await getImageInternal(options, imageConfig);` : `import { AstroError, AstroErrorData } from "astro/errors";
+							export const getImage = async () => {
+								throw new AstroError(AstroErrorData.GetImageNotUsedOnServer);
+							};`;
           return {
             code: `
-						import { getConfiguredImageService as _getConfiguredImageService } from "astro/assets";
-						export { isLocalService } from "astro/assets";
-						import { getImage as getImageInternal } from "astro/assets";
-						${settings.config.image.responsiveStyles ? `import "${VIRTUAL_IMAGE_STYLES_ID}";` : ""}
-						export { default as Image } from "astro/components/${imageComponentPrefix}Image.astro";
-						export { default as Picture } from "astro/components/${imageComponentPrefix}Picture.astro";
-						import { inferRemoteSize as inferRemoteSizeInternal } from "astro/assets/utils/inferRemoteSize.js";
+				import { getConfiguredImageService as _getConfiguredImageService } from "astro/assets";
+				export { isLocalService } from "astro/assets";
+				${settings.config.image.responsiveStyles ? `import "${VIRTUAL_IMAGE_STYLES_ID}";` : ""}
+					export { default as Image } from "astro/components/${imageComponentPrefix}Image.astro";
+					export { default as Picture } from "astro/components/${imageComponentPrefix}Picture.astro";
+					import { inferRemoteSize as inferRemoteSizeInternal } from "astro/assets/utils/inferRemoteSize.js";
 
-							export { default as Font } from "astro/components/Font.astro";
-							export * from "${RUNTIME_VIRTUAL_MODULE_ID}";
-														
-							export const getConfiguredImageService = _getConfiguredImageService;
+					export { default as Font } from "astro/components/Font.astro";
+					export * from "${RUNTIME_VIRTUAL_MODULE_ID}";
 
-						export const viteFSConfig = ${JSON.stringify(resolvedConfig.server.fs ?? {})};
+					export const getConfiguredImageService = _getConfiguredImageService;
 
-						export const safeModulePaths = new Set(${JSON.stringify(
+					export const viteFSConfig = ${JSON.stringify(resolvedConfig.server.fs ?? {})};
+
+					export const safeModulePaths = new Set(${JSON.stringify(
               // @ts-expect-error safeModulePaths is internal to Vite
               Array.from(resolvedConfig.safeModulePaths ?? [])
             )});
 
-						export const fsDenyGlob = ${serializeFsDenyGlob(resolvedConfig.server.fs?.deny ?? [])};
+					export const fsDenyGlob = ${serializeFsDenyGlob(resolvedConfig.server.fs?.deny ?? [])};
 
-						const assetQueryParams = ${settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
+					const assetQueryParams = ${settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
               Array.from(settings.adapter.client.assetQueryParams.entries())
             )})` : "undefined"};
-						export const imageConfig = ${JSON.stringify(settings.config.image)};
-						Object.defineProperty(imageConfig, 'assetQueryParams', {
-							value: assetQueryParams,
-							enumerable: false,
-							configurable: true,
-						});
-						export const inferRemoteSize = async (url) => {
-							const service = await _getConfiguredImageService();
-							return service.getRemoteSize?.(url, imageConfig) ?? inferRemoteSizeInternal(url, imageConfig);
-						}
-						// This is used by the @astrojs/node integration to locate images.
-						// It's unused on other platforms, but on some platforms like Netlify (and presumably also Vercel)
-						// new URL("dist/...") is interpreted by the bundler as a signal to include that directory
-						// in the Lambda bundle, which would bloat the bundle with images.
-						// To prevent this, we mark the URL construction as pure,
-						// so that it's tree-shaken away for all platforms that don't need it.
-						export const outDir = /* #__PURE__ */ new URL(${JSON.stringify(
+					export const imageConfig = ${JSON.stringify(settings.config.image)};
+					Object.defineProperty(imageConfig, 'assetQueryParams', {
+						value: assetQueryParams,
+						enumerable: false,
+						configurable: true,
+					});
+					export const inferRemoteSize = async (url) => {
+						const service = await _getConfiguredImageService();
+						return service.getRemoteSize?.(url, imageConfig) ?? inferRemoteSizeInternal(url, imageConfig);
+					}
+					// This is used by the @astrojs/node integration to locate images.
+					// It's unused on other platforms, but on some platforms like Netlify (and presumably also Vercel)
+					// new URL("dist/...") is interpreted by the bundler as a signal to include that directory
+					// in the Lambda bundle, which would bloat the bundle with images.
+					// To prevent this, we mark the URL construction as pure,
+					// so that it's tree-shaken away for all platforms that don't need it.
+					export const outDir = /* #__PURE__ */ new URL(${JSON.stringify(
               new URL(
                 settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir
               )
             )});
-						export const serverDir = /* #__PURE__ */ new URL(${JSON.stringify(
+					export const serverDir = /* #__PURE__ */ new URL(${JSON.stringify(
               new URL(settings.config.build.server)
             )});
-						export const getImage = async (options) => await getImageInternal(options, imageConfig);
-					`
+					${getImageExport}
+				`
           };
         }
       },

package/dist/cli/index.js

@@ -75,7 +75,7 @@ async function runCommand(cmd, flags) {
         { getPackageManager },
         { StyledDebugInfoFormatter },
         { ClackPrompt },
-        { CliClipboard },
+        { TinyclipClipboard },
         { PassthroughTextStyler },
         { infoCommand }
       ] = await Promise.all([
@@ -88,7 +88,7 @@ async function runCommand(cmd, flags) {
         import("./info/core/get-package-manager.js"),
         import("./info/infra/styled-debug-info-formatter.js"),
         import("./info/infra/clack-prompt.js"),
-        import("./info/infra/cli-clipboard.js"),
+        import("./info/infra/tinyclip-clipboard.js"),
         import("./infra/passthrough-text-styler.js"),
         import("./info/core/info.js")
       ]);
@@ -108,10 +108,8 @@ async function runCommand(cmd, flags) {
         nodeVersionProvider
       });
       const prompt = new ClackPrompt({ force: flags.copy });
-      const clipboard = new CliClipboard({
-        commandExecutor,
+      const clipboard = new TinyclipClipboard({
         logger,
-        operatingSystemProvider,
         prompt
       });
       return await runner.run(infoCommand, {

package/dist/cli/info/infra/tinyclip-clipboard.d.ts

@@ -0,0 +1,10 @@
+import type { Logger } from '../../../core/logger/core.js';
+import type { Clipboard, Prompt } from '../definitions.js';
+export declare class TinyclipClipboard implements Clipboard {
+    #private;
+    constructor({ logger, prompt, }: {
+        logger: Logger;
+        prompt: Prompt;
+    });
+    copy(text: string): Promise<void>;
+}

package/dist/cli/info/infra/tinyclip-clipboard.js

@@ -0,0 +1,32 @@
+import { writeText } from "tinyclip";
+class TinyclipClipboard {
+  #logger;
+  #prompt;
+  constructor({
+    logger,
+    prompt
+  }) {
+    this.#logger = logger;
+    this.#prompt = prompt;
+  }
+  async copy(text) {
+    if (!await this.#prompt.confirm({
+      message: "Copy to clipboard?",
+      defaultValue: true
+    })) {
+      return;
+    }
+    try {
+      await writeText(text.trim());
+      this.#logger.info("SKIP_FORMAT", "Copied to clipboard!");
+    } catch {
+      this.#logger.error(
+        "SKIP_FORMAT",
+        "Sorry, something went wrong! Please copy the text above manually."
+      );
+    }
+  }
+}
+export {
+  TinyclipClipboard
+};

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.19";
+  version = "6.0.0-beta.20";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/index.d.ts

@@ -53,7 +53,7 @@ export type ContainerRenderOptions = {
      */
     params?: Record<string, string | undefined>;
     /**
-     * Useful if your component needs to access some locals without the use a middleware.
+     * Useful if your component needs to access some locals without the use of middleware.
      * ```js
      * container.renderToString(Component, { locals: { getSomeValue() {} } });
      * ```

package/dist/container/index.js

@@ -49,6 +49,7 @@ function createManifest(manifest, renderers, middleware) {
     checkOrigin: false,
     allowedDomains: manifest?.allowedDomains ?? [],
     actionBodySizeLimit: 1024 * 1024,
+    serverIslandBodySizeLimit: 1024 * 1024,
     middleware: manifest?.middleware ?? middlewareInstance,
     key: createKey(),
     csp: manifest?.csp,

package/dist/content/content-layer.js

@@ -189,7 +189,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.19") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-beta.20") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -197,8 +197,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.0.0-beta.19") {
-      this.#store.metaStore().set("astro-version", "6.0.0-beta.19");
+    if ("6.0.0-beta.20") {
+      this.#store.metaStore().set("astro-version", "6.0.0-beta.20");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/data-store.d.ts

@@ -7,7 +7,7 @@ export interface RenderedContent {
         imagePaths?: Array<string>;
         /** Any headings that are present in this file. */
         headings?: MarkdownHeading[];
-        /** Raw frontmatter, parsed parsed from the file. This may include data from remark plugins. */
+        /** Raw frontmatter, parsed from the file. This may include data from remark plugins. */
         frontmatter?: Record<string, any>;
         /** Any other metadata that is present in this file. */
         [key: string]: unknown;

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

@@ -34,7 +34,7 @@ export interface RenderOptions {
     /**
      * A custom fetch function for retrieving prerendered pages - 404 or 500.
      *
-     * If not provided, Astro will fallback to its default behavior for fetching error pages.
+     * If not provided, Astro will fall back to its default behavior for fetching error pages.
      *
      * When a dynamic route is matched but ultimately results in a 404, this function will be used
      * to fetch the prerendered 404 page if available. Similarly, it may be used to fetch a

package/dist/core/app/base.js

@@ -493,6 +493,8 @@ class BaseApp {
     const status = override?.status ? override.status : originalResponse.status === 200 ? newResponse.status : originalResponse.status;
     try {
       originalResponse.headers.delete("Content-type");
+      originalResponse.headers.delete("Content-Length");
+      originalResponse.headers.delete("Transfer-Encoding");
     } catch {
     }
     const newHeaders = new Headers();

package/dist/core/app/dev/pipeline.js

@@ -35,7 +35,9 @@ class NonRunnablePipeline extends Pipeline {
     );
     if (queueRenderingEnabled(manifest.experimentalQueuedRendering)) {
       pipeline.nodePool = newNodePool(manifest.experimentalQueuedRendering);
-      pipeline.htmlStringCache = new HTMLStringCache(1e3);
+      if (manifest.experimentalQueuedRendering.contentCache) {
+        pipeline.htmlStringCache = new HTMLStringCache(1e3);
+      }
     }
     return pipeline;
   }

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

@@ -9,5 +9,4 @@ export declare function deserializeRouteData(rawRouteData: SerializedRouteData):
 export declare function serializeRouteInfo(routeInfo: RouteInfo, trailingSlash: AstroConfig['trailingSlash']): SerializedRouteInfo;
 export declare function deserializeRouteInfo(rawRouteInfo: SerializedRouteInfo): RouteInfo;
 export declare function queuePoolSize(config: NonNullable<SSRManifest['experimentalQueuedRendering']>): number;
-export declare function queueContentCache(config: NonNullable<SSRManifest['experimentalQueuedRendering']>): boolean;
 export declare function queueRenderingEnabled(config: SSRManifest['experimentalQueuedRendering']): boolean;

package/dist/core/app/manifest.js

@@ -101,9 +101,6 @@ function deserializeRouteInfo(rawRouteInfo) {
 function queuePoolSize(config) {
   return config?.poolSize ?? 1e3;
 }
-function queueContentCache(config) {
-  return config?.contentCache ?? false;
-}
 function queueRenderingEnabled(config) {
   return config?.enabled ?? false;
 }
@@ -111,7 +108,6 @@ export {
   deserializeManifest,
   deserializeRouteData,
   deserializeRouteInfo,
-  queueContentCache,
   queuePoolSize,
   queueRenderingEnabled,
   serializeRouteData,

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

@@ -25,9 +25,11 @@ interface NodeRequest extends IncomingMessage {
  * })
  * ```
  */
-export declare function createRequest(req: NodeRequest, { skipBody, allowedDomains, }?: {
+export declare function createRequest(req: NodeRequest, { skipBody, allowedDomains, bodySizeLimit, port: serverPort, }?: {
     skipBody?: boolean;
     allowedDomains?: Partial<RemotePattern>[];
+    bodySizeLimit?: number;
+    port?: number;
 }): Request;
 /**
  * Streams a web-standard Response into a NodeJS Server Response.

package/dist/core/app/node.js

@@ -7,7 +7,9 @@ import { App } from "./app.js";
 import { validateForwardedHeaders, validateHost } from "./validate-headers.js";
 function createRequest(req, {
   skipBody = false,
-  allowedDomains = []
+  allowedDomains = [],
+  bodySizeLimit,
+  port: serverPort
 } = {}) {
   const controller = new AbortController();
   const isEncrypted = "encrypted" in req.socket && req.socket.encrypted;
@@ -29,7 +31,7 @@ function createRequest(req, {
     allowedDomains
   );
   const hostname = validated.host ?? validatedHostname ?? "localhost";
-  const port = validated.port;
+  const port = validated.port ?? (!validated.host && !validatedHostname && serverPort ? String(serverPort) : void 0);
   let url;
   try {
     const hostnamePort = getHostnamePort(hostname, port);
@@ -45,7 +47,7 @@ function createRequest(req, {
   };
   const bodyAllowed = options.method !== "HEAD" && options.method !== "GET" && skipBody === false;
   if (bodyAllowed) {
-    Object.assign(options, makeRequestBody(req));
+    Object.assign(options, makeRequestBody(req, bodySizeLimit));
   }
   const request = new Request(url, options);
   const socket = getRequestSocket(req);
@@ -210,7 +212,7 @@ function makeRequestHeaders(req) {
   }
   return headers;
 }
-function makeRequestBody(req) {
+function makeRequestBody(req, bodySizeLimit) {
   if (req.body !== void 0) {
     if (typeof req.body === "string" && req.body.length > 0) {
       return { body: Buffer.from(req.body) };
@@ -219,23 +221,35 @@ function makeRequestBody(req) {
       return { body: Buffer.from(JSON.stringify(req.body)) };
     }
     if (typeof req.body === "object" && req.body !== null && typeof req.body[Symbol.asyncIterator] !== "undefined") {
-      return asyncIterableToBodyProps(req.body);
+      return asyncIterableToBodyProps(req.body, bodySizeLimit);
     }
   }
-  return asyncIterableToBodyProps(req);
+  return asyncIterableToBodyProps(req, bodySizeLimit);
 }
-function asyncIterableToBodyProps(iterable) {
+function asyncIterableToBodyProps(iterable, bodySizeLimit) {
+  const source = bodySizeLimit != null ? limitAsyncIterable(iterable, bodySizeLimit) : iterable;
   return {
     // Node uses undici for the Request implementation. Undici accepts
     // a non-standard async iterable for the body.
     // @ts-expect-error
-    body: iterable,
+    body: source,
     // The duplex property is required when using a ReadableStream or async
     // iterable for the body. The type definitions do not include the duplex
     // property because they are not up-to-date.
     duplex: "half"
   };
 }
+async function* limitAsyncIterable(iterable, limit) {
+  let received = 0;
+  for await (const chunk of iterable) {
+    const byteLength = chunk instanceof Uint8Array ? chunk.byteLength : typeof chunk === "string" ? Buffer.byteLength(chunk) : 0;
+    received += byteLength;
+    if (received > limit) {
+      throw new Error(`Body size limit exceeded: received more than ${limit} bytes`);
+    }
+    yield chunk;
+  }
+}
 function getAbortControllerCleanup(req) {
   if (!req) return void 0;
   const cleanup = Reflect.get(req, nodeRequestAbortControllerCleanupSymbol);

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

@@ -64,7 +64,7 @@ export type SSRManifest = {
         enabled: boolean;
         /** Node pool size for memory reuse (default: 1000, set to 0 to disable pooling) */
         poolSize?: number;
-        /** Whether to enable HTMLString caching (default: true) */
+        /** Whether to enable HTMLString caching for deduplicating repeated HTML fragments (default: true) */
         contentCache?: boolean;
     };
     assetsPrefix?: AssetsPrefix;
@@ -106,6 +106,7 @@ export type SSRManifest = {
     checkOrigin: boolean;
     allowedDomains?: Partial<RemotePattern>[];
     actionBodySizeLimit: number;
+    serverIslandBodySizeLimit: number;
     sessionConfig?: SSRManifestSession;
     cacheConfig?: SSRManifestCache;
     cacheDir: URL;

package/dist/core/app/validate-headers.d.ts

@@ -1,7 +1,7 @@
 import { type RemotePattern } from '@astrojs/internal-helpers/remote';
 /**
  * Validate a host against allowedDomains.
- * Returns the host only if it matches an allowed pattern, otherwise undefined.
+ * Returns the host only if it matches an allowed pattern; otherwise, undefined.
  * This prevents SSRF attacks by ensuring the Host header is trusted.
  */
 export declare function validateHost(host: string | undefined, protocol: string, allowedDomains?: Partial<RemotePattern>[]): string | undefined;

package/dist/core/app/validate-headers.js

@@ -50,8 +50,6 @@ function validateForwardedHeaders(forwardedProtocol, forwardedHost, forwardedPor
       } else if (/^https?$/.test(forwardedProtocol)) {
         result.protocol = forwardedProtocol;
       }
-    } else if (/^https?$/.test(forwardedProtocol)) {
-      result.protocol = forwardedProtocol;
     }
   }
   if (forwardedPort && allowedDomains && allowedDomains.length > 0) {

package/dist/core/base-pipeline.d.ts

@@ -130,7 +130,7 @@ export declare abstract class Pipeline {
     getServerIslands(): Promise<ServerIslandMappings>;
     getAction(path: string): Promise<ActionClient<unknown, ActionAccept, $ZodType>>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
-    createNodePool(poolSize: number, contentCache: boolean, stats: boolean): NodePool;
+    createNodePool(poolSize: number, stats: boolean): NodePool;
     createStringCache(): HTMLStringCache;
 }
 export interface HeadElements extends Pick<SSRResult, 'scripts' | 'styles' | 'links'> {

package/dist/core/base-pipeline.js

@@ -41,7 +41,6 @@ class Pipeline {
     if (manifest.experimentalQueuedRendering.enabled) {
       this.nodePool = this.createNodePool(
         manifest.experimentalQueuedRendering.poolSize ?? 1e3,
-        manifest.experimentalQueuedRendering.contentCache ?? false,
         false
       );
       if (manifest.experimentalQueuedRendering.contentCache) {
@@ -172,8 +171,8 @@ class Pipeline {
       );
     }
   }
-  createNodePool(poolSize, contentCache, stats) {
-    return new NodePool(poolSize, contentCache, stats);
+  createNodePool(poolSize, stats) {
+    return new NodePool(poolSize, stats);
   }
   createStringCache() {
     return new HTMLStringCache(1e3);

package/dist/core/build/common.d.ts

@@ -4,7 +4,7 @@ import type { RouteData } from '../../types/public/internal.js';
 export declare function getOutFolder(astroSettings: AstroSettings, pathname: string, routeData: RouteData): URL;
 export declare function getOutFile(buildFormat: NonNullable<AstroConfig['build']>['format'], outFolder: URL, pathname: string, routeData: RouteData): URL;
 /**
- * Ensures the `outDir` is within `process.cwd()`. If not it will fallback to `<cwd>/.astro`.
+ * Ensures the `outDir` is within `process.cwd()`. If not it will fall back to `<cwd>/.astro`.
  * This is used for static `ssrBuild` so the output can access node_modules when we import
  * the output files. A hardcoded fallback dir is fine as it would be cleaned up after build.
  */

package/dist/core/build/pipeline.js

@@ -37,7 +37,9 @@ class BuildPipeline extends Pipeline {
     this.defaultRoutes = defaultRoutes;
     if (queueRenderingEnabled(this.manifest.experimentalQueuedRendering)) {
       this.nodePool = newNodePool(this.manifest.experimentalQueuedRendering);
-      this.htmlStringCache = new HTMLStringCache(1e3);
+      if (this.manifest.experimentalQueuedRendering.contentCache) {
+        this.htmlStringCache = new HTMLStringCache(1e3);
+      }
     }
   }
   internals;