astro 5.3.1 → 5.4.1

package/components/Image.astro

@@ -1,7 +1,6 @@
 ---
 import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
 import type { UnresolvedImageTransform } from '../dist/assets/types';
-import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
 
@@ -46,14 +45,7 @@ if (import.meta.env.DEV) {
 	additionalAttributes['data-image-component'] = 'true';
 }
 
-const { class: className, ...attributes } = useResponsive
-	? applyResponsiveAttributes({
-			layout,
-			image,
-			props,
-			additionalAttributes,
-		})
-	: { ...additionalAttributes, ...image.attributes };
+const { class: className, ...attributes } = { ...additionalAttributes, ...image.attributes };
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}

package/components/Picture.astro

@@ -1,8 +1,7 @@
 ---
 import { type LocalImageProps, type RemoteImageProps, getImage, imageConfig } from 'astro:assets';
 import * as mime from 'mrmime';
-import { applyResponsiveAttributes } from '../dist/assets/utils/imageAttributes';
-import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind';
+import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind.js';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type {
 	GetImageResult,
@@ -101,18 +100,14 @@ if (fallbackImage.srcSet.values.length > 0) {
 	imgAdditionalAttributes.srcset = fallbackImage.srcSet.attribute;
 }
 
-const { class: className, ...attributes } = useResponsive
-	? applyResponsiveAttributes({
-			layout,
-			image: fallbackImage,
-			props,
-			additionalAttributes: imgAdditionalAttributes,
-		})
-	: { ...imgAdditionalAttributes, ...fallbackImage.attributes };
-
 if (import.meta.env.DEV) {
 	imgAdditionalAttributes['data-image-component'] = 'true';
 }
+
+const { class: className, ...attributes } = {
+	...imgAdditionalAttributes,
+	...fallbackImage.attributes,
+};
 ---
 
 <picture {...pictureAttributes}>

package/dist/assets/endpoint/generic.js

@@ -1,9 +1,9 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 async function loadRemoteImage(src, headers) {
   try {
     const res = await fetch(src, {

package/dist/assets/endpoint/node.js

@@ -4,10 +4,10 @@ import { isAbsolute } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }

package/dist/assets/internal.js

@@ -11,6 +11,7 @@ import { isLocalService } from "./services/service.js";
 import {
   isImageMetadata
 } from "./types.js";
+import { addCSSVarsToStyle, cssFitValues } from "./utils/imageAttributes.js";
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
 import { inferRemoteSize } from "./utils/remoteProbe.js";
 async function getConfiguredImageService() {
@@ -108,6 +109,18 @@ async function getImage(options, imageConfig) {
     }
     delete resolvedOptions.priority;
     delete resolvedOptions.densities;
+    if (layout !== "none") {
+      resolvedOptions.style = addCSSVarsToStyle(
+        {
+          w: String(resolvedOptions.width),
+          h: String(resolvedOptions.height),
+          fit: cssFitValues.includes(resolvedOptions.fit ?? "") && resolvedOptions.fit,
+          pos: resolvedOptions.position
+        },
+        resolvedOptions.style
+      );
+      resolvedOptions["data-astro-image"] = layout;
+    }
   }
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
   const srcSetTransforms = service.getSrcSet ? await service.getSrcSet(validatedOptions, imageConfig) : [];

package/dist/assets/services/service.js

@@ -1,8 +1,8 @@
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, joinPaths } from "../../core/path.js";
 import { DEFAULT_HASH_PROPS, DEFAULT_OUTPUT_FORMAT, VALID_SUPPORTED_FORMATS } from "../consts.js";
 import { isESMImportedImage, isRemoteImage } from "../utils/imageKind.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 function isLocalService(service) {
   if (!service) {
     return false;

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

@@ -1,10 +1,2 @@
-import type { GetImageResult, ImageLayout, LocalImageProps, RemoteImageProps } from '../types.js';
+export declare const cssFitValues: string[];
 export declare function addCSSVarsToStyle(vars: Record<string, string | false | undefined>, styles?: string | Record<string, any>): string;
-export declare function applyResponsiveAttributes<T extends LocalImageProps<unknown> | RemoteImageProps<unknown>>({ layout, image, props, additionalAttributes, }: {
-    layout: Exclude<ImageLayout, 'none'>;
-    image: GetImageResult;
-    additionalAttributes: Record<string, any>;
-    props: T;
-}): {
-    [x: string]: any;
-};

package/dist/assets/utils/imageAttributes.js

@@ -1,4 +1,5 @@
 import { toStyleString } from "../../runtime/server/render/util.js";
+const cssFitValues = ["fill", "contain", "cover", "scale-down"];
 function addCSSVarsToStyle(vars, styles) {
   const cssVars = Object.entries(vars).filter(([_, value]) => value !== void 0 && value !== false).map(([key, value]) => `--${key}: ${value};`).join(" ");
   if (!styles) {
@@ -7,27 +8,7 @@ function addCSSVarsToStyle(vars, styles) {
   const style = typeof styles === "string" ? styles : toStyleString(styles);
   return `${cssVars} ${style}`;
 }
-const cssFitValues = ["fill", "contain", "cover", "scale-down"];
-function applyResponsiveAttributes({
-  layout,
-  image,
-  props,
-  additionalAttributes
-}) {
-  const attributes = { ...additionalAttributes, ...image.attributes };
-  attributes.style = addCSSVarsToStyle(
-    {
-      w: image.attributes.width ?? props.width ?? image.options.width,
-      h: image.attributes.height ?? props.height ?? image.options.height,
-      fit: cssFitValues.includes(props.fit ?? "") && props.fit,
-      pos: props.position
-    },
-    attributes.style
-  );
-  attributes["data-astro-image"] = layout;
-  return attributes;
-}
 export {
   addCSSVarsToStyle,
-  applyResponsiveAttributes
+  cssFitValues
 };

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

@@ -2,7 +2,7 @@ export { emitESMImage } from './node/emitAsset.js';
 export { isESMImportedImage, isRemoteImage } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
 export { getOrigQueryParams } from './queryParams.js';
-export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
 export { hashTransform, propsToFilename } from './transformToPath.js';
 export { inferRemoteSize } from './remoteProbe.js';
 export { makeSvgComponent } from './svg.js';
+export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';

package/dist/assets/utils/index.js

@@ -2,6 +2,9 @@ import { emitESMImage } from "./node/emitAsset.js";
 import { isESMImportedImage, isRemoteImage } from "./imageKind.js";
 import { imageMetadata } from "./metadata.js";
 import { getOrigQueryParams } from "./queryParams.js";
+import { hashTransform, propsToFilename } from "./transformToPath.js";
+import { inferRemoteSize } from "./remoteProbe.js";
+import { makeSvgComponent } from "./svg.js";
 import {
   isRemoteAllowed,
   matchHostname,
@@ -10,9 +13,6 @@ import {
   matchPort,
   matchProtocol
 } from "./remotePattern.js";
-import { hashTransform, propsToFilename } from "./transformToPath.js";
-import { inferRemoteSize } from "./remoteProbe.js";
-import { makeSvgComponent } from "./svg.js";
 export {
   emitESMImage,
   getOrigQueryParams,

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

@@ -1,13 +1,3 @@
-import type { AstroConfig } from '../../types/public/config.js';
-export type RemotePattern = {
-    hostname?: string;
-    pathname?: string;
-    protocol?: string;
-    port?: string;
-};
-export declare function matchPattern(url: URL, remotePattern: RemotePattern): boolean;
-export declare function matchPort(url: URL, port?: string): boolean;
-export declare function matchProtocol(url: URL, protocol?: string): boolean;
-export declare function matchHostname(url: URL, hostname?: string, allowWildcard?: boolean): boolean;
-export declare function matchPathname(url: URL, pathname?: string, allowWildcard?: boolean): boolean;
-export declare function isRemoteAllowed(src: string, { domains, remotePatterns, }: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>): boolean;
+import { type RemotePattern, isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol } from '@astrojs/internal-helpers/remote';
+export { isRemoteAllowed, matchHostname, matchPort, matchPathname, matchProtocol, matchPattern };
+export type { RemotePattern };

package/dist/assets/utils/remotePattern.js

@@ -1,51 +1,11 @@
-import { isRemotePath } from "@astrojs/internal-helpers/path";
-function matchPattern(url, remotePattern) {
-  return matchProtocol(url, remotePattern.protocol) && matchHostname(url, remotePattern.hostname, true) && matchPort(url, remotePattern.port) && matchPathname(url, remotePattern.pathname, true);
-}
-function matchPort(url, port) {
-  return !port || port === url.port;
-}
-function matchProtocol(url, protocol) {
-  return !protocol || protocol === url.protocol.slice(0, -1);
-}
-function matchHostname(url, hostname, allowWildcard) {
-  if (!hostname) {
-    return true;
-  } else if (!allowWildcard || !hostname.startsWith("*")) {
-    return hostname === url.hostname;
-  } else if (hostname.startsWith("**.")) {
-    const slicedHostname = hostname.slice(2);
-    return slicedHostname !== url.hostname && url.hostname.endsWith(slicedHostname);
-  } else if (hostname.startsWith("*.")) {
-    const slicedHostname = hostname.slice(1);
-    const additionalSubdomains = url.hostname.replace(slicedHostname, "").split(".").filter(Boolean);
-    return additionalSubdomains.length === 1;
-  }
-  return false;
-}
-function matchPathname(url, pathname, allowWildcard) {
-  if (!pathname) {
-    return true;
-  } else if (!allowWildcard || !pathname.endsWith("*")) {
-    return pathname === url.pathname;
-  } else if (pathname.endsWith("/**")) {
-    const slicedPathname = pathname.slice(0, -2);
-    return slicedPathname !== url.pathname && url.pathname.startsWith(slicedPathname);
-  } else if (pathname.endsWith("/*")) {
-    const slicedPathname = pathname.slice(0, -1);
-    const additionalPathChunks = url.pathname.replace(slicedPathname, "").split("/").filter(Boolean);
-    return additionalPathChunks.length === 1;
-  }
-  return false;
-}
-function isRemoteAllowed(src, {
-  domains = [],
-  remotePatterns = []
-}) {
-  if (!isRemotePath(src)) return false;
-  const url = new URL(src);
-  return domains.some((domain) => matchHostname(url, domain)) || remotePatterns.some((remotePattern) => matchPattern(url, remotePattern));
-}
+import {
+  isRemoteAllowed,
+  matchHostname,
+  matchPathname,
+  matchPattern,
+  matchPort,
+  matchProtocol
+} from "@astrojs/internal-helpers/remote";
 export {
   isRemoteAllowed,
   matchHostname,

package/dist/cli/dev/index.js

@@ -15,6 +15,10 @@ async function dev({ flags }) {
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
           ["--open", "Automatically open the app in the browser on server start"],
           ["--force", "Clear the content layer cache, forcing a full rebuild."],
+          [
+            "--allowed-hosts",
+            "Specify a comma-separated list of allowed hosts or allow any hostname."
+          ],
           ["--help (-h)", "See all available flags."]
         ]
       },

package/dist/cli/flags.js

@@ -15,7 +15,8 @@ function flagsToAstroInlineConfig(flags) {
     server: {
       port: typeof flags.port === "number" ? flags.port : void 0,
       host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
-      open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0
+      open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0,
+      allowedHosts: typeof flags.allowedHosts === "string" ? flags.allowedHosts.split(",") : typeof flags.allowedHosts === "boolean" && flags.allowedHosts === true ? flags.allowedHosts : []
     }
   };
 }

package/dist/cli/preview/index.js

@@ -13,6 +13,10 @@ async function preview({ flags }) {
           ["--host", `Listen on all addresses, including LAN and public addresses.`],
           ["--host <custom-address>", `Expose on a network IP address at <custom-address>`],
           ["--open", "Automatically open the app in the browser on server start"],
+          [
+            "--allowed-hosts",
+            "Specify a comma-separated list of allowed hosts or allow any hostname."
+          ],
           ["--help (-h)", "See all available flags."]
         ]
       },

package/dist/config/entrypoint.d.ts

@@ -2,6 +2,8 @@ import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
 import type { ImageServiceConfig } from '../types/public/index.js';
 export { defineConfig, getViteConfig } from './index.js';
 export { envField } from '../env/config.js';
+export { mergeConfig } from '../core/config/merge.js';
+export { validateConfig } from '../core/config/validate.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

package/dist/config/entrypoint.js

@@ -1,5 +1,7 @@
 import { defineConfig, getViteConfig } from "./index.js";
 import { envField } from "../env/config.js";
+import { mergeConfig } from "../core/config/merge.js";
+import { validateConfig } from "../core/config/validate.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",
@@ -16,6 +18,8 @@ export {
   defineConfig,
   envField,
   getViteConfig,
+  mergeConfig,
   passthroughImageService,
-  sharpImageService
+  sharpImageService,
+  validateConfig
 };

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -298,12 +298,17 @@ async function updateImageReferencesInBody(html, fileName) {
   for (const [_full, imagePath] of html.matchAll(CONTENT_LAYER_IMAGE_REGEX)) {
     try {
       const decodedImagePath = JSON.parse(imagePath.replaceAll(""", '"'));
-      const id = imageSrcToImportId(decodedImagePath.src, fileName);
-      const imported = imageAssetMap.get(id);
-      if (!id || imageObjects.has(id) || !imported) {
-        continue;
+      let image;
+      if (URL.canParse(decodedImagePath.src)) {
+        image = await getImage(decodedImagePath);
+      } else {
+        const id = imageSrcToImportId(decodedImagePath.src, fileName);
+        const imported = imageAssetMap.get(id);
+        if (!id || imageObjects.has(id) || !imported) {
+          continue;
+        }
+        image = await getImage({ ...decodedImagePath, src: imported });
       }
-      const image = await getImage({ ...decodedImagePath, src: imported });
       imageObjects.set(imagePath, image);
     } catch {
       throw new Error(`Failed to parse image reference: ${imagePath}`);

package/dist/core/app/index.js

@@ -115,7 +115,7 @@ class App {
     if (!pathname) {
       pathname = prependForwardSlash(this.removeBase(url.pathname));
     }
-    let routeData = matchRoute(pathname, this.#manifestData);
+    let routeData = matchRoute(decodeURI(pathname), this.#manifestData);
     if (!routeData || routeData.prerender) return void 0;
     return routeData;
   }

package/dist/core/build/generate.js

@@ -208,7 +208,7 @@ async function getPathsForRoute(route, mod, pipeline, builtPaths) {
       if (!builtPaths.has(removeTrailingForwardSlash(staticPath))) {
         return true;
       }
-      const matchedRoute = matchRoute(staticPath, options.routesList);
+      const matchedRoute = matchRoute(decodeURI(staticPath), options.routesList);
       return matchedRoute === route;
     });
     for (const staticPath of paths) {

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

@@ -7,6 +7,16 @@ export interface BuildOptions {
      * @default false
      */
     devOutput?: boolean;
+    /**
+     * Teardown the compiler WASM instance after build. This can improve performance when
+     * building once, but may cause a performance hit if building multiple times in a row.
+     *
+     * When building multiple projects in the same execution (e.g. during tests), disabling
+     * this option can greatly improve performance at the cost of some extra memory usage.
+     *
+     * @default true
+     */
+    teardownCompiler?: boolean;
 }
 /**
  * Builds your site for deployment. By default, this will generate static files and place them in a dist/ directory.

package/dist/core/config/merge.d.ts

@@ -1 +1,3 @@
-export declare function mergeConfig(defaults: Record<string, any>, overrides: Record<string, any>, isRoot?: boolean): Record<string, any>;
+import type { DeepPartial } from '../../type-utils.js';
+import type { AstroConfig, AstroInlineConfig } from '../../types/public/index.js';
+export declare function mergeConfig<C extends AstroConfig | AstroInlineConfig>(defaults: C, overrides: DeepPartial<C>): C;

package/dist/core/config/merge.js

@@ -47,8 +47,8 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
   }
   return merged;
 }
-function mergeConfig(defaults, overrides, isRoot = true) {
-  return mergeConfigRecursively(defaults, overrides, isRoot ? "" : ".");
+function mergeConfig(defaults, overrides) {
+  return mergeConfigRecursively(defaults, overrides, "");
 }
 export {
   mergeConfig

package/dist/core/config/schema.d.ts

@@ -48,6 +48,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         host: false;
         port: number;
         open: false;
+        allowedHosts: never[];
     };
     integrations: never[];
     markdown: Required<import("@astrojs/markdown-remark").AstroMarkdownOptions>;
@@ -164,19 +165,23 @@ export declare const AstroConfigSchema: z.ZodObject<{
         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;
     }, {
         headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
+        allowedHosts?: true | string[] | undefined;
         open?: string | boolean | undefined;
     }>>, {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, unknown>;
@@ -783,6 +788,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     server: {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         headers?: OutgoingHttpHeaders | undefined;
     };
@@ -1215,19 +1221,23 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         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;
     }, {
         headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
+        allowedHosts?: true | string[] | undefined;
         open?: string | boolean | undefined;
     }>>, {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         headers?: OutgoingHttpHeaders | undefined;
     }, unknown>;
@@ -1887,9 +1897,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         headers: z.ZodOptional<z.ZodType<OutgoingHttpHeaders, z.ZodTypeDef, OutgoingHttpHeaders>>;
         streaming: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        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;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
@@ -1897,11 +1909,13 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         headers?: OutgoingHttpHeaders | undefined;
         host?: string | boolean | undefined;
         port?: number | undefined;
+        allowedHosts?: true | string[] | undefined;
         open?: string | boolean | undefined;
         streaming?: boolean | undefined;
     }>>>, {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
@@ -1911,6 +1925,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server: {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
@@ -2256,6 +2271,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server: {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
@@ -2601,6 +2617,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server: {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;
@@ -2946,6 +2963,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     server: {
         host: string | boolean;
         port: number;
+        allowedHosts: true | string[];
         open: string | boolean;
         streaming: boolean;
         headers?: OutgoingHttpHeaders | undefined;

package/dist/core/config/schema.js

@@ -34,7 +34,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   server: {
     host: false,
     port: 4321,
-    open: false
+    open: false,
+    allowedHosts: []
   },
   integrations: [],
   markdown: markdownConfigDefaults,
@@ -112,7 +113,8 @@ const AstroConfigSchema = z.object({
       open: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.open),
       host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
       port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
-      headers: z.custom().optional()
+      headers: z.custom().optional(),
+      allowedHosts: z.union([z.array(z.string()), z.literal(true)]).optional().default(ASTRO_CONFIG_DEFAULTS.server.allowedHosts)
     }).default({})
   ),
   redirects: z.record(
@@ -447,7 +449,8 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
         host: z.union([z.string(), z.boolean()]).optional().default(ASTRO_CONFIG_DEFAULTS.server.host),
         port: z.number().optional().default(ASTRO_CONFIG_DEFAULTS.server.port),
         headers: z.custom().optional(),
-        streaming: z.boolean().optional().default(true)
+        streaming: z.boolean().optional().default(true),
+        allowedHosts: z.union([z.array(z.string()), z.literal(true)]).optional().default(ASTRO_CONFIG_DEFAULTS.server.allowedHosts)
       }).optional().default({})
     )
   }).transform((config) => {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.3.1";
+const ASTRO_VERSION = "5.4.1";
 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/container.js

@@ -28,7 +28,7 @@ async function createContainer({
   });
   const {
     base,
-    server: { host, headers, open: serverOpen }
+    server: { host, headers, open: serverOpen, allowedHosts }
   } = settings.config;
   const isServerOpenURL = typeof serverOpen == "string" && !isRestart;
   const isServerOpenBoolean = serverOpen && !isRestart;
@@ -41,7 +41,7 @@ async function createContainer({
   const mode = inlineConfig?.mode ?? "development";
   const viteConfig = await createVite(
     {
-      server: { host, headers, open },
+      server: { host, headers, open, allowedHosts },
       optimizeDeps: {
         include: rendererClientEntries
       }

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.3.1";
+  const currentVersion = "5.4.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/index.d.ts

@@ -1,13 +1,7 @@
 import type { AstroInlineConfig } from '../types/public/config.js';
+export { default as build } from './build/index.js';
 export { default as dev } from './dev/index.js';
 export { default as preview } from './preview/index.js';
-/**
- * Builds your site for deployment. By default, this will generate static files and place them in a dist/ directory.
- * If SSR is enabled, this will generate the necessary server files to serve your site.
- *
- * @experimental The JavaScript API is experimental
- */
-export declare const build: (inlineConfig: AstroInlineConfig) => Promise<void>;
 /**
  * Generates TypeScript types for all Astro modules. This sets up a `src/env.d.ts` file for type inferencing,
  * and defines the `astro:content` module for the Content Collections API.

package/dist/core/index.js

@@ -1,12 +1,11 @@
-import { default as _build } from "./build/index.js";
 import { default as _sync } from "./sync/index.js";
-import { default as default2 } from "./dev/index.js";
-import { default as default3 } from "./preview/index.js";
-const build = (inlineConfig) => _build(inlineConfig);
+import { default as default2 } from "./build/index.js";
+import { default as default3 } from "./dev/index.js";
+import { default as default4 } from "./preview/index.js";
 const sync = (inlineConfig) => _sync(inlineConfig);
 export {
-  build,
-  default2 as dev,
-  default3 as preview,
+  default2 as build,
+  default3 as dev,
+  default4 as preview,
   sync
 };

package/dist/core/messages.js

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

package/dist/core/preview/static-preview-server.js

@@ -19,7 +19,8 @@ async function createStaticPreviewServer(settings, logger) {
         host: settings.config.server.host,
         port: settings.config.server.port,
         headers: settings.config.server.headers,
-        open: settings.config.server.open
+        open: settings.config.server.open,
+        allowedHosts: settings.config.server.allowedHosts
       },
       plugins: [vitePluginAstroPreview(settings)]
     });

package/dist/core/routing/match.js

@@ -1,13 +1,12 @@
 import { redirectIsExternal } from "../redirects/render.js";
 import { SERVER_ISLAND_BASE_PREFIX, SERVER_ISLAND_COMPONENT } from "../server-islands/endpoint.js";
 function matchRoute(pathname, manifest) {
-  const decodedPathname = decodeURI(pathname);
   return manifest.routes.find((route) => {
-    return route.pattern.test(decodedPathname) || route.fallbackRoutes.some((fallbackRoute) => fallbackRoute.pattern.test(decodedPathname));
+    return route.pattern.test(pathname) || route.fallbackRoutes.some((fallbackRoute) => fallbackRoute.pattern.test(pathname));
   });
 }
 function matchAllRoutes(pathname, manifest) {
-  return manifest.routes.filter((route) => route.pattern.test(decodeURI(pathname)));
+  return manifest.routes.filter((route) => route.pattern.test(pathname));
 }
 const ROUTE404_RE = /^\/404\/?$/;
 const ROUTE500_RE = /^\/500\/?$/;

package/dist/core/session.d.ts

@@ -8,7 +8,7 @@ export declare class AstroSession<TDriver extends SessionDriverName = any> {
     /**
      * Gets a session value. Returns `undefined` if the session or value does not exist.
      */
-    get<T = any>(key: string): Promise<T | undefined>;
+    get<T = void, K extends string = string>(key: K): Promise<(T extends void ? (K extends keyof App.SessionData ? App.SessionData[K] : any) : T) | undefined>;
     /**
      * Checks if a session value exists.
      */
@@ -32,7 +32,7 @@ export declare class AstroSession<TDriver extends SessionDriverName = any> {
     /**
      * Sets a session value. The session is created if it does not exist.
      */
-    set<T = any>(key: string, value: T, { ttl }?: {
+    set<T = void, K extends string = string>(key: K, value: T extends void ? K extends keyof App.SessionData ? App.SessionData[K] : any : NoInfer<T>, { ttl }?: {
         ttl?: number;
     }): void;
     /**

package/dist/integrations/hooks.js

@@ -1,6 +1,7 @@
 import fsMod from "node:fs";
 import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
+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";
@@ -377,7 +378,7 @@ async function runHookBuildSetup({
           pages,
           target,
           updateConfig: (newConfig) => {
-            updatedConfig = mergeConfig(updatedConfig, newConfig);
+            updatedConfig = mergeViteConfig(updatedConfig, newConfig);
             return { ...updatedConfig };
           },
           logger: getLogger(integration, logger)

package/dist/transitions/router.js

@@ -252,7 +252,7 @@ async function transition(direction, from, to, options, historyState) {
     if (preparationEvent.formData) {
       init.method = "POST";
       const form = preparationEvent.sourceElement instanceof HTMLFormElement ? preparationEvent.sourceElement : preparationEvent.sourceElement instanceof HTMLElement && "form" in preparationEvent.sourceElement ? preparationEvent.sourceElement.form : preparationEvent.sourceElement?.closest("form");
-      init.body = form?.attributes.getNamedItem("enctype")?.value === "application/x-www-form-urlencoded" ? new URLSearchParams(preparationEvent.formData) : preparationEvent.formData;
+      init.body = from !== void 0 && Reflect.get(HTMLFormElement.prototype, "attributes", form).getNamedItem("enctype")?.value === "application/x-www-form-urlencoded" ? new URLSearchParams(preparationEvent.formData) : preparationEvent.formData;
     }
     const response = await fetchHTML(href, init);
     if (response === null) {

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

@@ -1,9 +1,9 @@
 import type { OutgoingHttpHeaders } from 'node:http';
+import type { RemotePattern } from '@astrojs/internal-helpers/remote';
 import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';
 import type { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage } from 'unstorage';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
-import type { RemotePattern } from '../../assets/utils/remotePattern.js';
 import type { SvgRenderMode } from '../../assets/utils/svg.js';
 import type { AssetsPrefix } from '../../core/app/types.js';
 import type { AstroConfigType } from '../../core/config/schema.js';
@@ -54,6 +54,25 @@ export type ServerConfig = {
      * If the given port is already in use, Astro will automatically try the next available port.
      */
     port?: number;
+    /**
+     * @name server.allowedHosts
+     * @type {string[] | true}
+     * @default `[]`
+     * @version 5.4.0
+     * @description
+     *
+     * A list of hostnames that Astro is allowed to respond to. When the value is set to `true`, any
+     * hostname is allowed.
+     *
+     * ```js
+     * {
+     *   server: {
+     *   	allowedHosts: ['staging.example.com', 'qa.example.com']
+     *   }
+     * }
+     * ```
+     */
+    allowedHosts?: string[] | true;
     /**
      * @name server.headers
      * @typeraw {OutgoingHttpHeaders}

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

@@ -7,6 +7,11 @@ declare global {
          */
         interface Locals {
         }
+        /**
+         * Optionally type the data stored in the session
+         */
+        interface SessionData {
+        }
     }
     namespace Astro {
         interface IntegrationHooks extends BaseIntegrationHooks {

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

@@ -12,10 +12,10 @@ export type * from './common.js';
 export type * from './manifest.js';
 export type { AstroIntegrationLogger } from '../../core/logger/core.js';
 export type { ToolbarServerHelpers } from '../../runtime/client/dev-toolbar/helpers.js';
+export type { RemotePattern } from '@astrojs/internal-helpers/remote';
 export type { MarkdownHeading, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
 export type { ExternalImageService, ImageService, LocalImageService, } from '../../assets/services/service.js';
 export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, UnresolvedImageTransform, } from '../../assets/types.js';
-export type { RemotePattern } from '../../assets/utils/remotePattern.js';
 export type { AssetsPrefix, SSRManifest } from '../../core/app/types.js';
 export type { AstroCookieGetOptions, AstroCookieSetOptions, AstroCookies, } from '../../core/cookies/index.js';
 export type { ContainerRenderer } from '../../container/index.js';

package/dist/vite-plugin-markdown/content-entry-type.js

@@ -15,7 +15,10 @@ const markdownContentEntryType = {
   // We need to handle propagation for Markdown because they support layouts which will bring in styles.
   handlePropagation: true,
   async getRenderFunction(config) {
-    const processor = await createMarkdownProcessor(config.markdown);
+    const processor = await createMarkdownProcessor({
+      image: config.image,
+      ...config.markdown
+    });
     return async function renderToString(entry) {
       const result = await processor.render(entry.body ?? "", {
         frontmatter: entry.data,
@@ -24,7 +27,10 @@ const markdownContentEntryType = {
       });
       return {
         html: result.code,
-        metadata: result.metadata
+        metadata: {
+          ...result.metadata,
+          imagePaths: result.metadata.localImagePaths.concat(result.metadata.remoteImagePaths)
+        }
       };
     };
   }

package/dist/vite-plugin-markdown/images.d.ts

@@ -2,4 +2,4 @@ export type MarkdownImagePath = {
     raw: string;
     safeName: string;
 };
-export declare function getMarkdownCodeForImages(imagePaths: MarkdownImagePath[], html: string): string;
+export declare function getMarkdownCodeForImages(localImagePaths: MarkdownImagePath[], remoteImagePaths: string[], html: string): string;

package/dist/vite-plugin-markdown/images.js

@@ -1,11 +1,11 @@
-function getMarkdownCodeForImages(imagePaths, html) {
+function getMarkdownCodeForImages(localImagePaths, remoteImagePaths, html) {
   return `
 			import { getImage } from "astro:assets";
-			${imagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
+			${localImagePaths.map((entry) => `import Astro__${entry.safeName} from ${JSON.stringify(entry.raw)};`).join("\n")}
 
 			const images = async function(html) {
 					const imageSources = {};
-					${imagePaths.map((entry) => {
+					${localImagePaths.map((entry) => {
     const rawUrl = JSON.stringify(entry.raw);
     return `{
 											const regex = new RegExp('__ASTRO_IMAGE_="([^"]*' + ${rawUrl.replace(
@@ -22,6 +22,23 @@ function getMarkdownCodeForImages(imagePaths, html) {
 													occurrenceCounter++;
 											}
 									}`;
+  }).join("\n")}
+					${remoteImagePaths.map((raw) => {
+    const rawUrl = JSON.stringify(raw);
+    return `{
+											const regex = new RegExp('__ASTRO_IMAGE_="([^"]*' + ${rawUrl.replace(
+      /[.*+?^${}()|[\]\\]/g,
+      "\\\\$&"
+    )} + '[^"]*)"', 'g');
+											let match;
+											let occurrenceCounter = 0;
+											while ((match = regex.exec(html)) !== null) {
+													const matchKey = ${rawUrl} + '_' + occurrenceCounter;
+													const props = JSON.parse(match[1].replace(/"/g, '"'));
+													imageSources[matchKey] = await getImage(props);
+													occurrenceCounter++;
+											}
+									}`;
   }).join("\n")}
 					return imageSources;
 			};

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

@@ -44,7 +44,10 @@ function markdown({ settings, logger }) {
         const raw = safeParseFrontmatter(rawFile, id);
         const fileURL = pathToFileURL(fileId);
         if (!processor) {
-          processor = createMarkdownProcessor(settings.config.markdown);
+          processor = createMarkdownProcessor({
+            image: settings.config.image,
+            ...settings.config.markdown
+          });
         }
         const renderResult = await (await processor).render(raw.content, {
           // @ts-expect-error passing internal prop
@@ -55,12 +58,17 @@ function markdown({ settings, logger }) {
           throw new AstroError(AstroErrorData.InvalidFrontmatterInjectionError);
         }
         let html = renderResult.code;
-        const { headings, imagePaths: rawImagePaths, frontmatter } = renderResult.metadata;
+        const {
+          headings,
+          localImagePaths: rawLocalImagePaths,
+          remoteImagePaths,
+          frontmatter
+        } = renderResult.metadata;
         const isMarkdownPage = isPage(fileURL, settings);
         const charset = isMarkdownPage ? '<meta charset="utf-8">' : "";
-        const imagePaths = [];
-        for (const imagePath of rawImagePaths) {
-          imagePaths.push({
+        const localImagePaths = [];
+        for (const imagePath of rawLocalImagePaths) {
+          localImagePaths.push({
             raw: imagePath,
             safeName: shorthash(imagePath)
           });
@@ -80,7 +88,7 @@ function markdown({ settings, logger }) {
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
 
 				${// Only include the code relevant to `astro:assets` if there's images in the file
-        imagePaths.length > 0 ? getMarkdownCodeForImages(imagePaths, html) : `const html = () => ${JSON.stringify(html)};`}
+        localImagePaths.length > 0 || remoteImagePaths.length > 0 ? getMarkdownCodeForImages(localImagePaths, remoteImagePaths, html) : `const html = () => ${JSON.stringify(html)};`}
 
 				export const frontmatter = ${JSON.stringify(frontmatter)};
 				export const file = ${JSON.stringify(fileId)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.3.1",
+  "version": "5.4.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -103,7 +103,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^2.10.3",
+    "@astrojs/compiler": "^2.10.4",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
     "@types/cookie": "^0.6.0",
@@ -123,7 +123,7 @@
     "dlv": "^1.1.3",
     "dset": "^3.1.4",
     "es-module-lexer": "^1.6.0",
-    "esbuild": "^0.24.2",
+    "esbuild": "^0.25.0",
     "estree-walker": "^3.0.3",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
@@ -150,7 +150,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.14.4",
     "vfile": "^6.0.3",
-    "vite": "^6.0.11",
+    "vite": "^6.2.0",
     "vitefu": "^1.0.5",
     "which-pm": "^3.0.1",
     "xxhash-wasm": "^1.1.0",
@@ -159,9 +159,9 @@
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.5.1",
-    "@astrojs/markdown-remark": "6.1.0",
-    "@astrojs/telemetry": "3.2.0"
+    "@astrojs/internal-helpers": "0.6.0",
+    "@astrojs/telemetry": "3.2.0",
+    "@astrojs/markdown-remark": "6.2.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"