astro 6.0.0-beta.9 → 6.0.0

package/README.md

@@ -15,7 +15,7 @@
 npm create astro@latest
 
 # Manual:
-npm install --save-dev astro
+npm install astro
 ```
 
 Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.

package/bin/astro.mjs

@@ -19,7 +19,7 @@ const skipSemverCheckIfAbove = IS_STACKBLITZ ? 21 : 23;
 async function main() {
 	const version = process.versions.node;
 	// Fast-path for higher Node.js versions
-	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+	if ((Number.parseInt(version) || 0) <= skipSemverCheckIfAbove) {
 		const semver = await import('semver');
 		try {
 			if (!semver.satisfies(version, engines)) {

package/client.d.ts

@@ -84,6 +84,11 @@ declare module 'astro:assets' {
 	}: AstroAssets;
 }
 
+declare module 'virtual:astro:image-styles.css' {
+	const styles: string;
+	export default styles;
+}
+
 type ImageMetadata = import('./dist/assets/types.js').ImageMetadata;
 
 declare module '*.gif' {
@@ -282,8 +287,8 @@ declare module '*.mdx' {
 	export default load;
 }
 
-declare module 'astro:ssr-manifest' {
-	export const manifest: import('./dist/types/public/internal.js').SSRManifest;
+declare module 'astro:static-paths' {
+	export const StaticPaths: typeof import('./dist/runtime/prerender/static-paths.js').StaticPaths;
 }
 
 // Everything below are Vite's types (apart from image types, which are in `client.d.ts`)

package/components/ClientRouter.astro

@@ -115,14 +115,14 @@ const { fallback = 'animate' } = Astro.props;
 			const form = el as HTMLFormElement;
 			const formData = new FormData(form, submitter);
 			// form.action and form.method can point to an <input name="action"> or <input name="method">
-			// in which case should fallback to the form attribute
+			// in which case should fall back to the form attribute
 			const formAction =
 				typeof form.action === 'string' ? form.action : form.getAttribute('action');
 			const formMethod =
 				typeof form.method === 'string' ? form.method : form.getAttribute('method');
-			// Use the form action, if defined, otherwise fallback to current path.
+			// Use the form action, if defined; otherwise, fall back to current path.
 			let action = submitter?.getAttribute('formaction') ?? formAction ?? location.pathname;
-			// Use the form method, if defined, otherwise fallback to "get"
+			// Use the form method, if defined; otherwise, fall back to "get"
 			const method = submitter?.getAttribute('formmethod') ?? formMethod ?? 'get';
 
 			// the "dialog" method is a special keyword used within <dialog> elements

package/components/Code.astro

@@ -1,5 +1,5 @@
 ---
-import { type ThemePresets, createShikiHighlighter } from '@astrojs/markdown-remark';
+import { createShikiHighlighter, type ThemePresets } from '@astrojs/markdown-remark/shiki';
 import type { ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
 import { bundledLanguages } from 'shiki/langs';
 import type { CodeLanguage } from '../dist/types/public/common.js';
@@ -16,6 +16,14 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	 * @default "plaintext"
 	 */
 	lang?: CodeLanguage;
+	/**
+	 * Additional languages to load.
+	 * Useful if `code` embeds languages not included by the given `lang`
+	 * For example, TSX in Vue
+	 *
+	 * @default []
+	 */
+	embeddedLangs?: CodeLanguage[];
 	/**
 	 * A metastring to pass to the highlighter.
 	 * Allows passing information to transformers: https://shiki.style/guide/transformers#meta
@@ -72,6 +80,7 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 const {
 	code,
 	lang = 'plaintext',
+	embeddedLangs = [],
 	meta,
 	theme = 'github-dark',
 	themes = {},
@@ -101,6 +110,7 @@ const highlighter = await createShikiHighlighter({
 				? lang
 				: 'plaintext'
 			: (lang as any),
+		...embeddedLangs,
 	],
 	theme,
 	themes,

package/components/Image.astro

@@ -17,20 +17,22 @@ if (props.alt === undefined || props.alt === null) {
 
 // As a convenience, allow width and height to be string with a number in them, to match HTML's native `img`.
 if (typeof props.width === 'string') {
-	props.width = parseInt(props.width);
+	props.width = Number.parseInt(props.width);
 }
 
 if (typeof props.height === 'string') {
-	props.height = parseInt(props.height);
+	props.height = Number.parseInt(props.height);
 }
 
 const layout = props.layout ?? imageConfig.layout ?? 'none';
 
 if (layout !== 'none') {
-	// Apply defaults from imageConfig if not provided
 	props.layout ??= imageConfig.layout;
 	props.fit ??= imageConfig.objectFit ?? 'cover';
 	props.position ??= imageConfig.objectPosition ?? 'center';
+} else if (imageConfig.objectFit || imageConfig.objectPosition) {
+	props.fit ??= imageConfig.objectFit;
+	props.position ??= imageConfig.objectPosition;
 }
 
 const image = await getImage(props as UnresolvedImageTransform);

package/components/Picture.astro

@@ -46,10 +46,12 @@ const layout = props.layout ?? imageConfig.layout ?? 'none';
 const useResponsive = layout !== 'none';
 
 if (useResponsive) {
-	// Apply defaults from imageConfig if not provided
 	props.layout ??= imageConfig.layout;
 	props.fit ??= imageConfig.objectFit ?? 'cover';
 	props.position ??= imageConfig.objectPosition ?? 'center';
+} else if (imageConfig.objectFit || imageConfig.objectPosition) {
+	props.fit ??= imageConfig.objectFit;
+	props.position ??= imageConfig.objectPosition;
 }
 
 for (const key in props) {

package/components/ResponsiveImage.astro

@@ -5,8 +5,6 @@ import Image from './Image.astro';
 type Props = LocalImageProps | RemoteImageProps;
 
 const { class: className, ...props } = Astro.props;
-
-import './image.css';
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}

package/components/ResponsivePicture.astro

@@ -4,7 +4,6 @@ import { default as Picture, type Props as PictureProps } from './Picture.astro'
 type Props = PictureProps;
 
 const { class: className, ...props } = Astro.props;
-import './image.css';
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}

package/dist/actions/runtime/client.js

@@ -43,10 +43,8 @@ const codeToStatusMap = {
   LOOP_DETECTED: 508,
   NETWORK_AUTHENTICATION_REQUIRED: 511
 };
-const statusToCodeMap = Object.entries(codeToStatusMap).reduce(
-  // reverse the key-value pairs
-  (acc, [key, value]) => ({ ...acc, [value]: key }),
-  {}
+const statusToCodeMap = Object.fromEntries(
+  Object.entries(codeToStatusMap).map(([key, value]) => [value, key])
 );
 class ActionError extends Error {
   type = "AstroActionError";
@@ -142,7 +140,7 @@ function deserializeActionResult(res) {
     error: void 0
   };
 }
-const actionResultErrorStack = /* @__PURE__ */ function actionResultErrorStackFn() {
+const actionResultErrorStack = /* @__PURE__ */ (function actionResultErrorStackFn() {
   let errorStack;
   return {
     set(stack) {
@@ -152,7 +150,7 @@ const actionResultErrorStack = /* @__PURE__ */ function actionResultErrorStackFn
       return errorStack;
     }
   };
-}();
+})();
 function getActionQueryString(name) {
   const searchParams = new URLSearchParams({ [ACTION_QUERY_PARAMS.actionName]: name });
   return `?${searchParams.toString()}`;

package/dist/actions/runtime/server.js

@@ -9,6 +9,7 @@ import {
 } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { removeTrailingForwardSlash } from "../../core/path.js";
+import { BodySizeLimitError, readBodyWithLimit } from "../../core/request-body.js";
 import { ACTION_QUERY_PARAMS, ACTION_RPC_ROUTE_PATTERN } from "../consts.js";
 import {
   ActionError,
@@ -99,10 +100,14 @@ function getActionContext(context) {
           }
           throw error;
         }
+        const bodySizeLimit = pipeline.manifest.actionBodySizeLimit;
         let input;
         try {
-          input = await parseRequestBody(context.request);
+          input = await parseRequestBody(context.request, bodySizeLimit);
         } catch (e) {
+          if (e instanceof ActionError) {
+            return { data: void 0, error: e };
+          }
           if (e instanceof TypeError) {
             return { data: void 0, error: new ActionError({ code: "UNSUPPORTED_MEDIA_TYPE" }) };
           }
@@ -146,19 +151,52 @@ function getCallerInfo(ctx) {
   }
   return void 0;
 }
-async function parseRequestBody(request) {
+async function parseRequestBody(request, bodySizeLimit) {
   const contentType = request.headers.get("content-type");
-  const contentLength = request.headers.get("Content-Length");
+  const contentLengthHeader = request.headers.get("content-length");
+  const contentLength = contentLengthHeader ? Number.parseInt(contentLengthHeader, 10) : void 0;
+  const hasContentLength = typeof contentLength === "number" && Number.isFinite(contentLength);
   if (!contentType) return void 0;
-  if (hasContentType(contentType, formContentTypes)) {
-    return await request.clone().formData();
+  if (hasContentLength && contentLength > bodySizeLimit) {
+    throw new ActionError({
+      code: "CONTENT_TOO_LARGE",
+      message: `Request body exceeds ${bodySizeLimit} bytes`
+    });
   }
-  if (hasContentType(contentType, ["application/json"])) {
-    return contentLength === "0" ? void 0 : await request.clone().json();
+  try {
+    if (hasContentType(contentType, formContentTypes)) {
+      if (!hasContentLength) {
+        const body = await readBodyWithLimit(request.clone(), bodySizeLimit);
+        const formRequest = new Request(request.url, {
+          method: request.method,
+          headers: request.headers,
+          body: toArrayBuffer(body)
+        });
+        return await formRequest.formData();
+      }
+      return await request.clone().formData();
+    }
+    if (hasContentType(contentType, ["application/json"])) {
+      if (contentLength === 0) return void 0;
+      if (!hasContentLength) {
+        const body = await readBodyWithLimit(request.clone(), bodySizeLimit);
+        if (body.byteLength === 0) return void 0;
+        return JSON.parse(new TextDecoder().decode(body));
+      }
+      return await request.clone().json();
+    }
+  } catch (e) {
+    if (e instanceof BodySizeLimitError) {
+      throw new ActionError({
+        code: "CONTENT_TOO_LARGE",
+        message: `Request body exceeds ${bodySizeLimit} bytes`
+      });
+    }
+    throw e;
   }
   throw new TypeError("Unsupported content type");
 }
-const ACTION_API_CONTEXT_SYMBOL = Symbol.for("astro.actionAPIContext");
+const ACTION_API_CONTEXT_SYMBOL = /* @__PURE__ */ Symbol.for("astro.actionAPIContext");
 const formContentTypes = ["application/x-www-form-urlencoded", "multipart/form-data"];
 function hasContentType(contentType, expected) {
   const type = contentType.split(";")[0].toLowerCase();
@@ -296,6 +334,11 @@ function serializeActionResult(res) {
     body
   };
 }
+function toArrayBuffer(buffer) {
+  const copy = new Uint8Array(buffer.byteLength);
+  copy.set(buffer);
+  return copy.buffer;
+}
 export {
   ACTION_API_CONTEXT_SYMBOL,
   defineAction,

package/dist/actions/runtime/types.d.ts

@@ -49,7 +49,7 @@ export interface ActionsLocals {
         actionName: string;
     };
 }
-export type ActionAPIContext = Pick<APIContext, 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'csp'>;
+export type ActionAPIContext = Pick<APIContext, 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'cache' | 'csp'>;
 export type MaybePromise<T> = T | Promise<T>;
 /**
  * Used to preserve the input schema type in the error object.

package/dist/assets/build/generate.d.ts

@@ -1,4 +1,4 @@
-import type { BuildApp } from '../../core/build/app.js';
+import type { StaticBuildOptions } from '../../core/build/types.js';
 import type { Logger } from '../../core/logger/core.js';
 import type { MapValue } from '../../type-utils.js';
 import type { AstroConfig } from '../../types/public/config.js';
@@ -17,7 +17,7 @@ type AssetEnv = {
     imageConfig: AstroConfig['image'];
     assetsFolder: AstroConfig['build']['assets'];
 };
-export declare function prepareAssetsGenerationEnv(app: BuildApp, totalCount: number): Promise<AssetEnv>;
+export declare function prepareAssetsGenerationEnv(options: StaticBuildOptions, totalCount: number): Promise<AssetEnv>;
 export declare function generateImagesForPath(originalFilePath: string, transformsAndPath: MapValue<AssetsGlobalStaticImagesList>, env: AssetEnv): Promise<void>;
 export declare function getStaticImageList(): AssetsGlobalStaticImagesList;
 export {};

package/dist/assets/build/generate.js

@@ -9,12 +9,10 @@ import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage, revalidateRemoteImage } from "./remote.js";
-async function prepareAssetsGenerationEnv(app, totalCount) {
-  const settings = app.getSettings();
-  const logger = app.logger;
-  const manifest = app.getManifest();
+async function prepareAssetsGenerationEnv(options, totalCount) {
+  const { settings, logger } = options;
   let useCache = true;
-  const assetsCacheDir = new URL("assets/", app.manifest.cacheDir);
+  const assetsCacheDir = new URL("assets/", settings.config.cacheDir);
   const count = { total: totalCount, current: 1 };
   try {
     await fs.promises.mkdir(assetsCacheDir, { recursive: true });
@@ -28,11 +26,11 @@ async function prepareAssetsGenerationEnv(app, totalCount) {
   const isServerOutput = settings.buildOutput === "server";
   let serverRoot, clientRoot;
   if (isServerOutput) {
-    serverRoot = new URL(".prerender/", manifest.buildServerDir);
-    clientRoot = manifest.buildClientDir;
+    serverRoot = new URL(".prerender/", settings.config.build.server);
+    clientRoot = settings.config.build.client;
   } else {
-    serverRoot = getOutDirWithinCwd(manifest.outDir);
-    clientRoot = manifest.outDir;
+    serverRoot = getOutDirWithinCwd(settings.config.outDir);
+    clientRoot = settings.config.outDir;
   }
   return {
     logger,
@@ -43,7 +41,7 @@ async function prepareAssetsGenerationEnv(app, totalCount) {
     serverRoot,
     clientRoot,
     imageConfig: settings.config.image,
-    assetsFolder: manifest.assetsDir
+    assetsFolder: settings.config.build.assets
   };
 }
 function getFullImagePath(originalFilePath, env) {
@@ -54,7 +52,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env) {
   for (const [_, transform] of transformsAndPath.transforms) {
     await generateImage(transform.finalPath, transform.transform);
   }
-  if (!env.isSSR && transformsAndPath.originalSrcPath && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
+  if (transformsAndPath.originalSrcPath && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
     try {
       if (transformsAndPath.originalSrcPath) {
         env.logger.debug(

package/dist/assets/build/remote.js

@@ -1,7 +1,10 @@
 import CachePolicy from "http-cache-semantics";
 async function loadRemoteImage(src) {
   const req = new Request(src);
-  const res = await fetch(req);
+  const res = await fetch(req, { redirect: "manual" });
+  if (res.status >= 300 && res.status < 400) {
+    throw new Error(`Failed to load remote image ${src}. The request was redirected.`);
+  }
   if (!res.ok) {
     throw new Error(
       `Failed to load remote image ${src}. The request did not return a 200 OK response. (received ${res.status}))`
@@ -22,7 +25,10 @@ async function revalidateRemoteImage(src, revalidationData) {
     ...revalidationData.lastModified && { "If-Modified-Since": revalidationData.lastModified }
   };
   const req = new Request(src, { headers, cache: "no-cache" });
-  const res = await fetch(req);
+  const res = await fetch(req, { redirect: "manual" });
+  if (res.status >= 300 && res.status < 400) {
+    throw new Error(`Failed to revalidate cached remote image ${src}. The request was redirected.`);
+  }
   if (!res.ok && res.status !== 304) {
     throw new Error(
       `Failed to revalidate cached remote image ${src}. The request did not return a 200 OK / 304 NOT MODIFIED response. (received ${res.status} ${res.statusText})`

package/dist/assets/consts.d.ts

@@ -1,6 +1,8 @@
 export declare const VIRTUAL_MODULE_ID = "astro:assets";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
 export declare const VIRTUAL_SERVICE_ID = "virtual:image-service";
+export declare const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
+export declare const RESOLVED_VIRTUAL_IMAGE_STYLES_ID: string;
 export declare const VALID_INPUT_FORMATS: readonly ["jpeg", "jpg", "png", "tiff", "webp", "gif", "svg", "avif"];
 /**
  * Valid formats that our base services support.

package/dist/assets/consts.js

@@ -1,6 +1,8 @@
 const VIRTUAL_MODULE_ID = "astro:assets";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const VIRTUAL_SERVICE_ID = "virtual:image-service";
+const VIRTUAL_IMAGE_STYLES_ID = "virtual:astro:image-styles.css";
+const RESOLVED_VIRTUAL_IMAGE_STYLES_ID = "\0" + VIRTUAL_IMAGE_STYLES_ID;
 const VALID_INPUT_FORMATS = [
   "jpeg",
   "jpg",
@@ -36,10 +38,12 @@ const DEFAULT_HASH_PROPS = [
 export {
   DEFAULT_HASH_PROPS,
   DEFAULT_OUTPUT_FORMAT,
+  RESOLVED_VIRTUAL_IMAGE_STYLES_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
   VALID_INPUT_FORMATS,
   VALID_OUTPUT_FORMATS,
   VALID_SUPPORTED_FORMATS,
+  VIRTUAL_IMAGE_STYLES_ID,
   VIRTUAL_MODULE_ID,
   VIRTUAL_SERVICE_ID
 };

package/dist/assets/endpoint/config.js

@@ -1,39 +1,19 @@
-import {
-  removeLeadingForwardSlash,
-  removeTrailingForwardSlash
-} from "@astrojs/internal-helpers/path";
-import { resolveInjectedRoute } from "../../core/routing/manifest/create.js";
-import { getPattern } from "../../core/routing/manifest/pattern.js";
+import { resolveInjectedRoute } from "../../core/routing/create-manifest.js";
+import { parseRoute } from "../../core/routing/parse-route.js";
 function injectImageEndpoint(settings, manifest, mode, cwd) {
   manifest.routes.unshift(getImageEndpointData(settings, mode, cwd));
 }
 function getImageEndpointData(settings, mode, cwd) {
   const endpointEntrypoint = settings.config.image.endpoint.entrypoint === void 0 ? mode === "dev" ? "astro/assets/endpoint/dev" : "astro/assets/endpoint/generic" : settings.config.image.endpoint.entrypoint;
-  const segments = [
-    [
-      {
-        content: removeTrailingForwardSlash(
-          removeLeadingForwardSlash(settings.config.image.endpoint.route)
-        ),
-        dynamic: false,
-        spread: false
-      }
-    ]
-  ];
-  return {
+  const component = resolveInjectedRoute(endpointEntrypoint, settings.config.root, cwd).component;
+  return parseRoute(settings.config.image.endpoint.route, settings, {
+    component,
     type: "endpoint",
+    origin: "internal",
     isIndex: false,
-    route: settings.config.image.endpoint.route,
-    pattern: getPattern(segments, settings.config.base, settings.config.trailingSlash),
-    segments,
-    params: [],
-    component: resolveInjectedRoute(endpointEntrypoint, settings.config.root, cwd).component,
-    pathname: settings.config.image.endpoint.route,
     prerender: false,
-    fallbackRoutes: [],
-    origin: "internal",
-    distURL: []
-  };
+    params: []
+  });
 }
 export {
   injectImageEndpoint

package/dist/assets/endpoint/dev.js

@@ -1,7 +1,6 @@
-import { safeModulePaths, viteFSConfig } from "astro:assets";
+import { fsDenyGlob, safeModulePaths, viteFSConfig } from "astro:assets";
 import { readFile } from "node:fs/promises";
 import os from "node:os";
-import picomatch from "picomatch";
 import { isFileLoadingAllowed } from "vite";
 import { handleImageRequest, loadRemoteImage } from "./shared.js";
 function replaceFileSystemReferences(src) {
@@ -15,19 +14,7 @@ async function loadLocalImage(src, url) {
   }
   if (fsPath && isFileLoadingAllowed(
     {
-      fsDenyGlob: picomatch(
-        // matchBase: true does not work as it's documented
-        // https://github.com/micromatch/picomatch/issues/89
-        // convert patterns without `/` on our side for now
-        viteFSConfig.deny.map(
-          (pattern) => pattern.includes("/") ? pattern : `**/${pattern}`
-        ),
-        {
-          matchBase: false,
-          nocase: true,
-          dot: true
-        }
-      ),
+      fsDenyGlob,
       server: { fs: viteFSConfig },
       safeModulePaths
     },

package/dist/assets/endpoint/generic.js

@@ -8,8 +8,12 @@ async function loadRemoteImage(src, headers) {
   try {
     const res = await fetch(src, {
       // Forward all headers from the original request
-      headers
+      headers,
+      redirect: "manual"
     });
+    if (res.status >= 300 && res.status < 400) {
+      return void 0;
+    }
     if (!res.ok) {
       return void 0;
     }

package/dist/assets/endpoint/shared.js

@@ -6,7 +6,10 @@ import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 async function loadRemoteImage(src) {
   try {
-    const res = await fetch(src);
+    const res = await fetch(src, { redirect: "manual" });
+    if (res.status >= 300 && res.status < 400) {
+      return void 0;
+    }
     if (!res.ok) {
       return void 0;
     }

package/dist/assets/fonts/infra/capsize-font-metrics-resolver.js

@@ -16,7 +16,7 @@ function filterRequiredMetrics({
   };
 }
 function round(value) {
-  return parseFloat(value.toFixed(4));
+  return Number.parseFloat(value.toFixed(4));
 }
 function toPercentString(value) {
   return `${round(value * 100)}%`;

package/dist/assets/fonts/infra/levenshtein-string-matcher.js

@@ -125,7 +125,7 @@ class LevenshteinStringMatcher {
     return this.#myers_x(a, b);
   }
   #closest(str, arr) {
-    let min_distance = Infinity;
+    let min_distance = Number.POSITIVE_INFINITY;
     let min_index = 0;
     for (let i = 0; i < arr.length; i++) {
       const dist = this.#distance(str, arr[i]);

package/dist/assets/fonts/providers/index.d.ts

@@ -1,29 +1,32 @@
-import { type AdobeProviderOptions, type GoogleFamilyOptions, type GoogleiconsFamilyOptions } from 'unifont';
+import { type AdobeProviderOptions, type GoogleFamilyOptions, type GoogleiconsFamilyOptions, type NpmProviderOptions, type NpmFamilyOptions } from 'unifont';
 import type { FontProvider } from '../types.js';
 import { type LocalFamilyOptions } from './local.js';
-/** [Adobe](https://fonts.adobe.com/) */
+/** [Adobe](https://docs.astro.build/en/reference/font-provider-reference/#adobe) */
 declare function adobe(config: AdobeProviderOptions): FontProvider;
-/** [Bunny](https://fonts.bunny.net/) */
+/** [Bunny](https://docs.astro.build/en/reference/font-provider-reference/#bunny) */
 declare function bunny(): FontProvider;
-/** [Fontshare](https://www.fontshare.com/) */
+/** [Fontshare](https://docs.astro.build/en/reference/font-provider-reference/#fontshare) */
 declare function fontshare(): FontProvider;
-/** [Fontsource](https://fontsource.org/) */
+/** [Fontsource](https://docs.astro.build/en/reference/font-provider-reference/#fontsource) */
 declare function fontsource(): FontProvider;
-/** [Google](https://fonts.google.com/) */
+/** [Google](https://docs.astro.build/en/reference/font-provider-reference/#google) */
 declare function google(): FontProvider<GoogleFamilyOptions | undefined>;
-/** [Google Icons](https://fonts.google.com/icons) */
+/** [Google Icons](https://docs.astro.build/en/reference/font-provider-reference/#google-icons) */
 declare function googleicons(): FontProvider<GoogleiconsFamilyOptions | undefined>;
-/** A provider that handles local files. */
+/** [Local](https://docs.astro.build/en/reference/font-provider-reference/#local) */
 declare function local(): FontProvider<LocalFamilyOptions>;
+/** [NPM](https://docs.astro.build/en/reference/font-provider-reference/#npm) */
+declare function npm(options?: Omit<NpmProviderOptions, 'root' | 'readFile'>): FontProvider<NpmFamilyOptions | undefined>;
 /**
  * Astro exports a few built-in providers:
- * - [Adobe](https://fonts.adobe.com/)
- * - [Bunny](https://fonts.bunny.net/)
- * - [Fontshare](https://www.fontshare.com/)
- * - [Fontsource](https://fontsource.org/)
- * - [Google](https://fonts.google.com/)
- * - [Google Icons](https://fonts.google.com/icons)
- * - Local
+ * - [Adobe](https://docs.astro.build/en/reference/font-provider-reference/#adobe)
+ * - [Bunny](https://docs.astro.build/en/reference/font-provider-reference/#bunny)
+ * - [Fontshare](https://docs.astro.build/en/reference/font-provider-reference/#fontshare)
+ * - [Fontsource](https://docs.astro.build/en/reference/font-provider-reference/#fontsource)
+ * - [Google](https://docs.astro.build/en/reference/font-provider-reference/#google)
+ * - [Google Icons](https://docs.astro.build/en/reference/font-provider-reference/#google-icons)
+ * - [Local](https://docs.astro.build/en/reference/font-provider-reference/#local)
+ * - [NPM](TODO:)
  */
 export declare const fontProviders: {
     adobe: typeof adobe;
@@ -33,5 +36,6 @@ export declare const fontProviders: {
     google: typeof google;
     googleicons: typeof googleicons;
     local: typeof local;
+    npm: typeof npm;
 };
 export {};

package/dist/assets/fonts/providers/index.js

@@ -3,6 +3,8 @@ import {
 } from "unifont";
 import { FontaceFontFileReader } from "../infra/fontace-font-file-reader.js";
 import { LocalFontProvider } from "./local.js";
+import { fileURLToPath } from "node:url";
+import { readFile } from "node:fs/promises";
 function adobe(config) {
   const provider = providers.adobe(config);
   let initializedProvider;
@@ -105,6 +107,25 @@ function local() {
     fontFileReader: new FontaceFontFileReader()
   });
 }
+function npm(options) {
+  let initializedProvider;
+  return {
+    name: providers.npm()._name,
+    async init(context) {
+      initializedProvider = await providers.npm({
+        ...options,
+        root: fileURLToPath(context.root),
+        readFile: (path) => readFile(path, "utf-8").catch(() => null)
+      })(context);
+    },
+    async resolveFont({ familyName, ...rest }) {
+      return await initializedProvider?.resolveFont(familyName, rest);
+    },
+    async listFonts() {
+      return await initializedProvider?.listFonts?.();
+    }
+  };
+}
 const fontProviders = {
   adobe,
   bunny,
@@ -112,7 +133,8 @@ const fontProviders = {
   fontsource,
   google,
   googleicons,
-  local
+  local,
+  npm
 };
 export {
   fontProviders