astro 5.7.0 → 5.7.1

package/components/Font.astro

@@ -23,10 +23,10 @@ if (!data) {
 }
 ---
 
-<style set:html={data.css}></style>
 {
 	preload &&
 		data.preloadData.map(({ url, type }) => (
 			<link rel="preload" href={url} as="font" type={`font/${type}`} crossorigin />
 		))
 }
+<style set:html={data.css}></style>

package/dist/assets/fonts/load.js

@@ -81,9 +81,11 @@ async function loadFonts({
         // Name has been set while extracting unifont providers from families (inside familiesToUnifontProviders)
         [family.provider.name]
       );
-      fonts = result.fonts.map((font) => ({
+      fonts = result.fonts.filter(
+        (font) => typeof font.meta?.priority === "number" ? font.meta.priority === 0 : true
+      ).map((font) => ({
         ...font,
-        src: font.src.map(
+        src: font.src.slice(0, 1).map(
           (source) => "name" in source ? source : {
             ...source,
             originalURL: source.url,

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

@@ -1,6 +1,5 @@
 import { type Font } from '@capsizecss/unpack';
 export type FontFaceMetrics = Pick<Font, 'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'>;
-export declare function getMetricsForFamily(family: string): Promise<FontFaceMetrics | null>;
 export declare function readMetrics(family: string, buffer: Buffer): Promise<FontFaceMetrics>;
 export declare function generateFallbackFontFace(metrics: FontFaceMetrics, fallback: {
     name: string;

package/dist/assets/fonts/metrics.js

@@ -1,7 +1,4 @@
-import { fontFamilyToCamelCase } from "@capsizecss/metrics";
 import { fromBuffer } from "@capsizecss/unpack";
-const QUOTES_RE = /^["']|["']$/g;
-const withoutQuotes = (str) => str.trim().replace(QUOTES_RE, "");
 const metricCache = {};
 function filterRequiredMetrics({
   ascent,
@@ -18,25 +15,6 @@ function filterRequiredMetrics({
     xWidthAvg
   };
 }
-async function getMetricsForFamily(family) {
-  family = withoutQuotes(family);
-  if (family in metricCache) return metricCache[family];
-  try {
-    const name = fontFamilyToCamelCase(family);
-    const { entireMetricsCollection } = await import("@capsizecss/metrics/entireMetricsCollection");
-    const metrics = entireMetricsCollection[name];
-    if (!("descent" in metrics)) {
-      metricCache[family] = null;
-      return null;
-    }
-    const filteredMetrics = filterRequiredMetrics(metrics);
-    metricCache[family] = filteredMetrics;
-    return filteredMetrics;
-  } catch {
-    metricCache[family] = null;
-    return null;
-  }
-}
 async function readMetrics(family, buffer) {
   const metrics = await fromBuffer(buffer);
   metricCache[family] = filterRequiredMetrics(metrics);
@@ -79,6 +57,5 @@ ${toCSS(declaration)}
 }
 export {
   generateFallbackFontFace,
-  getMetricsForFamily,
   readMetrics
 };

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

@@ -7,10 +7,7 @@ import type { FontFamily, FontType, ResolvedFontFamily } from './types.js';
 export declare function generateFontFace(family: string, font: unifont.FontFaceData): string;
 export declare function extractFontType(str: string): FontType;
 export declare function isFontType(str: string): str is FontType;
-export declare function cache(storage: Storage, key: string, cb: () => Promise<Buffer>): Promise<{
-    cached: boolean;
-    data: Buffer;
-}>;
+export declare function cache(storage: Storage, key: string, cb: () => Promise<Buffer>): Promise<Buffer>;
 export interface ProxyURLOptions {
     /**
      * The original URL
@@ -45,10 +42,10 @@ export declare function isGenericFontFamily(str: string): str is keyof typeof DE
 export type GetMetricsForFamilyFont = {
     hash: string;
     url: string;
-} | null;
+};
 export type GetMetricsForFamily = (name: string, 
 /** A remote url or local filepath to a font file. Used if metrics can't be resolved purely from the family name */
-font: GetMetricsForFamilyFont) => Promise<FontFaceMetrics | null>;
+font: GetMetricsForFamilyFont) => Promise<FontFaceMetrics>;
 /**
  * Generates CSS for a given family fallbacks if possible.
  *
@@ -60,7 +57,7 @@ export declare function generateFallbacksCSS({ family, fallbacks: _fallbacks, fo
     family: Pick<ResolvedFontFamily, 'name' | 'nameWithHash'>;
     /** The family fallbacks */
     fallbacks: Array<string>;
-    font: GetMetricsForFamilyFont;
+    font: GetMetricsForFamilyFont | null;
     metrics: {
         getMetricsForFamily: GetMetricsForFamily;
         generateFontFace: typeof generateFallbackFontFace;

package/dist/assets/fonts/utils.js

@@ -54,11 +54,11 @@ function isFontType(str) {
 async function cache(storage, key, cb) {
   const existing = await storage.getItemRaw(key);
   if (existing) {
-    return { cached: true, data: existing };
+    return existing;
   }
   const data = await cb();
   await storage.setItemRaw(key, data);
-  return { cached: false, data };
+  return data;
 }
 function proxyURL({ value, hashString, collect }) {
   const type = extractFontType(value);
@@ -80,7 +80,7 @@ async function generateFallbacksCSS({
     return null;
   }
   let css = "";
-  if (!metrics) {
+  if (!fontData || !metrics) {
     return { css, fallbacks };
   }
   const lastFallback = fallbacks[fallbacks.length - 1];

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

@@ -17,7 +17,7 @@ import {
   VIRTUAL_MODULE_ID
 } from "./constants.js";
 import { loadFonts } from "./load.js";
-import { generateFallbackFontFace, getMetricsForFamily, readMetrics } from "./metrics.js";
+import { generateFallbackFontFace, readMetrics } from "./metrics.js";
 import { cache, extractFontType, resolveFontFamily, sortObjectByKey } from "./utils.js";
 async function fetchFont(url) {
   try {
@@ -94,12 +94,7 @@ function fontsPlugin({ settings, sync, logger }) {
       hashString: h64ToString,
       generateFallbackFontFace,
       getMetricsForFamily: async (name, font) => {
-        let metrics = await getMetricsForFamily(name);
-        if (font && !metrics) {
-          const { data } = await cache(storage, font.hash, () => fetchFont(font.url));
-          metrics = await readMetrics(name, data);
-        }
-        return metrics;
+        return await readMetrics(name, await cache(storage, font.hash, () => fetchFont(font.url)));
       },
       log: (message) => logger.info("assets", message)
     });
@@ -151,7 +146,7 @@ function fontsPlugin({ settings, sync, logger }) {
         res.setHeader("Pragma", "no-cache");
         res.setHeader("Expires", 0);
         try {
-          const { data } = await cache(storage, hash, () => fetchFont(url));
+          const data = await cache(storage, hash, () => fetchFont(url));
           res.setHeader("Content-Length", data.length);
           res.setHeader("Content-Type", `font/${extractFontType(hash)}`);
           res.end(data);
@@ -173,8 +168,8 @@ function fontsPlugin({ settings, sync, logger }) {
         return RESOLVED_VIRTUAL_MODULE_ID;
       }
     },
-    load(id, opts) {
-      if (id === RESOLVED_VIRTUAL_MODULE_ID && opts?.ssr) {
+    load(id) {
+      if (id === RESOLVED_VIRTUAL_MODULE_ID) {
         return {
           code: `export const fontsData = new Map(${JSON.stringify(Array.from(resolvedMap?.entries() ?? []))})`
         };
@@ -197,7 +192,7 @@ function fontsPlugin({ settings, sync, logger }) {
           logger.info("assets", "Copying fonts...");
           await Promise.all(
             Array.from(hashToUrlMap.entries()).map(async ([hash, url]) => {
-              const { data } = await cache(storage, hash, () => fetchFont(url));
+              const data = await cache(storage, hash, () => fetchFont(url));
               try {
                 writeFileSync(new URL(hash, fontsDir), data);
               } catch (cause) {

package/dist/config/entrypoint.d.ts

@@ -5,7 +5,7 @@ export { envField } from '../env/config.js';
 export { mergeConfig } from '../core/config/merge.js';
 export { validateConfig } from '../core/config/validate.js';
 export { fontProviders, defineAstroFontProvider } from '../assets/fonts/providers/index.js';
-export type { AstroFontProvider as FontProvider } from '../assets/fonts/types.js';
+export type { AstroFontProvider } from '../assets/fonts/types.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

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.0") {
+    if (previousAstroVersion && previousAstroVersion !== "5.7.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.7.0") {
-      await this.#store.metaStore().set("astro-version", "5.7.0");
+    if ("5.7.1") {
+      await this.#store.metaStore().set("astro-version", "5.7.1");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.7.0";
+const ASTRO_VERSION = "5.7.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/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.7.0";
+  const currentVersion = "5.7.1";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

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

package/dist/core/session.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -105,7 +105,6 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^2.11.0",
-    "@capsizecss/metrics": "^3.5.0",
     "@capsizecss/unpack": "^2.4.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.1.4",
@@ -149,7 +148,7 @@
     "tinyglobby": "^0.2.12",
     "tsconfck": "^3.1.5",
     "ultrahtml": "^1.6.0",
-    "unifont": "^0.1.7",
+    "unifont": "~0.2.0",
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.15.0",
     "vfile": "^6.0.3",
@@ -161,9 +160,9 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.6.1",
+    "@astrojs/telemetry": "3.2.0",
     "@astrojs/markdown-remark": "6.3.1",
-    "@astrojs/telemetry": "3.2.0"
+    "@astrojs/internal-helpers": "0.6.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"