astro 5.16.5 → 5.16.6

package/dist/assets/endpoint/dev.js

@@ -1,16 +1,17 @@
 import { root } from "astro:config/server";
 import { readFile } from "node:fs/promises";
-import os from "node:os";
 import { fileURLToPath } from "node:url";
 import { isParentDirectory } from "@astrojs/internal-helpers/path";
 import { handleImageRequest, loadRemoteImage } from "./shared.js";
-function replaceFileSystemReferences(src) {
-  return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
-}
 async function loadLocalImage(src, url) {
   if (src.startsWith("/@fs/")) {
-    src = replaceFileSystemReferences(src);
-    if (!isParentDirectory(fileURLToPath(root), src)) {
+    try {
+      const res = await fetch(new URL(src, url));
+      if (!res.ok) {
+        return void 0;
+      }
+      return Buffer.from(await res.arrayBuffer());
+    } catch {
       return void 0;
     }
   }

package/dist/assets/services/noop.js

@@ -1,11 +1,16 @@
-import { baseService } from "./service.js";
+import { isESMImportedImage } from "../utils/imageKind.js";
+import { baseService, verifyOptions } from "./service.js";
 const noopService = {
   ...baseService,
   propertiesToHash: ["src"],
-  async validateOptions(options, imageConfig) {
-    const newOptions = await (baseService.validateOptions?.(options, imageConfig) ?? options);
-    delete newOptions.format;
-    return newOptions;
+  async validateOptions(options) {
+    if (isESMImportedImage(options.src) && options.src.format === "svg") {
+      options.format = "svg";
+    } else {
+      delete options.format;
+    }
+    verifyOptions(options);
+    return options;
   },
   async transform(inputBuffer, transformOptions) {
     return {

package/dist/assets/services/service.d.ts

@@ -80,6 +80,7 @@ export type BaseServiceTransform = {
     fit?: ImageFit;
     position?: string;
 };
+export declare function verifyOptions(options: ImageTransform): void;
 /**
  * Basic local service using the included `_image` endpoint.
  * This service intentionally does not implement `transform`.
@@ -95,7 +96,6 @@ export type BaseServiceTransform = {
  * ```
  *
  * This service adhere to the included services limitations:
- * - Remote images are passed as is.
  * - Only a limited amount of formats are supported.
  * - For remote images, `width` and `height` are always required.
  *

package/dist/assets/services/service.js

@@ -17,61 +17,64 @@ function parseQuality(quality) {
   return result;
 }
 const sortNumeric = (a, b) => a - b;
-const baseService = {
-  propertiesToHash: DEFAULT_HASH_PROPS,
-  validateOptions(options) {
-    if (!options.src || !isRemoteImage(options.src) && !isESMImportedImage(options.src)) {
+function verifyOptions(options) {
+  if (!options.src || !isRemoteImage(options.src) && !isESMImportedImage(options.src)) {
+    throw new AstroError({
+      ...AstroErrorData.ExpectedImage,
+      message: AstroErrorData.ExpectedImage.message(
+        JSON.stringify(options.src),
+        typeof options.src,
+        JSON.stringify(options, (_, v) => v === void 0 ? null : v)
+      )
+    });
+  }
+  if (!isESMImportedImage(options.src)) {
+    if (options.src.startsWith("/@fs/") || !isRemotePath(options.src) && !options.src.startsWith("/")) {
+      throw new AstroError({
+        ...AstroErrorData.LocalImageUsedWrongly,
+        message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
+      });
+    }
+    let missingDimension;
+    if (!options.width && !options.height) {
+      missingDimension = "both";
+    } else if (!options.width && options.height) {
+      missingDimension = "width";
+    } else if (options.width && !options.height) {
+      missingDimension = "height";
+    }
+    if (missingDimension) {
       throw new AstroError({
-        ...AstroErrorData.ExpectedImage,
-        message: AstroErrorData.ExpectedImage.message(
-          JSON.stringify(options.src),
-          typeof options.src,
-          JSON.stringify(options, (_, v) => v === void 0 ? null : v)
+        ...AstroErrorData.MissingImageDimension,
+        message: AstroErrorData.MissingImageDimension.message(missingDimension, options.src)
+      });
+    }
+  } else {
+    if (!VALID_SUPPORTED_FORMATS.includes(options.src.format)) {
+      throw new AstroError({
+        ...AstroErrorData.UnsupportedImageFormat,
+        message: AstroErrorData.UnsupportedImageFormat.message(
+          options.src.format,
+          options.src.src,
+          VALID_SUPPORTED_FORMATS
         )
       });
     }
-    if (!isESMImportedImage(options.src)) {
-      if (options.src.startsWith("/@fs/") || !isRemotePath(options.src) && !options.src.startsWith("/")) {
-        throw new AstroError({
-          ...AstroErrorData.LocalImageUsedWrongly,
-          message: AstroErrorData.LocalImageUsedWrongly.message(options.src)
-        });
-      }
-      let missingDimension;
-      if (!options.width && !options.height) {
-        missingDimension = "both";
-      } else if (!options.width && options.height) {
-        missingDimension = "width";
-      } else if (options.width && !options.height) {
-        missingDimension = "height";
-      }
-      if (missingDimension) {
-        throw new AstroError({
-          ...AstroErrorData.MissingImageDimension,
-          message: AstroErrorData.MissingImageDimension.message(missingDimension, options.src)
-        });
-      }
-    } else {
-      if (!VALID_SUPPORTED_FORMATS.includes(options.src.format)) {
-        throw new AstroError({
-          ...AstroErrorData.UnsupportedImageFormat,
-          message: AstroErrorData.UnsupportedImageFormat.message(
-            options.src.format,
-            options.src.src,
-            VALID_SUPPORTED_FORMATS
-          )
-        });
-      }
-      if (options.widths && options.densities) {
-        throw new AstroError(AstroErrorData.IncompatibleDescriptorOptions);
-      }
-      if (options.src.format === "svg") {
-        options.format = "svg";
-      }
-      if (options.src.format === "svg" && options.format !== "svg" || options.src.format !== "svg" && options.format === "svg") {
-        throw new AstroError(AstroErrorData.UnsupportedImageConversion);
-      }
+    if (options.widths && options.densities) {
+      throw new AstroError(AstroErrorData.IncompatibleDescriptorOptions);
+    }
+    if (options.src.format === "svg" && options.format !== "svg" || options.src.format !== "svg" && options.format === "svg") {
+      throw new AstroError(AstroErrorData.UnsupportedImageConversion);
+    }
+  }
+}
+const baseService = {
+  propertiesToHash: DEFAULT_HASH_PROPS,
+  validateOptions(options) {
+    if (isESMImportedImage(options.src) && options.src.format === "svg") {
+      options.format = "svg";
     }
+    verifyOptions(options);
     if (!options.format) {
       options.format = DEFAULT_OUTPUT_FORMAT;
     }
@@ -234,5 +237,6 @@ function getTargetDimensions(options) {
 export {
   baseService,
   isLocalService,
-  parseQuality
+  parseQuality,
+  verifyOptions
 };

package/dist/assets/types.d.ts

@@ -72,7 +72,7 @@ export type ImageTransform = {
     fit?: ImageFit | undefined;
     position?: string | undefined;
     [key: string]: any;
-};
+} & Astro.CustomImageProps;
 export interface GetImageResult {
     rawOptions: ImageTransform;
     options: ImageTransform;
@@ -201,7 +201,7 @@ type ImageSharedProps<T> = T & {
     layout?: never;
     fit?: never;
     position?: never;
-});
+}) & Astro.CustomImageProps;
 export type LocalImageProps<T> = ImageSharedProps<T> & {
     /**
      * A reference to a local image imported through an ESM import.

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

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "5.16.5";
+  version = "5.16.6";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.16.5";
+const ASTRO_VERSION = "5.16.6";
 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.16.5";
+  const currentVersion = "5.16.6";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

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

@@ -18,6 +18,8 @@ declare global {
         }
         interface ClientDirectives extends AstroClientDirectives {
         }
+        interface CustomImageProps {
+        }
     }
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.16.5",
+  "version": "5.16.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",