astro 5.7.5 → 5.7.7

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

@@ -3,48 +3,38 @@ import { readFile } from "node:fs/promises";
 import { isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
 import { removeTrailingForwardSlash } from "@astrojs/internal-helpers/path";
-import { createStorage } from "unstorage";
-import fsLiteDriver from "unstorage/drivers/fs-lite";
-import xxhash from "xxhash-wasm";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import { AstroError, AstroErrorData, isAstroError } from "../../core/errors/index.js";
 import { formatErrorMessage } from "../../core/messages.js";
 import { getClientOutputDirectory } from "../../prerender/utils.js";
 import {
   CACHE_DIR,
+  DEFAULTS,
   RESOLVED_VIRTUAL_MODULE_ID,
   URL_PREFIX,
   VIRTUAL_MODULE_ID
 } from "./constants.js";
-import { loadFonts } from "./load.js";
-import { generateFallbackFontFace, readMetrics } from "./metrics.js";
+import { createMinifiableCssRenderer } from "./implementations/css-renderer.js";
+import { createDataCollector } from "./implementations/data-collector.js";
+import { createAstroErrorHandler } from "./implementations/error-handler.js";
+import { createCachedFontFetcher } from "./implementations/font-fetcher.js";
+import { createCapsizeFontMetricsResolver } from "./implementations/font-metrics-resolver.js";
+import { createFontTypeExtractor } from "./implementations/font-type-extractor.js";
+import { createXxHasher } from "./implementations/hasher.js";
+import { createRequireLocalProviderUrlResolver } from "./implementations/local-provider-url-resolver.js";
 import {
-  cache,
-  extractFontType,
-  resolveFontFamily,
-  sortObjectByKey,
-  withoutQuotes
-} from "./utils.js";
-async function fetchFont(url) {
-  try {
-    if (isAbsolute(url)) {
-      return await readFile(url);
-    }
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`Response was not successful, received status code ${response.status}`);
-    }
-    return Buffer.from(await response.arrayBuffer());
-  } catch (cause) {
-    throw new AstroError(
-      {
-        ...AstroErrorData.CannotFetchFontFile,
-        message: AstroErrorData.CannotFetchFontFile.message(url)
-      },
-      { cause }
-    );
-  }
-}
+  createBuildRemoteFontProviderModResolver,
+  createDevServerRemoteFontProviderModResolver
+} from "./implementations/remote-font-provider-mod-resolver.js";
+import { createRemoteFontProviderResolver } from "./implementations/remote-font-provider-resolver.js";
+import { createFsStorage } from "./implementations/storage.js";
+import { createSystemFallbacksProvider } from "./implementations/system-fallbacks-provider.js";
+import {
+  createLocalUrlProxyContentResolver,
+  createRemoteUrlProxyContentResolver
+} from "./implementations/url-proxy-content-resolver.js";
+import { createUrlProxy } from "./implementations/url-proxy.js";
+import { orchestrate } from "./orchestrate.js";
 function fontsPlugin({ settings, sync, logger }) {
   if (!settings.config.experimental.fonts) {
     return {
@@ -64,49 +54,75 @@ function fontsPlugin({ settings, sync, logger }) {
     };
   }
   const baseUrl = removeTrailingForwardSlash(settings.config.base) + URL_PREFIX;
-  let resolvedMap = null;
-  let hashToUrlMap = null;
+  let fontFileDataMap = null;
+  let consumableMap = null;
   let isBuild;
-  let storage = null;
+  let fontFetcher = null;
+  let fontTypeExtractor = null;
   const cleanup = () => {
-    resolvedMap = null;
-    hashToUrlMap = null;
-    storage = null;
+    consumableMap = null;
+    fontFileDataMap = null;
+    fontFetcher = null;
   };
-  async function initialize({ resolveMod, base }) {
-    const { h64ToString } = await xxhash();
-    storage = createStorage({
-      // Types are weirly exported
-      driver: fsLiteDriver({
-        base: fileURLToPath(base)
-      })
+  async function initialize({
+    cacheDir,
+    modResolver,
+    cssRenderer
+  }) {
+    const { root } = settings.config;
+    const hasher = await createXxHasher();
+    const errorHandler = createAstroErrorHandler();
+    const remoteFontProviderResolver = createRemoteFontProviderResolver({
+      root,
+      modResolver,
+      errorHandler
     });
-    hashToUrlMap = /* @__PURE__ */ new Map();
-    resolvedMap = /* @__PURE__ */ new Map();
-    const families = [];
-    for (const family of settings.config.experimental.fonts) {
-      families.push(
-        await resolveFontFamily({
-          family,
-          root: settings.config.root,
-          resolveMod,
-          generateNameWithHash: (_family) => `${withoutQuotes(_family.name)}-${h64ToString(JSON.stringify(sortObjectByKey(_family)))}`
-        })
-      );
-    }
-    await loadFonts({
-      base: baseUrl,
-      families,
+    const pathsToWarn = /* @__PURE__ */ new Set();
+    const localProviderUrlResolver = createRequireLocalProviderUrlResolver({
+      root,
+      intercept: (path) => {
+        if (path.startsWith(fileURLToPath(settings.config.publicDir))) {
+          if (pathsToWarn.has(path)) {
+            return;
+          }
+          pathsToWarn.add(path);
+          logger.warn(
+            "assets",
+            `Found a local font file ${JSON.stringify(path)} in the \`public/\` folder. To avoid duplicated files in the build output, move this file into \`src/\``
+          );
+        }
+      }
+    });
+    const storage = createFsStorage({ base: cacheDir });
+    const systemFallbacksProvider = createSystemFallbacksProvider();
+    fontFetcher = createCachedFontFetcher({ storage, errorHandler, fetch, readFile });
+    const fontMetricsResolver = createCapsizeFontMetricsResolver({ fontFetcher, cssRenderer });
+    fontTypeExtractor = createFontTypeExtractor({ errorHandler });
+    const res = await orchestrate({
+      families: settings.config.experimental.fonts,
+      hasher,
+      remoteFontProviderResolver,
+      localProviderUrlResolver,
       storage,
-      hashToUrlMap,
-      resolvedMap,
-      hashString: h64ToString,
-      generateFallbackFontFace,
-      getMetricsForFamily: async (name, font) => {
-        return await readMetrics(name, await cache(storage, font.hash, () => fetchFont(font.url)));
+      cssRenderer,
+      systemFallbacksProvider,
+      fontMetricsResolver,
+      fontTypeExtractor,
+      createUrlProxy: ({ local, ...params }) => {
+        const dataCollector = createDataCollector(params);
+        const contentResolver = local ? createLocalUrlProxyContentResolver({ errorHandler }) : createRemoteUrlProxyContentResolver();
+        return createUrlProxy({
+          base: baseUrl,
+          contentResolver,
+          hasher,
+          dataCollector,
+          fontTypeExtractor
+        });
       },
-      log: (message) => logger.info("assets", message)
+      defaults: DEFAULTS
     });
+    fontFileDataMap = res.fontFileDataMap;
+    consumableMap = res.consumableMap;
   }
   return {
     name: "astro:fonts",
@@ -116,18 +132,20 @@ function fontsPlugin({ settings, sync, logger }) {
     async buildStart() {
       if (isBuild) {
         await initialize({
-          resolveMod: (id) => import(id),
-          base: new URL(CACHE_DIR, settings.config.cacheDir)
+          cacheDir: new URL(CACHE_DIR, settings.config.cacheDir),
+          modResolver: createBuildRemoteFontProviderModResolver(),
+          cssRenderer: createMinifiableCssRenderer({ minify: true })
         });
       }
     },
     async configureServer(server) {
       await initialize({
-        resolveMod: (id) => server.ssrLoadModule(id),
         // In dev, we cache fonts data in .astro so it can be easily inspected and cleared
-        base: new URL(CACHE_DIR, settings.dotAstroDir)
+        cacheDir: new URL(CACHE_DIR, settings.dotAstroDir),
+        modResolver: createDevServerRemoteFontProviderModResolver({ server }),
+        cssRenderer: createMinifiableCssRenderer({ minify: false })
       });
-      const localPaths = [...hashToUrlMap.values()].filter((url) => isAbsolute(url));
+      const localPaths = [...fontFileDataMap.values()].filter(({ url }) => isAbsolute(url)).map((v) => v.url);
       server.watcher.on("change", (path) => {
         if (localPaths.includes(path)) {
           logger.info("assets", "Font file updated");
@@ -147,17 +165,17 @@ function fontsPlugin({ settings, sync, logger }) {
           return next();
         }
         const hash = req.url.slice(1);
-        const url = hashToUrlMap?.get(hash);
-        if (!url) {
+        const associatedData = fontFileDataMap?.get(hash);
+        if (!associatedData) {
           return next();
         }
         res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0");
         res.setHeader("Pragma", "no-cache");
         res.setHeader("Expires", 0);
         try {
-          const data = await cache(storage, hash, () => fetchFont(url));
+          const data = await fontFetcher.fetch({ hash, ...associatedData });
           res.setHeader("Content-Length", data.length);
-          res.setHeader("Content-Type", `font/${extractFontType(hash)}`);
+          res.setHeader("Content-Type", `font/${fontTypeExtractor.extract(hash)}`);
           res.end(data);
         } catch (err) {
           logger.error("assets", "Cannot download font file");
@@ -180,7 +198,7 @@ function fontsPlugin({ settings, sync, logger }) {
     load(id) {
       if (id === RESOLVED_VIRTUAL_MODULE_ID) {
         return {
-          code: `export const fontsData = new Map(${JSON.stringify(Array.from(resolvedMap?.entries() ?? []))})`
+          code: `export const fontsData = new Map(${JSON.stringify(Array.from(consumableMap?.entries() ?? []))})`
         };
       }
     },
@@ -197,11 +215,11 @@ function fontsPlugin({ settings, sync, logger }) {
         } catch (cause) {
           throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause });
         }
-        if (hashToUrlMap) {
+        if (fontFileDataMap) {
           logger.info("assets", "Copying fonts...");
           await Promise.all(
-            Array.from(hashToUrlMap.entries()).map(async ([hash, url]) => {
-              const data = await cache(storage, hash, () => fetchFont(url));
+            Array.from(fontFileDataMap.entries()).map(async ([hash, associatedData]) => {
+              const data = await fontFetcher.fetch({ hash, ...associatedData });
               try {
                 writeFileSync(new URL(hash, fontsDir), data);
               } catch (cause) {

package/dist/assets/internal.js

@@ -112,8 +112,6 @@ async function getImage(options, imageConfig) {
     if (layout !== "none") {
       resolvedOptions.style = addCSSVarsToStyle(
         {
-          w: String(resolvedOptions.width),
-          h: String(resolvedOptions.height),
           fit: cssFitValues.includes(resolvedOptions.fit ?? "") && resolvedOptions.fit,
           pos: resolvedOptions.position
         },

package/dist/assets/layout.js

@@ -66,7 +66,7 @@ const getWidths = ({
   if (layout === "fixed") {
     return originalWidth && width > originalWidth ? [originalWidth] : [width, maxSize];
   }
-  if (layout === "responsive") {
+  if (layout === "constrained") {
     return [
       // Always include the image at 1x and 2x the specified width
       width,
@@ -86,13 +86,13 @@ const getSizesAttribute = ({
   switch (layout) {
     // If screen is wider than the max size then image width is the max size,
     // otherwise it's the width of the screen
-    case `responsive`:
+    case "constrained":
       return `(min-width: ${width}px) ${width}px, 100vw`;
     // Image is always the same width, whatever the size of the screen
-    case `fixed`:
+    case "fixed":
       return `${width}px`;
     // Image is always the width of the screen
-    case `full-width`:
+    case "full-width":
       return `100vw`;
     case "none":
     default:

package/dist/assets/types.d.ts

@@ -5,7 +5,7 @@ export type ImageQualityPreset = 'low' | 'mid' | 'high' | 'max' | (string & {});
 export type ImageQuality = ImageQualityPreset | number;
 export type ImageInputFormat = (typeof VALID_INPUT_FORMATS)[number];
 export type ImageOutputFormat = (typeof VALID_OUTPUT_FORMATS)[number] | (string & {});
-export type ImageLayout = 'responsive' | 'fixed' | 'full-width' | 'none';
+export type ImageLayout = 'constrained' | 'fixed' | 'full-width' | 'none';
 export type ImageFit = 'fill' | 'contain' | 'cover' | 'none' | 'scale-down' | (string & {});
 export type AssetsGlobalStaticImagesList = Map<string, {
     originalSrcPath: string | undefined;
@@ -140,15 +140,15 @@ type ImageSharedProps<T> = T & {
     /**
      * The layout type for responsive images. Requires the `experimental.responsiveImages` flag to be enabled in the Astro config.
      *
-     * Allowed values are `responsive`, `fixed`, `full-width` or `none`. Defaults to value of `image.experimentalLayout`.
+     * Allowed values are `constrained`, `fixed`, `full-width` or `none`. Defaults to value of `image.experimentalLayout`.
      *
-     * - `responsive` - The image will scale to fit the container, maintaining its aspect ratio, but will not exceed the specified dimensions.
+     * - `constrained` - The image will scale to fit the container, maintaining its aspect ratio, but will not exceed the specified dimensions.
      * - `fixed` - The image will maintain its original dimensions.
      * - `full-width` - The image will scale to fit the container, maintaining its aspect ratio, even if that means the image will exceed its original dimensions.
      *
      * **Example**:
      * ```astro
-     * <Image src={...} layout="responsive" alt="..." />
+     * <Image src={...} layout="constrained" alt="..." />
      * ```
      */
     layout?: ImageLayout;

package/dist/content/content-layer.js

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

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

@@ -240,7 +240,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             hostname?: string | undefined;
             pathname?: string | undefined;
         }>, "many">>;
-        experimentalLayout: z.ZodOptional<z.ZodEnum<["responsive", "fixed", "full-width", "none"]>>;
+        experimentalLayout: z.ZodOptional<z.ZodEnum<["constrained", "fixed", "full-width", "none"]>>;
         experimentalObjectFit: z.ZodOptional<z.ZodString>;
         experimentalObjectPosition: z.ZodOptional<z.ZodString>;
         experimentalBreakpoints: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
@@ -260,7 +260,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             hostname?: string | undefined;
             pathname?: string | undefined;
         }[];
-        experimentalLayout?: "none" | "fixed" | "responsive" | "full-width" | undefined;
+        experimentalLayout?: "none" | "fixed" | "constrained" | "full-width" | undefined;
         experimentalObjectFit?: string | undefined;
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
@@ -280,7 +280,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             hostname?: string | undefined;
             pathname?: string | undefined;
         }[] | undefined;
-        experimentalLayout?: "none" | "fixed" | "responsive" | "full-width" | undefined;
+        experimentalLayout?: "none" | "fixed" | "constrained" | "full-width" | undefined;
         experimentalObjectFit?: string | undefined;
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
@@ -728,7 +728,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             name: z.ZodString;
             cssVariable: z.ZodString;
         }, {
-            fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+            fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
         }>, {
             provider: z.ZodLiteral<"local">;
@@ -817,7 +817,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         }, {
             name: string;
@@ -854,7 +854,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         }>, z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
             name: z.ZodString;
@@ -868,7 +868,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             featureSettings: z.ZodOptional<z.ZodString>;
             variationSettings: z.ZodOptional<z.ZodString>;
         }, "style" | "weight">>, {
-            fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+            fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
         }>, {
             provider: z.ZodObject<{
@@ -891,7 +891,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;
@@ -908,7 +908,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;
@@ -960,7 +960,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         } | {
             name: string;
@@ -969,7 +969,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;
@@ -1021,7 +1021,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         } | {
             name: string;
@@ -1030,7 +1030,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;
@@ -1106,7 +1106,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             hostname?: string | undefined;
             pathname?: string | undefined;
         }[];
-        experimentalLayout?: "none" | "fixed" | "responsive" | "full-width" | undefined;
+        experimentalLayout?: "none" | "fixed" | "constrained" | "full-width" | undefined;
         experimentalObjectFit?: string | undefined;
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
@@ -1221,7 +1221,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         } | {
             name: string;
@@ -1230,7 +1230,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;
@@ -1338,7 +1338,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             hostname?: string | undefined;
             pathname?: string | undefined;
         }[] | undefined;
-        experimentalLayout?: "none" | "fixed" | "responsive" | "full-width" | undefined;
+        experimentalLayout?: "none" | "fixed" | "constrained" | "full-width" | undefined;
         experimentalObjectFit?: string | undefined;
         experimentalObjectPosition?: string | undefined;
         experimentalBreakpoints?: number[] | undefined;
@@ -1480,7 +1480,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 featureSettings?: string | undefined;
                 variationSettings?: string | undefined;
             }[]];
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
         } | {
             name: string;
@@ -1489,7 +1489,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
                 entrypoint: string | URL;
                 config?: Record<string, any> | undefined;
             };
-            fallbacks?: [string, ...string[]] | undefined;
+            fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
             display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
             unicodeRange?: [string, ...string[]] | undefined;

package/dist/core/config/schemas/base.js

@@ -146,7 +146,7 @@ const AstroConfigSchema = z.object({
         pathname: z.string().optional()
       })
     ).default([]),
-    experimentalLayout: z.enum(["responsive", "fixed", "full-width", "none"]).optional(),
+    experimentalLayout: z.enum(["constrained", "fixed", "full-width", "none"]).optional(),
     experimentalObjectFit: z.string().optional(),
     experimentalObjectPosition: z.string().optional(),
     experimentalBreakpoints: z.array(z.number()).optional()