astro 6.3.5 → 6.3.7

package/dist/assets/internal.js

@@ -13,6 +13,7 @@ import {
   isImageMetadata
 } from "./types.js";
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
+import { resolveDefaultOutputFormat } from "./utils/inferSourceFormat.js";
 import { inferRemoteSize } from "./utils/remoteProbe.js";
 import { createPlaceholderURL, stringifyPlaceholderURL } from "./utils/url.js";
 import { verifyOptions } from "./services/service.js";
@@ -73,6 +74,9 @@ async function getImage(options, imageConfig) {
       const result = await getRemoteSize(resolvedOptions.src);
       resolvedOptions.width ??= result.width;
       resolvedOptions.height ??= result.height;
+      if (result.format) {
+        resolvedOptions.format ??= resolveDefaultOutputFormat(result.format);
+      }
       originalWidth = result.width;
       originalHeight = result.height;
     }
@@ -126,6 +130,11 @@ async function getImage(options, imageConfig) {
     resolvedOptions["data-astro-image-pos"] = currentPosition.replace(/\s+/g, "-");
   }
   const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, imageConfig) : resolvedOptions;
+  validatedOptions.format ??= await peekRemoteFormatForStaticEmit(
+    validatedOptions,
+    imageConfig,
+    service
+  );
   const srcSetTransforms = service.getSrcSet ? await service.getSrcSet(validatedOptions, imageConfig) : [];
   const lazyImageURLFactory = (getValue) => {
     let cached = null;
@@ -187,6 +196,17 @@ async function getImage(options, imageConfig) {
     attributes: service.getHTMLAttributes !== void 0 ? await service.getHTMLAttributes(validatedOptions, imageConfig) : {}
   };
 }
+async function peekRemoteFormatForStaticEmit(options, imageConfig, service) {
+  if (!isRemoteImage(options.src) || !isRemoteAllowed(options.src, imageConfig) || !globalThis.astroAsset?.addStaticImage || !isLocalService(service) || !service.getRemoteSize) {
+    return void 0;
+  }
+  try {
+    const probed = await service.getRemoteSize(options.src, imageConfig);
+    return resolveDefaultOutputFormat(probed.format);
+  } catch {
+    return void 0;
+  }
+}
 export {
   cssFitValues,
   getConfiguredImageService,

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

@@ -82,7 +82,7 @@ export type BaseServiceTransform = {
     src: string;
     width?: number;
     height?: number;
-    format: string;
+    format?: string;
     quality?: string | null;
     fit?: ImageFit;
     position?: string;

package/dist/assets/services/service.js

@@ -1,8 +1,9 @@
 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 { DEFAULT_HASH_PROPS, VALID_SUPPORTED_FORMATS } from "../consts.js";
 import { isESMImportedImage, isRemoteImage } from "../utils/imageKind.js";
+import { inferSourceFormat, resolveDefaultOutputFormat } from "../utils/inferSourceFormat.js";
 import { inferRemoteSize } from "../utils/remoteProbe.js";
 function isLocalService(service) {
   if (!service) {
@@ -74,10 +75,11 @@ const baseService = {
   validateOptions(options) {
     verifyOptions(options);
     if (!options.format) {
-      if (isESMImportedImage(options.src) && options.src.format === "svg") {
-        options.format = "svg";
+      if (isESMImportedImage(options.src)) {
+        options.format = resolveDefaultOutputFormat(options.src.format);
       } else {
-        options.format = DEFAULT_OUTPUT_FORMAT;
+        const inferred = inferSourceFormat(options.src);
+        if (inferred) options.format = resolveDefaultOutputFormat(inferred);
       }
     }
     if (options.width) options.width = Math.round(options.width);
@@ -120,7 +122,7 @@ const baseService = {
     const { targetWidth, targetHeight } = getTargetDimensions(options);
     const aspectRatio = targetWidth / targetHeight;
     const { widths, densities } = options;
-    const targetFormat = options.format ?? DEFAULT_OUTPUT_FORMAT;
+    const targetFormat = options.format;
     let transformedWidths = (widths ?? []).sort(sortNumeric);
     let imageWidth = options.width;
     let maxWidth = Number.POSITIVE_INFINITY;
@@ -164,9 +166,7 @@ const baseService = {
       return {
         transform,
         descriptor,
-        attributes: {
-          type: `image/${targetFormat}`
-        }
+        attributes: targetFormat ? { type: `image/${targetFormat}` } : {}
       };
     });
   },
@@ -210,7 +210,7 @@ const baseService = {
       src: params.get("href"),
       width: params.has("w") ? Number.parseInt(params.get("w")) : void 0,
       height: params.has("h") ? Number.parseInt(params.get("h")) : void 0,
-      format: params.get("f"),
+      format: params.has("f") ? params.get("f") : void 0,
       quality: params.get("q"),
       fit: params.get("fit"),
       position: params.get("position") ?? void 0,

package/dist/assets/services/sharp.js

@@ -1,4 +1,5 @@
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
+import { resolveDefaultOutputFormat } from "../utils/inferSourceFormat.js";
 import { detector } from "../utils/vendor/image-size/detector.js";
 import {
   baseService,
@@ -21,6 +22,9 @@ function resolveSharpQuality(quality) {
 }
 function resolveSharpEncoderOptions(transform, inputFormat, serviceConfig = {}) {
   const quality = resolveSharpQuality(transform.quality);
+  if (transform.format === void 0) {
+    return quality === void 0 ? void 0 : { quality };
+  }
   switch (transform.format) {
     case "jpg":
     case "jpeg":
@@ -82,11 +86,27 @@ const sharpService = {
     if (!sharp) sharp = await loadSharp();
     const transform = transformOptions;
     const kernel = config.service.config.kernel;
-    if (transform.format === "svg") return { data: inputBuffer, format: "svg" };
-    if (detector(inputBuffer) === "svg" && !config.dangerouslyProcessSVG) {
+    const bufferFormat = detector(inputBuffer);
+    const outputFormat = transform.format ?? resolveDefaultOutputFormat(bufferFormat);
+    if (outputFormat === "svg") {
+      if (bufferFormat && bufferFormat !== "svg") {
+        console.warn(
+          `\u26A0\uFE0F  Astro expected an SVG for "${transform.src}" but the source is ${bufferFormat}. Passing it through as ${bufferFormat} instead.`
+        );
+        return { data: inputBuffer, format: bufferFormat };
+      }
+      return { data: inputBuffer, format: "svg" };
+    }
+    if (!bufferFormat) {
+      throw new AstroError({
+        ...AstroErrorData.NoImageMetadata,
+        message: AstroErrorData.NoImageMetadata.message(transform.src)
+      });
+    }
+    if (bufferFormat === "svg" && !config.dangerouslyProcessSVG) {
       throw new AstroError({
         ...AstroErrorData.UnsupportedImageFormat,
-        message: "SVG image processing is disabled. Set `image.dangerouslyProcessSVG: true` to allow processing of SVG sources."
+        message: `SVG image processing is disabled, but the source for "${transform.src}" is an SVG. Pass it through unchanged by setting \`format="svg"\` on the component, or set \`image.dangerouslyProcessSVG: true\` to rasterize SVG sources.`
       });
     }
     const result = sharp(inputBuffer, {
@@ -95,15 +115,6 @@ const sharpService = {
       limitInputPixels: config.service.config.limitInputPixels
     });
     result.rotate();
-    let format;
-    try {
-      ({ format } = await result.metadata());
-    } catch {
-      console.warn(
-        `\u26A0\uFE0F  Astro could not optimize image "${transform.src}". Sharp doesn't support this format. The image will be used unoptimized. Consider converting to WebP or placing in the public/ folder.`
-      );
-      return { data: inputBuffer, format: transform.format };
-    }
     if (transform.width && transform.height) {
       const fit = transform.fit ? fitMap[transform.fit] ?? "inside" : void 0;
       result.resize({
@@ -130,23 +141,32 @@ const sharpService = {
     if (transform.background) {
       result.flatten({ background: transform.background });
     }
-    if (transform.format) {
-      const encoderOptions = resolveSharpEncoderOptions(transform, format, config.service.config);
-      if (transform.format === "webp" && format === "gif") {
-        result.webp(encoderOptions);
-      } else if (transform.format === "webp") {
-        result.webp(encoderOptions);
-      } else if (transform.format === "png") {
-        result.png(encoderOptions);
-      } else if (transform.format === "avif") {
-        result.avif(encoderOptions);
-      } else if (transform.format === "jpeg" || transform.format === "jpg") {
-        result.jpeg(encoderOptions);
-      } else {
-        result.toFormat(transform.format, encoderOptions);
-      }
+    const encoderOptions = resolveSharpEncoderOptions(
+      { format: outputFormat, quality: transform.quality },
+      bufferFormat,
+      config.service.config
+    );
+    if (outputFormat === "webp") {
+      result.webp(encoderOptions);
+    } else if (outputFormat === "png") {
+      result.png(encoderOptions);
+    } else if (outputFormat === "avif") {
+      result.avif(encoderOptions);
+    } else if (outputFormat === "jpeg" || outputFormat === "jpg") {
+      result.jpeg(encoderOptions);
+    } else {
+      result.toFormat(outputFormat, encoderOptions);
+    }
+    let data;
+    let info;
+    try {
+      ({ data, info } = await result.toBuffer({ resolveWithObject: true }));
+    } catch {
+      console.warn(
+        `\u26A0\uFE0F  Astro could not optimize image "${transform.src}". Sharp doesn't support this format. The image will be used unoptimized. Consider converting to WebP or placing in the public/ folder.`
+      );
+      return { data: inputBuffer, format: bufferFormat };
     }
-    const { data, info } = await result.toBuffer({ resolveWithObject: true });
     const needsCopy = "buffer" in data && data.buffer instanceof SharedArrayBuffer;
     return {
       data: needsCopy ? new Uint8Array(data) : data,

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

@@ -1,6 +1,11 @@
 /**
- * Infer the image format from a source path or URL by examining
- * the file extension. For data: URIs, the MIME type is extracted.
- * Returns undefined if the format cannot be determined.
+ * Infer the image format from a source path or URL.
+ *
+ * For `data:` URIs the MIME is read up to the first `;` or `,` (whichever comes first),
+ * so both `data:image/svg+xml;base64,...` and `data:image/svg+xml,<svg>...` work.
+ * `image/svg+xml` normalizes to `svg`; otherwise the subtype after the slash is returned.
+ *
+ * Returns undefined when the format cannot be determined.
  */
 export declare function inferSourceFormat(src: string): string | undefined;
+export declare function resolveDefaultOutputFormat(sourceFormat: string | undefined): string;

package/dist/assets/utils/inferSourceFormat.js

@@ -1,21 +1,32 @@
 import { removeQueryString } from "@astrojs/internal-helpers/path";
+import { DEFAULT_OUTPUT_FORMAT } from "../consts.js";
 const DATA_PREFIX = "data:";
 function inferSourceFormat(src) {
   if (src.startsWith(DATA_PREFIX)) {
-    const mime = src.slice(DATA_PREFIX.length, src.indexOf(";"));
+    const sepIndex = src.indexOf(";");
+    const commaIndex = src.indexOf(",");
+    const mimeEnd = sepIndex === -1 ? commaIndex : commaIndex === -1 ? sepIndex : Math.min(sepIndex, commaIndex);
+    if (mimeEnd === -1) return void 0;
+    const mime = src.slice(DATA_PREFIX.length, mimeEnd);
     if (mime === "image/svg+xml") return "svg";
     const sub = mime.split("/")[1];
     return sub || void 0;
   }
   try {
     const cleanSrc = removeQueryString(src).split("#")[0];
-    const lastDot = cleanSrc.lastIndexOf(".");
+    const lastSlash = cleanSrc.lastIndexOf("/");
+    const basename = lastSlash === -1 ? cleanSrc : cleanSrc.slice(lastSlash + 1);
+    const lastDot = basename.lastIndexOf(".");
     if (lastDot === -1) return void 0;
-    return cleanSrc.slice(lastDot + 1).toLowerCase();
+    return basename.slice(lastDot + 1).toLowerCase();
   } catch {
     return void 0;
   }
 }
+function resolveDefaultOutputFormat(sourceFormat) {
+  return sourceFormat === "svg" ? "svg" : DEFAULT_OUTPUT_FORMAT;
+}
 export {
-  inferSourceFormat
+  inferSourceFormat,
+  resolveDefaultOutputFormat
 };

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.3.5";
+  version = "6.3.7";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

package/dist/content/runtime.js

@@ -351,7 +351,7 @@ async function updateImageReferencesInBody(html, fileName) {
       srcset: image.srcSet.attribute,
       // This attribute is used by the toolbar audit
       ...import.meta.env.DEV ? { "data-image-component": "true" } : {}
-    }).map(([key, value]) => value ? `${key}="${escape(value)}"` : "").join(" ");
+    }).filter(([, value]) => value != null).map(([key, value]) => value === "" ? `${key}=""` : `${key}="${escape(String(value))}"`).join(" ");
   });
 }
 function updateImageReferencesInData(data, fileName, imageAssetMap) {

package/dist/content/types-generator.js

@@ -447,7 +447,11 @@ async function generateJSONSchema(fsMod, collectionConfig, collectionKey, collec
     zodSchemaForJson = await getContentLayerSchema(collectionConfig, collectionKey);
   }
   if (collectionConfig.type === CONTENT_LAYER_TYPE && collectionConfig.loader.name === "file-loader") {
-    zodSchemaForJson = z.object({}).catchall(zodSchemaForJson);
+    const itemSchema = zodSchemaForJson;
+    zodSchemaForJson = z.union([
+      z.array(itemSchema),
+      z.object({ $schema: z.string().optional() }).catchall(itemSchema)
+    ]);
   }
   if (zodSchemaForJson instanceof z.ZodObject) {
     const existingMeta = z.globalRegistry.get(zodSchemaForJson);

package/dist/core/app/node.js

@@ -219,6 +219,9 @@ function makeRequestBody(req, bodySizeLimit) {
     if (typeof req.body === "string" && req.body.length > 0) {
       return { body: Buffer.from(req.body) };
     }
+    if (req.body instanceof ArrayBuffer || ArrayBuffer.isView(req.body)) {
+      return { body: req.body };
+    }
     if (typeof req.body === "object" && req.body !== null && Object.keys(req.body).length > 0) {
       return { body: Buffer.from(JSON.stringify(req.body)) };
     }

package/dist/core/build/util.js

@@ -1,6 +1,13 @@
 function getTimeStat(timeStart, timeEnd) {
   const buildTime = timeEnd - timeStart;
-  return buildTime < 1e3 ? `${Math.round(buildTime)}ms` : `${(buildTime / 1e3).toFixed(2)}s`;
+  if (buildTime < 1e3) {
+    return `${Math.round(buildTime)}ms`;
+  } else if (buildTime < 6e4) {
+    return `${(buildTime / 1e3).toFixed(2)}s`;
+  }
+  const mins = Math.floor(buildTime / 6e4);
+  const secs = Math.round(buildTime % 6e4 / 1e3);
+  return `${mins}m ${secs}s`;
 }
 function shouldAppendForwardSlash(trailingSlash, buildFormat) {
   switch (trailingSlash) {

package/dist/core/build/vite-build-config.js

@@ -118,11 +118,16 @@ function createViteBuildConfig(opts) {
           target: "esnext",
           outDir: fileURLToPath(getClientOutputDirectory(settings)),
           copyPublicDir: true,
-          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? false,
-          minify: true,
+          sourcemap: viteConfig.environments?.client?.build?.sourcemap ?? viteConfig.build?.sourcemap ?? false,
+          minify: viteConfig.environments?.client?.build?.minify ?? viteConfig.build?.minify ?? true,
           rollupOptions: {
             preserveEntrySignatures: "exports-only",
             output: {
+              // Inherit top-level rollup output options (e.g. compact) as a
+              // base, then layer Astro defaults on top so that Astro's
+              // naming functions are preserved unless explicitly overridden
+              // via the environment-specific config.
+              ...viteConfig.build?.rollupOptions?.output,
               entryFileNames(chunkInfo) {
                 return `${settings.config.build.assets}/${cleanChunkName(chunkInfo.name)}.[hash].js`;
               },

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.3.5";
+const ASTRO_VERSION = "6.3.7";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

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

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.3.5"}`
+        `v${"6.3.7"}`
       )} ${headline}`
     );
   }

package/dist/core/render/route-cache.d.ts

@@ -13,6 +13,7 @@ interface CallGetStaticPathsOptions {
 }
 export declare function callGetStaticPaths({ mod, route, routeCache, ssr, base, trailingSlash, }: CallGetStaticPathsOptions): Promise<GetStaticPathsResultKeyed>;
 interface RouteCacheEntry {
+    mod?: ComponentInstance;
     staticPaths: GetStaticPathsResultKeyed;
 }
 /**

package/dist/core/render/route-cache.js

@@ -13,7 +13,7 @@ async function callGetStaticPaths({
   if (!mod) {
     throw new Error("This is an error caused by Astro and not your code. Please file an issue.");
   }
-  if (cached?.staticPaths) {
+  if (cached?.staticPaths && cached.mod === mod) {
     return cached.staticPaths;
   }
   validateDynamicRouteModule(mod, { ssr, route });
@@ -39,7 +39,7 @@ async function callGetStaticPaths({
     const paramsKey = stringifyParams(sp.params, route, trailingSlash);
     keyedStaticPaths.keyed.set(paramsKey, sp);
   }
-  routeCache.set(route, { ...cached, staticPaths: keyedStaticPaths });
+  routeCache.set(route, { ...cached, mod, staticPaths: keyedStaticPaths });
   return keyedStaticPaths;
 }
 class RouteCache {

package/dist/core/util/pathname.js

@@ -4,16 +4,18 @@ class MultiLevelEncodingError extends Error {
     this.name = "MultiLevelEncodingError";
   }
 }
+const ENCODING_REGEX = /%25[0-9a-fA-F]{2}/;
 function validateAndDecodePathname(pathname) {
+  if (ENCODING_REGEX.test(pathname)) {
+    throw new MultiLevelEncodingError();
+  }
   let decoded;
   try {
     decoded = decodeURI(pathname);
   } catch (_e) {
     throw new Error("Invalid URL encoding");
   }
-  const hasDecoding = decoded !== pathname;
-  const decodedStillHasEncoding = /%[0-9a-fA-F]{2}/.test(decoded);
-  if (hasDecoding && decodedStillHasEncoding) {
+  if (ENCODING_REGEX.test(decoded)) {
     throw new MultiLevelEncodingError();
   }
   return decoded;

package/dist/manifest/virtual-module.js

@@ -17,7 +17,8 @@ function virtualModulePlugin({ settings }) {
   defaultLocale: ${JSON.stringify(config.i18n.defaultLocale)},
   locales: ${JSON.stringify(config.i18n.locales)},
   routing: ${JSON.stringify(routing)},
-  fallback: ${JSON.stringify(config.i18n.fallback)}
+  fallback: ${JSON.stringify(config.i18n.fallback)},
+  domains: ${JSON.stringify(config.i18n.domains)}
 };`;
   }
   let imageCode = "const image = undefined;";

package/dist/runtime/server/jsx.js

@@ -75,7 +75,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       }
       case (!vnode.type && vnode.type !== 0):
         return "";
-      case (typeof vnode.type === "string" && vnode.type !== ClientOnlyPlaceholder):
+      case (typeof vnode.type === "string" && vnode.type !== ClientOnlyPlaceholder && !vnode.type.includes("-")):
         return markHTMLString(await renderElement(result, vnode.type, vnode.props ?? {}));
     }
     if (vnode.type) {

package/dist/virtual-modules/i18n.js

@@ -1,4 +1,4 @@
-import * as config from "astro:config/server";
+import * as config from "astro:config/client";
 import { toFallbackType } from "../core/app/common.js";
 import { toRoutingStrategy } from "../core/app/entrypoints/index.js";
 import {

package/dist/vite-plugin-hmr-reload/index.js

@@ -31,12 +31,6 @@ function hmrReload() {
           const clientModule = server.environments.client.moduleGraph.getModuleById(mod.id);
           if (clientModule != null) continue;
           this.environment.moduleGraph.invalidateModule(mod, invalidatedModules, timestamp, true);
-          if (isRunnableDevEnvironment(this.environment)) {
-            const runnerModule = this.environment.runner.evaluatedModules.getModuleById(mod.id);
-            if (runnerModule) {
-              this.environment.runner.evaluatedModules.invalidateModule(runnerModule);
-            }
-          }
           hasSsrOnlyModules = true;
         }
         for (const invalidatedModule of invalidatedModules) {
@@ -49,6 +43,17 @@ function hmrReload() {
           }
         }
         if (hasSsrOnlyModules) {
+          if (isRunnableDevEnvironment(this.environment)) {
+            for (const invalidated of invalidatedModules) {
+              if (invalidated.id == null) continue;
+              const runnerModule = this.environment.runner.evaluatedModules.getModuleById(
+                invalidated.id
+              );
+              if (runnerModule) {
+                this.environment.runner.evaluatedModules.invalidateModule(runnerModule);
+              }
+            }
+          }
           server.ws.send({ type: "full-reload" });
           if (!isRunnableDevEnvironment(this.environment)) {
             this.environment.hot.send({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.3.5",
+  "version": "6.3.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -164,9 +164,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
+    "@astrojs/internal-helpers": "0.9.1",
     "@astrojs/telemetry": "3.3.2",
-    "@astrojs/markdown-remark": "7.1.2",
-    "@astrojs/internal-helpers": "0.9.1"
+    "@astrojs/markdown-remark": "7.1.2"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"