astro 5.16.13 → 5.16.15

package/dist/core/constants.js

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

package/dist/core/errors/errors-data.d.ts

@@ -1239,7 +1239,7 @@ export declare const ExperimentalFontsNotEnabled: {
  * @description
  * Font family not found
  * @message
- * No data was found for the `cssVariable` passed to the `<Font />`.
+ * No data was found for the `cssVariable` passed to the `<Font />` component.
  */
 export declare const FontFamilyNotFound: {
     name: string;

package/dist/core/errors/errors-data.js

@@ -473,7 +473,7 @@ const FontFamilyNotFound = {
 const FontBufferNotFound = {
   name: "FontBufferNotFound",
   title: "Font buffer not found",
-  message: (url) => `No buffer was found for the \`"${url}"\` passed to the \`getFontBuffer()\` function.`,
+  message: (url) => `No buffer was found for the \`"${url}"\` URL passed to the \`getFontBuffer()\` function.`,
   hint: "Make sure you pass a valid URL, obtained via the `fontData` object."
 };
 const CspNotEnabled = {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.16.13";
+  const version = "5.16.15";
   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.13"}`
+        `v${"5.16.15"}`
       )} ${headline}`
     );
   }

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

@@ -4,8 +4,7 @@ import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, SyntaxHig
 import type { Config as SvgoConfig } from 'svgo';
 import type { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage } from 'unstorage';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
-import type { LOCAL_PROVIDER_NAME } from '../../assets/fonts/constants.js';
-import type { FontFamily, FontProvider, LocalFontFamily } from '../../assets/fonts/types.js';
+import type { FontFamily, FontProvider } from '../../assets/fonts/types.js';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
 import type { AssetsPrefix } from '../../core/app/types.js';
 import type { AstroConfigType } from '../../core/config/schemas/index.js';
@@ -152,7 +151,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
  *
  * Generics do not follow semver and may change at any time.
  */
-export interface AstroUserConfig<TLocales extends Locales = never, TSession extends SessionDriverName = never, TFontProviders extends Array<FontProvider | typeof LOCAL_PROVIDER_NAME> = never> {
+export interface AstroUserConfig<TLocales extends Locales = never, TSession extends SessionDriverName = never, TFontProviders extends Array<FontProvider> = never> {
     /**
      * @docs
      * @kind heading
@@ -2061,7 +2060,7 @@ export interface AstroUserConfig<TLocales extends Locales = never, TSession exte
          * see the [Fonts RFC](https://github.com/withastro/roadmap/pull/1039).
          */
         fonts?: [TFontProviders] extends [never] ? Array<FontFamily> : {
-            [K in keyof TFontProviders]: TFontProviders[K] extends FontProvider ? FontFamily<TFontProviders[K]> : LocalFontFamily;
+            [K in keyof TFontProviders]: FontFamily<TFontProviders[K]>;
         };
         /**
          * @name experimental.headingIdCompat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.16.13",
+  "version": "5.16.15",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -154,9 +154,9 @@
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.25.1",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.7.5",
     "@astrojs/markdown-remark": "6.3.10",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/internal-helpers": "0.7.5"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -194,8 +194,8 @@
     "undici": "^6.23.0",
     "unified": "^11.0.5",
     "vitest": "^3.2.4",
-    "@astrojs/check": "0.9.6",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/check": "0.9.6"
   },
   "engines": {
     "node": "18.20.8 || ^20.3.0 || >=22.0.0",

package/dist/assets/fonts/core/normalize-remote-font-faces.d.ts

@@ -1,7 +0,0 @@
-import type * as unifont from 'unifont';
-import type { FontTypeExtractor, UrlProxy } from '../definitions.js';
-export declare function normalizeRemoteFontFaces({ fonts, urlProxy, fontTypeExtractor, }: {
-    fonts: Array<unifont.FontFaceData>;
-    urlProxy: UrlProxy;
-    fontTypeExtractor: FontTypeExtractor;
-}): Array<unifont.FontFaceData>;

package/dist/assets/fonts/core/normalize-remote-font-faces.js

@@ -1,41 +0,0 @@
-import { FONT_FORMATS } from "../constants.js";
-function normalizeRemoteFontFaces({
-  fonts,
-  urlProxy,
-  fontTypeExtractor
-}) {
-  return fonts.filter((font) => typeof font.meta?.priority === "number" ? font.meta.priority <= 1 : true).map((font) => {
-    let index = 0;
-    return {
-      ...font,
-      src: font.src.map((source) => {
-        if ("name" in source) {
-          return source;
-        }
-        const url = source.url.startsWith("//") ? `https:${source.url}` : source.url;
-        const proxied = {
-          ...source,
-          originalURL: url,
-          url: urlProxy.proxy({
-            url,
-            type: FONT_FORMATS.find((e) => e.format === source.format)?.type ?? fontTypeExtractor.extract(source.url),
-            // We only collect the first URL to avoid preloading fallback sources (eg. we only
-            // preload woff2 if woff is available)
-            collectPreload: index === 0,
-            data: {
-              weight: font.weight,
-              style: font.style,
-              subset: font.meta?.subset
-            },
-            init: font.meta?.init ?? null
-          })
-        };
-        index++;
-        return proxied;
-      })
-    };
-  });
-}
-export {
-  normalizeRemoteFontFaces
-};

package/dist/assets/fonts/core/resolve-families.d.ts

@@ -1,16 +0,0 @@
-import type { Hasher, LocalProviderUrlResolver } from '../definitions.js';
-import type { FontFamily, ResolvedFontFamily } from '../types.js';
-/**
- * Dedupes properties if applicable and resolves entrypoints.
- */
-export declare function resolveFamily({ family, hasher, localProviderUrlResolver, }: {
-    family: FontFamily;
-    hasher: Hasher;
-    localProviderUrlResolver: LocalProviderUrlResolver;
-}): ResolvedFontFamily;
-/**
- * A function for convenience. The actual logic lives in resolveFamily
- */
-export declare function resolveFamilies({ families, ...dependencies }: {
-    families: Array<FontFamily>;
-} & Omit<Parameters<typeof resolveFamily>[0], 'family'>): Array<ResolvedFontFamily>;

package/dist/assets/fonts/core/resolve-families.js

@@ -1,63 +0,0 @@
-import { LOCAL_PROVIDER_NAME } from "../constants.js";
-import { dedupe, withoutQuotes } from "../utils.js";
-function resolveVariants({
-  variants,
-  localProviderUrlResolver
-}) {
-  return variants.map((variant) => ({
-    ...variant,
-    weight: variant.weight?.toString(),
-    src: variant.src.map((value) => {
-      const isValue = typeof value === "string" || value instanceof URL;
-      const url = (isValue ? value : value.url).toString();
-      const tech = isValue ? void 0 : value.tech;
-      return {
-        url: localProviderUrlResolver.resolve(url),
-        tech
-      };
-    })
-  }));
-}
-function resolveFamily({
-  family,
-  hasher,
-  localProviderUrlResolver
-}) {
-  const name = withoutQuotes(family.name);
-  const nameWithHash = `${name}-${hasher.hashObject(family)}`;
-  if (family.provider === LOCAL_PROVIDER_NAME) {
-    return {
-      ...family,
-      name,
-      nameWithHash,
-      variants: resolveVariants({ variants: family.variants, localProviderUrlResolver }),
-      fallbacks: family.fallbacks ? dedupe(family.fallbacks) : void 0
-    };
-  }
-  return {
-    ...family,
-    name,
-    nameWithHash,
-    weights: family.weights ? dedupe(family.weights.map((weight) => weight.toString())) : void 0,
-    styles: family.styles ? dedupe(family.styles) : void 0,
-    subsets: family.subsets ? dedupe(family.subsets) : void 0,
-    formats: family.formats ? dedupe(family.formats) : void 0,
-    fallbacks: family.fallbacks ? dedupe(family.fallbacks) : void 0,
-    unicodeRange: family.unicodeRange ? dedupe(family.unicodeRange) : void 0
-  };
-}
-function resolveFamilies({
-  families,
-  ...dependencies
-}) {
-  return families.map(
-    (family) => resolveFamily({
-      family,
-      ...dependencies
-    })
-  );
-}
-export {
-  resolveFamilies,
-  resolveFamily
-};

package/dist/assets/fonts/infra/build-url-proxy-hash-resolver.d.ts

@@ -1,15 +0,0 @@
-import type { Hasher, ProxyData, UrlProxyContentResolver, UrlProxyHashResolver } from '../definitions.js';
-import type { FontType } from '../types.js';
-export declare class BuildUrlProxyHashResolver implements UrlProxyHashResolver {
-    #private;
-    constructor({ hasher, contentResolver, }: {
-        hasher: Hasher;
-        contentResolver: UrlProxyContentResolver;
-    });
-    resolve({ originalUrl, type, }: {
-        originalUrl: string;
-        type: FontType;
-        cssVariable: string;
-        data: ProxyData;
-    }): string;
-}

package/dist/assets/fonts/infra/data-collector.d.ts

@@ -1,10 +0,0 @@
-import type { DataCollector, ProxyData } from '../definitions.js';
-import type { CreateUrlProxyParams, FontFileData, PreloadData } from '../types.js';
-export declare class RealDataCollector implements DataCollector {
-    #private;
-    constructor({ hasUrl, saveUrl, savePreload, saveFontData, }: Pick<CreateUrlProxyParams, 'hasUrl' | 'saveUrl' | 'savePreload' | 'saveFontData'>);
-    collect({ hash, url, init, preload, data, }: FontFileData & {
-        data: ProxyData;
-        preload: PreloadData | null;
-    }): void;
-}

package/dist/assets/fonts/infra/data-collector.js

@@ -1,35 +0,0 @@
-class RealDataCollector {
-  #hasUrl;
-  #saveUrl;
-  #savePreload;
-  #saveFontData;
-  constructor({
-    hasUrl,
-    saveUrl,
-    savePreload,
-    saveFontData
-  }) {
-    this.#hasUrl = hasUrl;
-    this.#saveUrl = saveUrl;
-    this.#savePreload = savePreload;
-    this.#saveFontData = saveFontData;
-  }
-  collect({
-    hash,
-    url,
-    init,
-    preload,
-    data
-  }) {
-    if (!this.#hasUrl(hash)) {
-      this.#saveUrl({ hash, url, init });
-      if (preload) {
-        this.#savePreload(preload);
-      }
-    }
-    this.#saveFontData({ hash, url, data, init });
-  }
-}
-export {
-  RealDataCollector
-};

package/dist/assets/fonts/infra/dev-url-proxy-hash-resolver.d.ts

@@ -1,15 +0,0 @@
-import type { Hasher, ProxyData, UrlProxyContentResolver, UrlProxyHashResolver } from '../definitions.js';
-import type { FontType } from '../types.js';
-export declare class DevUrlProxyHashResolver implements UrlProxyHashResolver {
-    #private;
-    constructor({ hasher, contentResolver, }: {
-        hasher: Hasher;
-        contentResolver: UrlProxyContentResolver;
-    });
-    resolve({ cssVariable, data, originalUrl, type, }: {
-        originalUrl: string;
-        type: FontType;
-        cssVariable: string;
-        data: ProxyData;
-    }): string;
-}

package/dist/assets/fonts/infra/local-url-proxy-content-resolver.d.ts

@@ -1,4 +0,0 @@
-import type { UrlProxyContentResolver } from '../definitions.js';
-export declare class LocalUrlProxyContentResolver implements UrlProxyContentResolver {
-    resolve(url: string): string;
-}

package/dist/assets/fonts/infra/local-url-proxy-content-resolver.js

@@ -1,14 +0,0 @@
-import { readFileSync } from "node:fs";
-import { AstroError, AstroErrorData } from "../../../core/errors/index.js";
-class LocalUrlProxyContentResolver {
-  resolve(url) {
-    try {
-      return url + readFileSync(url, "utf-8");
-    } catch (cause) {
-      throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause });
-    }
-  }
-}
-export {
-  LocalUrlProxyContentResolver
-};

package/dist/assets/fonts/infra/remote-url-proxy-content-resolver.d.ts

@@ -1,4 +0,0 @@
-import type { UrlProxyContentResolver } from '../definitions.js';
-export declare class RemoteUrlProxyContentResolver implements UrlProxyContentResolver {
-    resolve(url: string): string;
-}

package/dist/assets/fonts/infra/remote-url-proxy-content-resolver.js

@@ -1,9 +0,0 @@
-class RemoteUrlProxyContentResolver {
-  // Passthrough, the remote provider URL is enough
-  resolve(url) {
-    return url;
-  }
-}
-export {
-  RemoteUrlProxyContentResolver
-};

package/dist/assets/fonts/infra/require-local-provider-url-resolver.d.ts

@@ -1,9 +0,0 @@
-import type { LocalProviderUrlResolver } from '../definitions.js';
-export declare class RequireLocalProviderUrlResolver implements LocalProviderUrlResolver {
-    #private;
-    constructor({ root, intercept, }: {
-        root: URL;
-        intercept?: ((path: string) => void) | undefined;
-    });
-    resolve(input: string): string;
-}

package/dist/assets/fonts/infra/require-local-provider-url-resolver.js

@@ -1,30 +0,0 @@
-import { createRequire } from "node:module";
-import { fileURLToPath, pathToFileURL } from "node:url";
-class RequireLocalProviderUrlResolver {
-  #root;
-  // TODO: remove when stabilizing
-  #intercept;
-  constructor({
-    root,
-    intercept
-  }) {
-    this.#root = root;
-    this.#intercept = intercept;
-  }
-  #resolveEntrypoint(root, entrypoint) {
-    const require2 = createRequire(root);
-    try {
-      return pathToFileURL(require2.resolve(entrypoint));
-    } catch {
-      return new URL(entrypoint, root);
-    }
-  }
-  resolve(input) {
-    const path = fileURLToPath(this.#resolveEntrypoint(this.#root, input));
-    this.#intercept?.(path);
-    return path;
-  }
-}
-export {
-  RequireLocalProviderUrlResolver
-};

package/dist/assets/fonts/infra/url-proxy.d.ts

@@ -1,16 +0,0 @@
-import type { DataCollector, ProxyData, UrlProxy, UrlProxyHashResolver, UrlResolver } from '../definitions.js';
-import type { FontFileData, FontType } from '../types.js';
-export declare class RealUrlProxy implements UrlProxy {
-    #private;
-    constructor({ hashResolver, dataCollector, urlResolver, cssVariable, }: {
-        hashResolver: UrlProxyHashResolver;
-        dataCollector: DataCollector;
-        urlResolver: UrlResolver;
-        cssVariable: string;
-    });
-    proxy({ url: originalUrl, type, data, collectPreload, init, }: Pick<FontFileData, 'url' | 'init'> & {
-        type: FontType;
-        collectPreload: boolean;
-        data: ProxyData;
-    }): string;
-}

package/dist/assets/fonts/infra/url-proxy.js

@@ -1,50 +0,0 @@
-import { renderFontWeight } from "../utils.js";
-class RealUrlProxy {
-  #hashResolver;
-  #dataCollector;
-  #urlResolver;
-  #cssVariable;
-  constructor({
-    hashResolver,
-    dataCollector,
-    urlResolver,
-    cssVariable
-  }) {
-    this.#hashResolver = hashResolver;
-    this.#dataCollector = dataCollector;
-    this.#urlResolver = urlResolver;
-    this.#cssVariable = cssVariable;
-  }
-  proxy({
-    url: originalUrl,
-    type,
-    data,
-    collectPreload,
-    init
-  }) {
-    const hash = this.#hashResolver.resolve({
-      cssVariable: this.#cssVariable,
-      data,
-      originalUrl,
-      type
-    });
-    const url = this.#urlResolver.resolve(hash);
-    this.#dataCollector.collect({
-      url: originalUrl,
-      hash,
-      preload: collectPreload ? {
-        url,
-        type,
-        weight: renderFontWeight(data.weight),
-        style: data.style,
-        subset: data.subset
-      } : null,
-      data,
-      init
-    });
-    return url;
-  }
-}
-export {
-  RealUrlProxy
-};

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

@@ -1,42 +0,0 @@
-import type { Logger } from '../../core/logger/core.js';
-import type { CssRenderer, FontFileReader, FontMetricsResolver, FontResolver, FontTypeExtractor, Hasher, LocalProviderUrlResolver, StringMatcher, SystemFallbacksProvider, UrlProxy } from './definitions.js';
-import type { CreateUrlProxyParams, Defaults, FontDataRecord, FontFamily, FontFileDataMap, InternalConsumableMap, ResolvedFontFamily } from './types.js';
-/**
- * Manages how fonts are resolved:
- *
- * - families are resolved
- * - font resolver is initialized
- *
- * For each family:
- * - We create a URL proxy
- * - We resolve the font and normalize the result
- *
- * For each resolved font:
- * - We generate the CSS font face
- * - We generate optimized fallbacks if applicable
- * - We generate CSS variables
- *
- * Once that's done, the collected data is returned
- */
-export declare function orchestrate({ families, hasher, localProviderUrlResolver, cssRenderer, systemFallbacksProvider, fontMetricsResolver, fontTypeExtractor, fontFileReader, logger, createUrlProxy, defaults, bold, stringMatcher, createFontResolver, }: {
-    families: Array<FontFamily>;
-    hasher: Hasher;
-    localProviderUrlResolver: LocalProviderUrlResolver;
-    cssRenderer: CssRenderer;
-    systemFallbacksProvider: SystemFallbacksProvider;
-    fontMetricsResolver: FontMetricsResolver;
-    fontTypeExtractor: FontTypeExtractor;
-    fontFileReader: FontFileReader;
-    logger: Logger;
-    createUrlProxy: (params: CreateUrlProxyParams) => UrlProxy;
-    defaults: Defaults;
-    bold: (input: string) => string;
-    stringMatcher: StringMatcher;
-    createFontResolver: (params: {
-        families: Array<ResolvedFontFamily>;
-    }) => Promise<FontResolver>;
-}): Promise<{
-    fontFileDataMap: FontFileDataMap;
-    internalConsumableMap: InternalConsumableMap;
-    fontData: FontDataRecord;
-}>;