astro 5.12.2 → 5.12.4

package/components/image.css

@@ -3,9 +3,9 @@
 	object-position: var(--pos);
 	height: auto;
 }
-:where([data-astro-image='full-width']) {
+:where([data-astro-image="full-width"]) {
 	width: 100%;
 }
-:where([data-astro-image='constrained']) {
+:where([data-astro-image="constrained"]) {
 	max-width: 100%;
 }

package/dist/assets/build/remote.d.ts

@@ -5,7 +5,7 @@ export type RemoteCacheEntry = {
     lastModified?: string;
 };
 export declare function loadRemoteImage(src: string): Promise<{
-    data: Buffer;
+    data: Buffer<ArrayBuffer>;
     expires: number;
     etag: string | undefined;
     lastModified: string | undefined;
@@ -23,7 +23,7 @@ export declare function revalidateRemoteImage(src: string, revalidationData: {
     etag?: string;
     lastModified?: string;
 }): Promise<{
-    data: Buffer;
+    data: Buffer<ArrayBuffer>;
     expires: number;
     etag: string | undefined;
     lastModified: string | undefined;

package/dist/assets/fonts/config.d.ts

@@ -16,7 +16,7 @@ export declare const fontProviderSchema: z.ZodObject<{
     entrypoint: string | URL;
     config?: Record<string, any> | undefined;
 }>;
-export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+export declare const localFontFamilySchema: z.ZodObject<{
     /**
      * The font family name, as identified by your font provider.
      */
@@ -25,7 +25,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
      * A valid [ident](https://developer.mozilla.org/en-US/docs/Web/CSS/ident) in the form of a CSS variable (i.e. starting with `--`).
      */
     cssVariable: z.ZodString;
-}, {
+} & {
     /**
      * @default `["sans-serif"]`
      *
@@ -51,7 +51,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
      * Whether or not to enable optimized fallback generation. You may disable this default optimization to have full control over `fallbacks`.
      */
     optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-}>, {
+} & {
     /**
      * The source of your font files. Set to `"local"` to use local font files.
      */
@@ -59,7 +59,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
     /**
      * Each variant represents a [`@font-face` declaration](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/).
      */
-    variants: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
+    variants: z.ZodArray<z.ZodObject<{
         /**
          * A [font weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
          *
@@ -90,7 +90,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
          * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
          */
         variationSettings: z.ZodOptional<z.ZodString>;
-    }, {
+    } & {
         /**
          * 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.
          */
@@ -108,7 +108,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
          * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
          */
         unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-    }>, "strict", z.ZodTypeAny, {
+    }, "strict", z.ZodTypeAny, {
         src: [string | URL | {
             url: string | URL;
             tech?: string | undefined;
@@ -139,7 +139,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
         variationSettings?: string | undefined;
         unicodeRange?: [string, ...string[]] | undefined;
     }>, "atleastone">;
-}>, "strict", z.ZodTypeAny, {
+}, "strict", z.ZodTypeAny, {
     name: string;
     cssVariable: string;
     provider: "local";
@@ -214,7 +214,7 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
     fallbacks?: string[] | undefined;
     optimizedFallbacks?: boolean | undefined;
 }>;
-export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+export declare const remoteFontFamilySchema: z.ZodObject<{
     /**
      * The font family name, as identified by your font provider.
      */
@@ -223,7 +223,7 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
      * A valid [ident](https://developer.mozilla.org/en-US/docs/Web/CSS/ident) in the form of a CSS variable (i.e. starting with `--`).
      */
     cssVariable: z.ZodString;
-}, Omit<{
+} & Omit<{
     /**
      * A [font weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
      *
@@ -254,7 +254,7 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
      * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
      */
     variationSettings: z.ZodOptional<z.ZodString>;
-}, "weight" | "style">>, {
+}, "weight" | "style"> & {
     /**
      * @default `["sans-serif"]`
      *
@@ -280,7 +280,7 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
      * Whether or not to enable optimized fallback generation. You may disable this default optimization to have full control over `fallbacks`.
      */
     optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-}>, {
+} & {
     /**
      * The source of your font files. You can use a built-in provider or write your own custom provider.
      */
@@ -326,7 +326,7 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
      * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
      */
     unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-}>, "strict", z.ZodTypeAny, {
+}, "strict", z.ZodTypeAny, {
     name: string;
     cssVariable: string;
     provider: {

package/dist/assets/internal.js

@@ -57,14 +57,12 @@ async function getImage(options, imageConfig) {
   };
   let originalWidth;
   let originalHeight;
-  let originalFormat;
   if (options.inferSize && isRemoteImage(resolvedOptions.src) && isRemotePath(resolvedOptions.src)) {
     const result = await inferRemoteSize(resolvedOptions.src);
     resolvedOptions.width ??= result.width;
     resolvedOptions.height ??= result.height;
     originalWidth = result.width;
     originalHeight = result.height;
-    originalFormat = result.format;
     delete resolvedOptions.inferSize;
   }
   const originalFilePath = isESMImportedImage(resolvedOptions.src) ? resolvedOptions.src.fsPath : void 0;
@@ -75,7 +73,6 @@ async function getImage(options, imageConfig) {
   if (isESMImportedImage(clonedSrc)) {
     originalWidth = clonedSrc.width;
     originalHeight = clonedSrc.height;
-    originalFormat = clonedSrc.format;
   }
   if (originalWidth && originalHeight) {
     const aspectRatio = originalWidth / originalHeight;
@@ -121,12 +118,12 @@ async function getImage(options, imageConfig) {
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
   const srcSetTransforms = service.getSrcSet ? await service.getSrcSet(validatedOptions, imageConfig) : [];
   let imageURL = await service.getURL(validatedOptions, imageConfig);
-  const matchesOriginal = (transform) => transform.width === originalWidth && transform.height === originalHeight && transform.format === originalFormat;
+  const matchesValidatedTransform = (transform) => transform.width === validatedOptions.width && transform.height === validatedOptions.height && transform.format === validatedOptions.format;
   let srcSets = await Promise.all(
     srcSetTransforms.map(async (srcSet) => {
       return {
         transform: srcSet.transform,
-        url: matchesOriginal(srcSet.transform) ? imageURL : await service.getURL(srcSet.transform, imageConfig),
+        url: matchesValidatedTransform(srcSet.transform) ? imageURL : await service.getURL(srcSet.transform, imageConfig),
         descriptor: srcSet.descriptor,
         attributes: srcSet.attributes
       };
@@ -142,7 +139,7 @@ async function getImage(options, imageConfig) {
     srcSets = srcSetTransforms.map((srcSet) => {
       return {
         transform: srcSet.transform,
-        url: matchesOriginal(srcSet.transform) ? imageURL : globalThis.astroAsset.addStaticImage(srcSet.transform, propsToHash, originalFilePath),
+        url: matchesValidatedTransform(srcSet.transform) ? imageURL : globalThis.astroAsset.addStaticImage(srcSet.transform, propsToHash, originalFilePath),
         descriptor: srcSet.descriptor,
         attributes: srcSet.attributes
       };

package/dist/assets/utils/node/emitAsset.js

@@ -1,8 +1,35 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { generateContentHash } from "../../../core/encryption.js";
 import { prependForwardSlash, slash } from "../../../core/path.js";
 import { imageMetadata } from "../metadata.js";
+const svgContentCache = /* @__PURE__ */ new WeakMap();
+const keyRegistry = /* @__PURE__ */ new Map();
+function keyFor(hash) {
+  let key = keyRegistry.get(hash);
+  if (!key) {
+    key = { hash };
+    keyRegistry.set(hash, key);
+  }
+  return key;
+}
+async function handleSvgDeduplication(fileData, filename, fileEmitter) {
+  const contentHash = await generateContentHash(fileData);
+  const key = keyFor(contentHash);
+  const existing = svgContentCache.get(key);
+  if (existing) {
+    return existing.handle;
+  } else {
+    const handle = fileEmitter({
+      name: filename,
+      source: fileData,
+      type: "asset"
+    });
+    svgContentCache.set(key, { handle, filename });
+    return handle;
+  }
+}
 async function emitESMImage(id, _watchMode, _experimentalSvgEnabled, fileEmitter) {
   if (!id) {
     return void 0;
@@ -29,11 +56,16 @@ async function emitESMImage(id, _watchMode, _experimentalSvgEnabled, fileEmitter
     const pathname = decodeURI(url.pathname);
     const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
     try {
-      const handle = fileEmitter({
-        name: filename,
-        source: await fs.readFile(url),
-        type: "asset"
-      });
+      let handle;
+      if (fileMetadata.format === "svg") {
+        handle = await handleSvgDeduplication(fileData, filename, fileEmitter);
+      } else {
+        handle = fileEmitter({
+          name: filename,
+          source: fileData,
+          type: "asset"
+        });
+      }
       emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
     } catch {
       isBuild = false;
@@ -73,11 +105,16 @@ async function emitImageMetadata(id, fileEmitter) {
     const pathname = decodeURI(url.pathname);
     const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
     try {
-      const handle = fileEmitter({
-        name: filename,
-        source: await fs.readFile(url),
-        type: "asset"
-      });
+      let handle;
+      if (fileMetadata.format === "svg") {
+        handle = await handleSvgDeduplication(fileData, filename, fileEmitter);
+      } else {
+        handle = fileEmitter({
+          name: filename,
+          source: fileData,
+          type: "asset"
+        });
+      }
       emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
     } catch {
       isBuild = false;

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.12.2") {
+    if (previousAstroVersion && previousAstroVersion !== "5.12.4") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.12.2") {
-      await this.#store.metaStore().set("astro-version", "5.12.2");
+    if ("5.12.4") {
+      await this.#store.metaStore().set("astro-version", "5.12.4");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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

@@ -729,22 +729,22 @@ export declare const AstroConfigSchema: z.ZodObject<{
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         headingIdCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         preserveScriptOrder: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        fonts: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+        fonts: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
             name: z.ZodString;
             cssVariable: z.ZodString;
-        }, {
+        } & {
             fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-        }>, {
+        } & {
             provider: z.ZodLiteral<"local">;
-            variants: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
+            variants: z.ZodArray<z.ZodObject<{
                 weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
                 style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
                 display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
                 stretch: z.ZodOptional<z.ZodString>;
                 featureSettings: z.ZodOptional<z.ZodString>;
                 variationSettings: z.ZodOptional<z.ZodString>;
-            }, {
+            } & {
                 src: z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>, z.ZodObject<{
                     url: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
                     tech: z.ZodOptional<z.ZodString>;
@@ -756,7 +756,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                     tech?: string | undefined;
                 }>]>, "atleastone">;
                 unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-            }>, "strict", z.ZodTypeAny, {
+            }, "strict", z.ZodTypeAny, {
                 src: [string | URL | {
                     url: string | URL;
                     tech?: string | undefined;
@@ -787,7 +787,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 variationSettings?: string | undefined;
                 unicodeRange?: [string, ...string[]] | undefined;
             }>, "atleastone">;
-        }>, "strict", z.ZodTypeAny, {
+        }, "strict", z.ZodTypeAny, {
             name: string;
             cssVariable: string;
             provider: "local";
@@ -861,20 +861,20 @@ export declare const AstroConfigSchema: z.ZodObject<{
             }[]];
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
-        }>, z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+        }>, z.ZodObject<{
             name: z.ZodString;
             cssVariable: z.ZodString;
-        }, Omit<{
+        } & Omit<{
             weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
             style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
             display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
             stretch: z.ZodOptional<z.ZodString>;
             featureSettings: z.ZodOptional<z.ZodString>;
             variationSettings: z.ZodOptional<z.ZodString>;
-        }, "weight" | "style">>, {
+        }, "weight" | "style"> & {
             fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-        }>, {
+        } & {
             provider: z.ZodObject<{
                 entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
                 config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -889,7 +889,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
             subsets: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
             unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-        }>, "strict", z.ZodTypeAny, {
+        }, "strict", z.ZodTypeAny, {
             name: string;
             cssVariable: string;
             provider: {

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

@@ -1,13 +1,7 @@
 import type { OutgoingHttpHeaders } from 'node:http';
 import { z } from 'zod';
-export declare function createRelativeSchema(cmd: string, fileProtocolRoot: string): z.ZodEffects<z.ZodObject<z.objectUtil.extendShape<{
-    root: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    srcDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    publicDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    outDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    cacheDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
+export declare function createRelativeSchema(cmd: string, fileProtocolRoot: string): z.ZodEffects<z.ZodObject<{
     site: z.ZodOptional<z.ZodString>;
-    compressHTML: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
     output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
@@ -41,72 +35,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             [k: string]: unknown;
         };
     }[], unknown>;
-    build: z.ZodDefault<z.ZodObject<{
-        format: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"file">, z.ZodLiteral<"directory">, z.ZodLiteral<"preserve">]>>>;
-        client: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-        server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-        assets: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        assetsPrefix: z.ZodUnion<[z.ZodOptional<z.ZodString>, z.ZodOptional<z.ZodIntersection<z.ZodObject<{
-            fallback: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            fallback: string;
-        }, {
-            fallback: string;
-        }>, z.ZodRecord<z.ZodString, z.ZodString>>>]>;
-        serverEntry: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        redirects: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        inlineStylesheets: z.ZodDefault<z.ZodOptional<z.ZodEnum<["always", "auto", "never"]>>>;
-        concurrency: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-    }, "strip", z.ZodTypeAny, {
-        redirects: boolean;
-        assets: string;
-        format: "preserve" | "file" | "directory";
-        client: URL;
-        server: URL;
-        serverEntry: string;
-        inlineStylesheets: "auto" | "never" | "always";
-        concurrency: number;
-        assetsPrefix?: string | ({
-            fallback: string;
-        } & Record<string, string>) | undefined;
-    }, {
-        redirects?: boolean | undefined;
-        assets?: string | undefined;
-        format?: "preserve" | "file" | "directory" | undefined;
-        client?: string | undefined;
-        server?: string | undefined;
-        serverEntry?: string | undefined;
-        inlineStylesheets?: "auto" | "never" | "always" | undefined;
-        concurrency?: number | undefined;
-        assetsPrefix?: string | ({
-            fallback: string;
-        } & Record<string, string>) | undefined;
-    }>>;
-    server: z.ZodEffects<z.ZodDefault<z.ZodObject<{
-        open: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
-        host: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodBoolean]>>>;
-        port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
-        headers: z.ZodOptional<z.ZodType<OutgoingHttpHeaders, z.ZodTypeDef, OutgoingHttpHeaders>>;
-        allowedHosts: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodArray<z.ZodString, "many">, z.ZodLiteral<true>]>>>;
-    }, "strip", z.ZodTypeAny, {
-        host: string | boolean;
-        port: number;
-        allowedHosts: true | string[];
-        open: string | boolean;
-        headers?: OutgoingHttpHeaders | undefined;
-    }, {
-        host?: string | boolean | undefined;
-        port?: number | undefined;
-        allowedHosts?: true | string[] | undefined;
-        headers?: OutgoingHttpHeaders | undefined;
-        open?: string | boolean | undefined;
-    }>>, {
-        host: string | boolean;
-        port: number;
-        allowedHosts: true | string[];
-        open: string | boolean;
-        headers?: OutgoingHttpHeaders | undefined;
-    }, unknown>;
     redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodObject<{
         status: z.ZodUnion<[z.ZodLiteral<300>, z.ZodLiteral<301>, z.ZodLiteral<302>, z.ZodLiteral<303>, z.ZodLiteral<304>, z.ZodLiteral<307>, z.ZodLiteral<308>]>;
         destination: z.ZodString;
@@ -651,22 +579,22 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         headingIdCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         preserveScriptOrder: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        fonts: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+        fonts: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
             name: z.ZodString;
             cssVariable: z.ZodString;
-        }, {
+        } & {
             fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-        }>, {
+        } & {
             provider: z.ZodLiteral<"local">;
-            variants: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
+            variants: z.ZodArray<z.ZodObject<{
                 weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
                 style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
                 display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
                 stretch: z.ZodOptional<z.ZodString>;
                 featureSettings: z.ZodOptional<z.ZodString>;
                 variationSettings: z.ZodOptional<z.ZodString>;
-            }, {
+            } & {
                 src: z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>, z.ZodObject<{
                     url: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
                     tech: z.ZodOptional<z.ZodString>;
@@ -678,7 +606,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                     tech?: string | undefined;
                 }>]>, "atleastone">;
                 unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-            }>, "strict", z.ZodTypeAny, {
+            }, "strict", z.ZodTypeAny, {
                 src: [string | URL | {
                     url: string | URL;
                     tech?: string | undefined;
@@ -709,7 +637,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
                 variationSettings?: string | undefined;
                 unicodeRange?: [string, ...string[]] | undefined;
             }>, "atleastone">;
-        }>, "strict", z.ZodTypeAny, {
+        }, "strict", z.ZodTypeAny, {
             name: string;
             cssVariable: string;
             provider: "local";
@@ -783,20 +711,20 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             }[]];
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
-        }>, z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+        }>, z.ZodObject<{
             name: z.ZodString;
             cssVariable: z.ZodString;
-        }, Omit<{
+        } & Omit<{
             weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
             style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
             display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
             stretch: z.ZodOptional<z.ZodString>;
             featureSettings: z.ZodOptional<z.ZodString>;
             variationSettings: z.ZodOptional<z.ZodString>;
-        }, "weight" | "style">>, {
+        }, "weight" | "style"> & {
             fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
-        }>, {
+        } & {
             provider: z.ZodObject<{
                 entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
                 config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -811,7 +739,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
             subsets: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
             unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
-        }>, "strict", z.ZodTypeAny, {
+        }, "strict", z.ZodTypeAny, {
             name: string;
             cssVariable: string;
             provider: {
@@ -1057,7 +985,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     }, {
         collections?: boolean | undefined;
     }>>;
-}, {
+} & {
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
     srcDir: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
     compressHTML: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -1134,7 +1062,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, unknown>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     outDir: import("url").URL;
     root: import("url").URL;
     build: {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.12.2";
+const ASTRO_VERSION = "5.12.4";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.12.2";
+  const currentVersion = "5.12.4";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/encryption.d.ts

@@ -34,3 +34,9 @@ export declare function decryptString(key: CryptoKey, encoded: string): Promise<
  * @param {CspAlgorithm} algorithm The algorithm to use.
  */
 export declare function generateCspDigest(data: string, algorithm: CspAlgorithm): Promise<CspHash>;
+/**
+ * Generate SHA-256 hash of buffer.
+ * @param {ArrayBuffer} data The buffer data to hash
+ * @returns {Promise<string>} A hex string of the first 16 characters of the SHA-256 hash
+ */
+export declare function generateContentHash(data: ArrayBuffer): Promise<string>;

package/dist/core/encryption.js

@@ -72,12 +72,18 @@ async function generateCspDigest(data, algorithm) {
   const hash = encodeBase64(new Uint8Array(hashBuffer));
   return `${ALGORITHMS[algorithm]}${hash}`;
 }
+async function generateContentHash(data) {
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+  const hashArray = new Uint8Array(hashBuffer);
+  return encodeBase64(hashArray);
+}
 export {
   createKey,
   decodeKey,
   decryptString,
   encodeKey,
   encryptString,
+  generateContentHash,
   generateCspDigest,
   getEnvironmentKey,
   hasEnvironmentKey

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.12.2";
+  const version = "5.12.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.12.2"}`
+        `v${"5.12.4"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/sequence.js

@@ -54,6 +54,7 @@ function sequence(...handlers) {
             handleContext.url = new URL(newRequest.url);
             handleContext.cookies = new AstroCookies(newRequest);
             handleContext.params = getParams(routeData, pathname);
+            handleContext.routePattern = routeData.route;
             setOriginPathname(
               handleContext.request,
               oldPathname,

package/dist/core/server-islands/vite-plugin-server-islands.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { AstroPluginOptions } from '../../types/astro.js';
 export declare const VIRTUAL_ISLAND_MAP_ID = "@astro-server-islands";
-export declare function vitePluginServerIslands({ settings, logger }: AstroPluginOptions): VitePlugin;
+export declare function vitePluginServerIslands({ settings }: AstroPluginOptions): VitePlugin;

package/dist/core/server-islands/vite-plugin-server-islands.js

@@ -1,8 +1,9 @@
 import MagicString from "magic-string";
+import { AstroError, AstroErrorData } from "../errors/index.js";
 const VIRTUAL_ISLAND_MAP_ID = "@astro-server-islands";
 const RESOLVED_VIRTUAL_ISLAND_MAP_ID = "\0" + VIRTUAL_ISLAND_MAP_ID;
 const serverIslandPlaceholder = "'$$server-islands$$'";
-function vitePluginServerIslands({ settings, logger }) {
+function vitePluginServerIslands({ settings }) {
   let command = "serve";
   let viteServer = null;
   const referenceIdMap = /* @__PURE__ */ new Map();
@@ -32,10 +33,7 @@ function vitePluginServerIslands({ settings, logger }) {
       for (const comp of astro.serverComponents) {
         if (!settings.serverIslandNameMap.has(comp.resolvedPath)) {
           if (!settings.adapter) {
-            logger.error(
-              "islands",
-              "You tried to render a server island without an adapter added to your project. An adapter is required to use the `server:defer` attribute on any component. Your project will fail to build unless you add an adapter or remove the attribute."
-            );
+            throw new AstroError(AstroErrorData.NoAdapterInstalledServerIslands);
           }
           let name = comp.localName;
           let idx = 1;

package/dist/runtime/server/render/page.js

@@ -22,7 +22,7 @@ async function renderPage(result, componentFactory, props, children, streaming,
       ["Content-Type", "text/html"],
       ["Content-Length", bytes.byteLength.toString()]
     ]);
-    if (result.cspDestination === "header" || result.cspDestination === "adapter") {
+    if (result.shouldInjectCspMetaTags && (result.cspDestination === "header" || result.cspDestination === "adapter")) {
       headers2.set("content-security-policy", renderCspContent(result));
     }
     return new Response(bytes, {

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

@@ -13,6 +13,7 @@ function astro({ settings, logger }) {
   let astroFileToCompileMetadata = /* @__PURE__ */ new Map();
   const srcRootWeb = config.srcDir.pathname.slice(config.root.pathname.length - 1);
   const isBrowserPath = (path) => path.startsWith(srcRootWeb) && srcRootWeb !== "/";
+  const notAstroComponent = (component) => !component.resolvedPath.endsWith(".astro");
   const prePlugin = {
     name: "astro:build",
     enforce: "pre",
@@ -170,8 +171,10 @@ File: ${id}`
       const filename = normalizePath(parsedId.filename);
       const transformResult = await compile(source, filename);
       const astroMetadata = {
-        clientOnlyComponents: transformResult.clientOnlyComponents,
-        hydratedComponents: transformResult.hydratedComponents,
+        // Remove Astro components that have been mistakenly given client directives
+        // We'll warn the user about this later, but for now we'll prevent them from breaking the build
+        clientOnlyComponents: transformResult.clientOnlyComponents.filter(notAstroComponent),
+        hydratedComponents: transformResult.hydratedComponents.filter(notAstroComponent),
         serverComponents: transformResult.serverComponents,
         scripts: transformResult.scripts,
         containsHead: transformResult.containsHead,

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

@@ -138,6 +138,42 @@ async function handleRoute({
   let statusCode = 200;
   let isReroute = false;
   let isRewrite = false;
+  async function renderError(err, skipMiddleware) {
+    const custom500 = getCustom500Route(routesList);
+    if (!custom500) {
+      throw err;
+    }
+    try {
+      const filePath500 = new URL(`./${custom500.component}`, config.root);
+      const preloaded500Component = await pipeline.preload(custom500, filePath500);
+      renderContext = await RenderContext.create({
+        locals,
+        pipeline,
+        pathname,
+        middleware: skipMiddleware ? void 0 : middleware,
+        request,
+        routeData: route,
+        clientAddress: incomingRequest.socket.remoteAddress,
+        actions
+      });
+      renderContext.props.error = err;
+      const _response = await renderContext.render(preloaded500Component);
+      logger.error("router", err.stack || err.message);
+      statusCode = 500;
+      return _response;
+    } catch (_err) {
+      if (isAstroError(_err) && [
+        AstroErrorData.MiddlewareNoDataOrNextCalled.name,
+        AstroErrorData.MiddlewareNotAResponse.name
+      ].includes(_err.name)) {
+        throw _err;
+      }
+      if (skipMiddleware === false) {
+        return renderError(_err, true);
+      }
+      throw _err;
+    }
+  }
   try {
     response = await renderContext.render(mod);
     isReroute = response.headers.has(REROUTE_DIRECTIVE_HEADER);
@@ -152,16 +188,7 @@ async function handleRoute({
       !response.headers.has(NOOP_MIDDLEWARE_HEADER) && !isReroute ? response.status : statusCodedMatched ?? response.status
     );
   } catch (err) {
-    const custom500 = getCustom500Route(routesList);
-    if (!custom500) {
-      throw err;
-    }
-    logger.error("router", err.stack || err.message);
-    const filePath500 = new URL(`./${custom500.component}`, config.root);
-    const preloaded500Component = await pipeline.preload(custom500, filePath500);
-    renderContext.props.error = err;
-    response = await renderContext.render(preloaded500Component);
-    statusCode = 500;
+    response = await renderError(err, false);
   } finally {
     renderContext.session?.[PERSIST_SYMBOL]();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.12.2",
+  "version": "5.12.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -155,12 +155,12 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
     "yocto-spinner": "^0.2.1",
-    "zod": "^3.24.2",
+    "zod": "^3.24.4",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/markdown-remark": "6.3.3"
+    "@astrojs/markdown-remark": "6.3.3",
+    "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"

package/templates/env.mjs

@@ -14,7 +14,6 @@ import {
 /** @returns {string} */
 // used while generating the virtual module
 // biome-ignore lint/correctness/noUnusedFunctionParameters: `key` is used by the generated code
-// biome-ignore lint/correctness/noUnusedVariables: `key` is used by the generated code
 const getEnv = (key) => {
 	// @@GET_ENV@@
 };