astro 5.16.7 → 5.16.9

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

@@ -6,15 +6,40 @@ import type { FONT_TYPES, GENERIC_FALLBACK_NAMES, LOCAL_PROVIDER_NAME } from './
 import type { CollectedFontForMetrics } from './core/optimize-fallbacks.js';
 type Weight = z.infer<typeof weightSchema>;
 type Display = z.infer<typeof displaySchema>;
+/** @lintignore */
+export interface FontProviderInitContext {
+    storage: {
+        getItem: {
+            <T = unknown>(key: string): Promise<T | null>;
+            <T = unknown>(key: string, init: () => Awaitable<T>): Promise<T>;
+        };
+        setItem: (key: string, value: unknown) => Awaitable<void>;
+    };
+}
+type Awaitable<T> = T | Promise<T>;
 export interface FontProvider {
     /**
-     * URL, path relative to the root or package import.
+     * The font provider name, used for display and deduplication.
      */
-    entrypoint: string | URL;
+    name: string;
     /**
-     * Optional serializable object passed to the unifont provider.
+     * Optional serializable object, used for deduplication.
      */
     config?: Record<string, any> | undefined;
+    /**
+     * Optional callback, used to perform any initialization logic.
+     */
+    init?: ((context: FontProviderInitContext) => Awaitable<void>) | undefined;
+    /**
+     * Required callback, used to retrieve and return font face data based on the given options.
+     */
+    resolveFont: (options: ResolveFontOptions) => Awaitable<{
+        fonts: Array<unifont.FontFaceData>;
+    } | undefined>;
+    /**
+     * Optional callback, used to return the list of available font names.
+     */
+    listFonts?: (() => Awaitable<Array<string> | undefined>) | undefined;
 }
 interface RequiredFamilyAttributes {
     /**
@@ -89,11 +114,6 @@ interface FamilyProperties {
      */
     unicodeRange?: [string, ...Array<string>] | undefined;
 }
-export interface ResolvedFontProvider {
-    name?: string;
-    provider: (config?: Record<string, any>) => unifont.Provider;
-    config?: Record<string, any>;
-}
 type Src = string | URL | {
     url: string | URL;
     tech?: string | undefined;
@@ -161,8 +181,7 @@ export interface RemoteFontFamily extends RequiredFamilyAttributes, Omit<FamilyP
     formats?: [FontType, ...Array<FontType>] | undefined;
 }
 /** @lintignore somehow required by pickFontFaceProperty in utils */
-export interface ResolvedRemoteFontFamily extends ResolvedFontFamilyAttributes, Omit<RemoteFontFamily, 'provider' | 'weights'> {
-    provider: ResolvedFontProvider;
+export interface ResolvedRemoteFontFamily extends ResolvedFontFamilyAttributes, Omit<RemoteFontFamily, 'weights'> {
     weights?: Array<string>;
 }
 export type FontFamily = LocalFontFamily | RemoteFontFamily;
@@ -186,7 +205,7 @@ export interface PreloadData {
 }
 export type FontFaceMetrics = Pick<Font, 'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'>;
 export type GenericFallbackName = (typeof GENERIC_FALLBACK_NAMES)[number];
-export type Defaults = Partial<Pick<ResolvedRemoteFontFamily, 'weights' | 'styles' | 'subsets' | 'fallbacks' | 'optimizedFallbacks' | 'formats'>>;
+export type Defaults = Required<Pick<ResolvedRemoteFontFamily, 'weights' | 'styles' | 'subsets' | 'fallbacks' | 'optimizedFallbacks' | 'formats'>>;
 export interface FontFileData {
     hash: string;
     url: string;
@@ -233,9 +252,9 @@ export type PreloadFilter = boolean | Array<{
 }>;
 export interface ResolveFontOptions {
     familyName: string;
-    weights: string[] | undefined;
-    styles: Style[] | undefined;
-    subsets: string[] | undefined;
-    formats: FontType[] | undefined;
+    weights: string[];
+    styles: Style[];
+    subsets: string[];
+    formats: FontType[];
 }
 export {};

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

@@ -20,7 +20,6 @@ export declare function cache(storage: Storage, key: string, cb: () => Promise<B
 export declare function isGenericFontFamily(str: string): str is GenericFallbackName;
 export declare function dedupe<const T extends Array<any>>(arr: T): T;
 export declare function sortObjectByKey<T extends Record<string, any>>(unordered: T): T;
-export declare function resolveEntrypoint(root: URL, entrypoint: string): URL;
 export declare function pickFontFaceProperty<T extends keyof Pick<unifont.FontFaceData, 'display' | 'unicodeRange' | 'stretch' | 'featureSettings' | 'variationSettings'>>(property: T, { data, family }: {
     data: unifont.FontFaceData;
     family: ResolvedFontFamily;

package/dist/assets/fonts/utils.js

@@ -1,5 +1,3 @@
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
 import { FONT_TYPES, GENERIC_FALLBACK_NAMES, LOCAL_PROVIDER_NAME } from "./constants.js";
 function unifontFontFaceDataToProperties(font) {
   return {
@@ -61,14 +59,6 @@ function sortObjectByKey(unordered) {
   }, {});
   return ordered;
 }
-function resolveEntrypoint(root, entrypoint) {
-  const require2 = createRequire(root);
-  try {
-    return pathToFileURL(require2.resolve(entrypoint));
-  } catch {
-    return new URL(entrypoint, root);
-  }
-}
 function pickFontFaceProperty(property, { data, family }) {
   return data[property] ?? (family.provider === LOCAL_PROVIDER_NAME ? void 0 : family[property]);
 }
@@ -80,7 +70,6 @@ export {
   pickFontFaceProperty,
   renderFontSrc,
   renderFontWeight,
-  resolveEntrypoint,
   sortObjectByKey,
   unifontFontFaceDataToProperties,
   withoutQuotes

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

@@ -17,13 +17,11 @@ import {
   RESOLVED_VIRTUAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./constants.js";
-import { BuildRemoteFontProviderModResolver } from "./infra/build-remote-font-provider-mod-resolver.js";
 import { BuildUrlProxyHashResolver } from "./infra/build-url-proxy-hash-resolver.js";
 import { BuildUrlResolver } from "./infra/build-url-resolver.js";
 import { CachedFontFetcher } from "./infra/cached-font-fetcher.js";
 import { CapsizeFontMetricsResolver } from "./infra/capsize-font-metrics-resolver.js";
 import { RealDataCollector } from "./infra/data-collector.js";
-import { DevServerRemoteFontProviderModResolver } from "./infra/dev-remote-font-provider-mod-resolver.js";
 import { DevUrlProxyHashResolver } from "./infra/dev-url-proxy-hash-resolver.js";
 import { DevUrlResolver } from "./infra/dev-url-resolver.js";
 import { RealFontTypeExtractor } from "./infra/font-type-extractor.js";
@@ -31,7 +29,6 @@ import { FontaceFontFileReader } from "./infra/fontace-font-file-reader.js";
 import { LevenshteinStringMatcher } from "./infra/levenshtein-string-matcher.js";
 import { LocalUrlProxyContentResolver } from "./infra/local-url-proxy-content-resolver.js";
 import { MinifiableCssRenderer } from "./infra/minifiable-css-renderer.js";
-import { RealRemoteFontProviderResolver } from "./infra/remote-font-provider-resolver.js";
 import { RemoteUrlProxyContentResolver } from "./infra/remote-url-proxy-content-resolver.js";
 import { RequireLocalProviderUrlResolver } from "./infra/require-local-provider-url-resolver.js";
 import { RealSystemFallbacksProvider } from "./infra/system-fallbacks-provider.js";
@@ -76,17 +73,12 @@ function fontsPlugin({ settings, sync, logger }) {
   };
   async function initialize({
     cacheDir,
-    modResolver,
     cssRenderer,
     urlResolver,
     createHashResolver
   }) {
     const { root } = settings.config;
     const hasher = await XxhashHasher.create();
-    const remoteFontProviderResolver = new RealRemoteFontProviderResolver({
-      root,
-      modResolver
-    });
     const pathsToWarn = /* @__PURE__ */ new Set();
     const localProviderUrlResolver = new RequireLocalProviderUrlResolver({
       root,
@@ -113,7 +105,6 @@ function fontsPlugin({ settings, sync, logger }) {
     const res = await orchestrate({
       families: settings.config.experimental.fonts,
       hasher,
-      remoteFontProviderResolver,
       localProviderUrlResolver,
       createFontResolver: async ({ families }) => await UnifontFontResolver.create({
         families,
@@ -162,7 +153,6 @@ function fontsPlugin({ settings, sync, logger }) {
       if (isBuild) {
         await initialize({
           cacheDir: new URL(CACHE_DIR, settings.config.cacheDir),
-          modResolver: new BuildRemoteFontProviderModResolver(),
           cssRenderer: new MinifiableCssRenderer({ minify: true }),
           urlResolver: new BuildUrlResolver({
             base: baseUrl,
@@ -171,28 +161,35 @@ function fontsPlugin({ settings, sync, logger }) {
           }),
           createHashResolver: (dependencies) => new BuildUrlProxyHashResolver(dependencies)
         });
+      } else {
+        await initialize({
+          // In dev, we cache fonts data in .astro so it can be easily inspected and cleared
+          cacheDir: new URL(CACHE_DIR, settings.dotAstroDir),
+          cssRenderer: new MinifiableCssRenderer({ minify: false }),
+          urlResolver: new DevUrlResolver({
+            base: baseUrl,
+            searchParams: settings.adapter?.client?.assetQueryParams ?? new URLSearchParams()
+          }),
+          createHashResolver: (dependencies) => new DevUrlProxyHashResolver(dependencies)
+        });
       }
     },
     async configureServer(server) {
-      await initialize({
-        // In dev, we cache fonts data in .astro so it can be easily inspected and cleared
-        cacheDir: new URL(CACHE_DIR, settings.dotAstroDir),
-        modResolver: new DevServerRemoteFontProviderModResolver({ server }),
-        cssRenderer: new MinifiableCssRenderer({ minify: false }),
-        urlResolver: new DevUrlResolver({
-          base: baseUrl,
-          searchParams: settings.adapter?.client?.assetQueryParams ?? new URLSearchParams()
-        }),
-        createHashResolver: (dependencies) => new DevUrlProxyHashResolver(dependencies)
-      });
-      const localPaths = [...fontFileDataMap.values()].filter(({ url }) => isAbsolute(url)).map((v) => v.url);
       server.watcher.on("change", (path) => {
+        if (!fontFileDataMap) {
+          return;
+        }
+        const localPaths = [...fontFileDataMap.values()].filter(({ url }) => isAbsolute(url)).map((v) => v.url);
         if (localPaths.includes(path)) {
           logger.info("assets", "Font file updated");
           server.restart();
         }
       });
       server.watcher.on("unlink", (path) => {
+        if (!fontFileDataMap) {
+          return;
+        }
+        const localPaths = [...fontFileDataMap.values()].filter(({ url }) => isAbsolute(url)).map((v) => v.url);
         if (localPaths.includes(path)) {
           logger.warn(
             "assets",

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

@@ -110,12 +110,12 @@ function assets({ fs, settings, sync, logger }) {
 							import * as fontsMod from 'virtual:astro:assets/fonts/internal';
 							import { createGetFontData } from "astro/assets/fonts/runtime";
 							
-							export const viteFSConfig = ${JSON.stringify(resolvedConfig.server.fs)} ?? {};
-							
+							export const viteFSConfig = ${JSON.stringify(resolvedConfig.server.fs ?? {})};
+
 							export const safeModulePaths = new Set(${JSON.stringify(
               // @ts-expect-error safeModulePaths is internal to Vite
-              Array.from(resolvedConfig.safeModulePaths)
-            )} ?? []);
+              Array.from(resolvedConfig.safeModulePaths ?? [])
+            )});
 
 							const assetQueryParams = ${settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
               Array.from(settings.adapter.client.assetQueryParams.entries())

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

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

@@ -225,11 +225,11 @@ export declare const AstroConfigSchema: z.ZodObject<{
             entrypoint: z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"astro/assets/services/sharp">, z.ZodString]>>;
             config: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, "strip", z.ZodTypeAny, {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         }, {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         }>>;
         domains: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         remotePatterns: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -260,8 +260,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             entrypoint?: string | undefined;
         };
         service: {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         };
         domains: string[];
         remotePatterns: {
@@ -281,8 +281,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             route?: string | undefined;
         } | undefined;
         service?: {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         } | undefined;
         domains?: string[] | undefined;
         remotePatterns?: {
@@ -888,14 +888,39 @@ export declare const AstroConfigSchema: z.ZodObject<{
             optimizedFallbacks?: boolean | undefined;
         }>, z.ZodObject<{
             provider: z.ZodObject<{
-                entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
+                name: z.ZodString;
                 config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+                init: z.ZodOptional<z.ZodType<((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined, z.ZodTypeDef, ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined>>;
+                resolveFont: z.ZodType<(options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined, z.ZodTypeDef, (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined>;
+                listFonts: z.ZodOptional<z.ZodType<(() => string[] | Promise<string[] | undefined> | undefined) | undefined, z.ZodTypeDef, (() => string[] | Promise<string[] | undefined> | undefined) | undefined>>;
             }, "strict", z.ZodTypeAny, {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             }, {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             }>;
             weights: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "atleastone">>;
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
@@ -912,8 +937,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             cssVariable: z.ZodString;
         }, "strict", z.ZodTypeAny, {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -930,8 +962,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             unicodeRange?: [string, ...string[]] | undefined;
         }, {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1065,8 +1104,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1122,8 +1168,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1283,8 +1336,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             entrypoint?: string | undefined;
         };
         service: {
-            entrypoint: string;
             config: Record<string, any>;
+            entrypoint: string;
         };
         domains: string[];
         remotePatterns: {
@@ -1368,8 +1421,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;
@@ -1552,8 +1612,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
             route?: string | undefined;
         } | undefined;
         service?: {
-            entrypoint?: string | undefined;
             config?: Record<string, any> | undefined;
+            entrypoint?: string | undefined;
         } | undefined;
         domains?: string[] | undefined;
         remotePatterns?: {
@@ -1629,8 +1689,15 @@ export declare const AstroConfigSchema: z.ZodObject<{
             optimizedFallbacks?: boolean | undefined;
         } | {
             provider: {
-                entrypoint: string | URL;
+                name: string;
+                resolveFont: (options: import("../../../assets/fonts/types.js").ResolveFontOptions) => {
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | Promise<{
+                    fonts: Array<import("unifont").FontFaceData>;
+                } | undefined> | undefined;
                 config?: Record<string, any> | undefined;
+                init?: ((context: import("../../../assets/fonts/types.js").FontProviderInitContext) => void | Promise<void>) | undefined;
+                listFonts?: (() => string[] | Promise<string[] | undefined> | undefined) | undefined;
             };
             name: string;
             cssVariable: string;