full site update

node_modules/astro/dist/actions/consts.d.ts

@@ -1,11 +1,11 @@
 export declare const VIRTUAL_MODULE_ID = "astro:actions";
 export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
-export declare const ACTIONS_TYPES_FILE = "astro/actions.d.ts";
-export declare const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
-export declare const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
+export declare const ACTIONS_TYPES_FILE = "actions.d.ts";
+export declare const ASTRO_ACTIONS_INTERNAL_MODULE_ID = "astro-internal:actions";
+export declare const RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID: string;
 export declare const NOOP_ACTIONS = "\0noop-actions";
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;
-    actionRedirect: string;
 };
+export declare const ACTION_RPC_ROUTE_PATTERN = "/_actions/[...path]";

node_modules/astro/dist/actions/consts.js

@@ -1,20 +1,21 @@
 const VIRTUAL_MODULE_ID = "astro:actions";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
-const ACTIONS_TYPES_FILE = "astro/actions.d.ts";
-const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
-const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
+const ACTIONS_TYPES_FILE = "actions.d.ts";
+const ASTRO_ACTIONS_INTERNAL_MODULE_ID = "astro-internal:actions";
+const RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID = "\0" + ASTRO_ACTIONS_INTERNAL_MODULE_ID;
 const NOOP_ACTIONS = "\0noop-actions";
 const ACTION_QUERY_PARAMS = {
-  actionName: "_astroAction",
-  actionPayload: "_astroActionPayload",
-  actionRedirect: "_astroActionRedirect"
+  actionName: "_action",
+  actionPayload: "_astroActionPayload"
 };
+const ACTION_RPC_ROUTE_PATTERN = "/_actions/[...path]";
 export {
   ACTIONS_TYPES_FILE,
   ACTION_QUERY_PARAMS,
+  ACTION_RPC_ROUTE_PATTERN,
+  ASTRO_ACTIONS_INTERNAL_MODULE_ID,
   NOOP_ACTIONS,
-  RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
+  RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
-  VIRTUAL_INTERNAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 };

node_modules/astro/dist/actions/integration.d.ts

@@ -1,8 +1,10 @@
-import type { AstroIntegration, AstroSettings } from '../@types/astro.js';
+import type { AstroSettings } from '../types/astro.js';
+import type { AstroIntegration } from '../types/public/integrations.js';
 /**
  * This integration is applied when the user is using Actions in their project.
  * It will inject the necessary routes and middlewares to handle actions.
  */
-export default function astroIntegrationActionsRouteHandler({ settings, }: {
+export default function astroIntegrationActionsRouteHandler({ settings, filename, }: {
     settings: AstroSettings;
+    filename: string;
 }): AstroIntegration;

node_modules/astro/dist/actions/integration.js

@@ -1,32 +1,30 @@
-import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/errors.js";
-import { isServerLikeOutput, viteID } from "../core/util.js";
-import { ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
+import { ActionsWithoutServerOutputError } from "../core/errors/errors-data.js";
+import { viteID } from "../core/util.js";
+import { ACTION_RPC_ROUTE_PATTERN, ACTIONS_TYPES_FILE, VIRTUAL_MODULE_ID } from "./consts.js";
 function astroIntegrationActionsRouteHandler({
-  settings
+  settings,
+  filename
 }) {
   return {
     name: VIRTUAL_MODULE_ID,
     hooks: {
-      async "astro:config:setup"(params) {
-        params.injectRoute({
-          pattern: "/_actions/[...path]",
+      async "astro:config:setup"() {
+        settings.injectedRoutes.push({
+          pattern: ACTION_RPC_ROUTE_PATTERN,
           entrypoint: "astro/actions/runtime/route.js",
-          prerender: false
-        });
-        params.addMiddleware({
-          entrypoint: "astro/actions/runtime/middleware.js",
-          order: "post"
+          prerender: false,
+          origin: "internal"
         });
       },
       "astro:config:done": async (params) => {
-        if (!isServerLikeOutput(params.config)) {
+        if (params.buildOutput === "static") {
           const error = new AstroError(ActionsWithoutServerOutputError);
           error.stack = void 0;
           throw error;
         }
         const stringifiedActionsImport = JSON.stringify(
-          viteID(new URL("./actions", params.config.srcDir))
+          viteID(new URL(`./${filename}`, params.config.srcDir))
         );
         settings.injectedTypes.push({
           filename: ACTIONS_TYPES_FILE,

node_modules/astro/dist/actions/loadActions.d.ts

@@ -0,0 +1,8 @@
+import type { SSRActions } from '../core/app/types.js';
+import type { ModuleLoader } from '../core/module-loader/index.js';
+/**
+ * It accepts a module loader and the astro settings, and it attempts to load the middlewares defined in the configuration.
+ *
+ * If not middlewares were not set, the function returns an empty array.
+ */
+export declare function loadActions(moduleLoader: ModuleLoader): Promise<SSRActions>;

node_modules/astro/dist/actions/loadActions.js

@@ -0,0 +1,13 @@
+import { ActionsCantBeLoaded } from "../core/errors/errors-data.js";
+import { AstroError } from "../core/errors/index.js";
+import { ASTRO_ACTIONS_INTERNAL_MODULE_ID } from "./consts.js";
+async function loadActions(moduleLoader) {
+  try {
+    return await moduleLoader.import(ASTRO_ACTIONS_INTERNAL_MODULE_ID);
+  } catch (error) {
+    throw new AstroError(ActionsCantBeLoaded, { cause: error });
+  }
+}
+export {
+  loadActions
+};

node_modules/astro/dist/actions/noop-actions.d.ts

@@ -0,0 +1,2 @@
+import type { SSRActions } from '../core/app/types.js';
+export declare const NOOP_ACTIONS_MOD: SSRActions;

node_modules/astro/dist/actions/noop-actions.js

@@ -0,0 +1,6 @@
+const NOOP_ACTIONS_MOD = {
+  server: {}
+};
+export {
+  NOOP_ACTIONS_MOD
+};

node_modules/astro/dist/actions/plugins.d.ts

@@ -1,6 +1,8 @@
 import type fsMod from 'node:fs';
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
+import type { BuildInternals } from '../core/build/internal.js';
+import type { StaticBuildOptions } from '../core/build/types.js';
+import type { AstroSettings } from '../types/astro.js';
 /**
  * This plugin is responsible to load the known file `actions/index.js` / `actions.js`
  * If the file doesn't exist, it returns an empty object.
@@ -9,6 +11,12 @@ import type { AstroSettings } from '../@types/astro.js';
 export declare function vitePluginUserActions({ settings }: {
     settings: AstroSettings;
 }): VitePlugin;
+/**
+ * This plugin is used to retrieve the final entry point of the bundled actions.ts file
+ * @param opts
+ * @param internals
+ */
+export declare function vitePluginActionsBuild(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin;
 export declare function vitePluginActions({ fs, settings, }: {
     fs: typeof fsMod;
     settings: AstroSettings;

node_modules/astro/dist/actions/plugins.js

@@ -1,8 +1,11 @@
+import { addRollupInput } from "../core/build/add-rollup-input.js";
+import { shouldAppendForwardSlash } from "../core/build/util.js";
+import { getServerOutputDirectory } from "../prerender/utils.js";
 import {
+  ASTRO_ACTIONS_INTERNAL_MODULE_ID,
   NOOP_ACTIONS,
-  RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
+  RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
-  VIRTUAL_INTERNAL_MODULE_ID,
   VIRTUAL_MODULE_ID
 } from "./consts.js";
 import { isActionsFilePresent } from "./utils.js";
@@ -14,7 +17,7 @@ function vitePluginUserActions({ settings }) {
       if (id === NOOP_ACTIONS) {
         return NOOP_ACTIONS;
       }
-      if (id === VIRTUAL_INTERNAL_MODULE_ID) {
+      if (id === ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
         const resolvedModule = await this.resolve(
           `${decodeURI(new URL("actions", settings.config.srcDir).pathname)}`
         );
@@ -22,18 +25,34 @@ function vitePluginUserActions({ settings }) {
           return NOOP_ACTIONS;
         }
         resolvedActionsId = resolvedModule.id;
-        return RESOLVED_VIRTUAL_INTERNAL_MODULE_ID;
+        return RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID;
       }
     },
     load(id) {
       if (id === NOOP_ACTIONS) {
         return "export const server = {}";
-      } else if (id === RESOLVED_VIRTUAL_INTERNAL_MODULE_ID) {
+      } else if (id === RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
         return `export { server } from '${resolvedActionsId}';`;
       }
     }
   };
 }
+function vitePluginActionsBuild(opts, internals) {
+  return {
+    name: "@astro/plugin-actions-build",
+    options(options) {
+      return addRollupInput(options, [ASTRO_ACTIONS_INTERNAL_MODULE_ID]);
+    },
+    writeBundle(_, bundle) {
+      for (const [chunkName, chunk] of Object.entries(bundle)) {
+        if (chunk.type !== "asset" && chunk.facadeModuleId === RESOLVED_ASTRO_ACTIONS_INTERNAL_MODULE_ID) {
+          const outputDirectory = getServerOutputDirectory(opts.settings);
+          internals.astroActionsEntryPoint = new URL(chunkName, outputDirectory);
+        }
+      }
+    }
+  };
+}
 function vitePluginActions({
   fs,
   settings
@@ -70,11 +89,18 @@ export * from 'astro/actions/runtime/virtual/server.js';`;
         code += `
 export * from 'astro/actions/runtime/virtual/client.js';`;
       }
-      return code;
+      code = code.replace(
+        "'/** @TRAILING_SLASH@ **/'",
+        JSON.stringify(
+          shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
+        )
+      );
+      return { code };
     }
   };
 }
 export {
   vitePluginActions,
+  vitePluginActionsBuild,
   vitePluginUserActions
 };

node_modules/astro/dist/actions/runtime/middleware.d.ts

@@ -1,9 +0,0 @@
-import { type SerializedActionResult } from './virtual/shared.js';
-export type ActionPayload = {
-    actionResult: SerializedActionResult;
-    actionName: string;
-};
-export type Locals = {
-    _actionPayload: ActionPayload;
-};
-export declare const onRequest: import("../../@types/astro.js").MiddlewareHandler;

node_modules/astro/dist/actions/runtime/middleware.js

@@ -1,110 +0,0 @@
-import { yellow } from "kleur/colors";
-import { defineMiddleware } from "../../core/middleware/index.js";
-import { getOriginPathname } from "../../core/routing/rewrite.js";
-import { ACTION_QUERY_PARAMS } from "../consts.js";
-import { ACTION_API_CONTEXT_SYMBOL, formContentTypes, hasContentType } from "./utils.js";
-import { getAction } from "./virtual/get-action.js";
-import {
-  serializeActionResult
-} from "./virtual/shared.js";
-const onRequest = defineMiddleware(async (context, next) => {
-  if (context._isPrerendered) {
-    if (context.request.method === "POST") {
-      console.warn(
-        yellow("[astro:actions]"),
-        "POST requests should not be sent to prerendered pages. If you're using Actions, disable prerendering with `export const prerender = false`."
-      );
-    }
-    return next();
-  }
-  const locals = context.locals;
-  if (locals._actionPayload) return next();
-  const actionPayload = context.cookies.get(ACTION_QUERY_PARAMS.actionPayload)?.json();
-  if (actionPayload) {
-    if (!isActionPayload(actionPayload)) {
-      throw new Error("Internal: Invalid action payload in cookie.");
-    }
-    return renderResult({ context, next, ...actionPayload });
-  }
-  const actionName = context.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
-  if (context.request.method === "POST" && actionName) {
-    return handlePost({ context, next, actionName });
-  }
-  return next();
-});
-async function renderResult({
-  context,
-  next,
-  actionResult,
-  actionName
-}) {
-  const locals = context.locals;
-  locals._actionPayload = { actionResult, actionName };
-  const response = await next();
-  context.cookies.delete(ACTION_QUERY_PARAMS.actionPayload);
-  if (actionResult.type === "error") {
-    return new Response(response.body, {
-      status: actionResult.status,
-      statusText: actionResult.type,
-      headers: response.headers
-    });
-  }
-  return response;
-}
-async function handlePost({
-  context,
-  next,
-  actionName
-}) {
-  const { request } = context;
-  const baseAction = await getAction(actionName);
-  const contentType = request.headers.get("content-type");
-  let formData;
-  if (contentType && hasContentType(contentType, formContentTypes)) {
-    formData = await request.clone().formData();
-  }
-  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
-  Reflect.set(actionAPIContext, ACTION_API_CONTEXT_SYMBOL, true);
-  const action = baseAction.bind(actionAPIContext);
-  const actionResult = await action(formData);
-  if (context.url.searchParams.get(ACTION_QUERY_PARAMS.actionRedirect) === "false") {
-    return renderResult({
-      context,
-      next,
-      actionName,
-      actionResult: serializeActionResult(actionResult)
-    });
-  }
-  return redirectWithResult({ context, actionName, actionResult });
-}
-async function redirectWithResult({
-  context,
-  actionName,
-  actionResult
-}) {
-  context.cookies.set(ACTION_QUERY_PARAMS.actionPayload, {
-    actionName,
-    actionResult: serializeActionResult(actionResult)
-  });
-  if (actionResult.error) {
-    const referer2 = context.request.headers.get("Referer");
-    if (!referer2) {
-      throw new Error("Internal: Referer unexpectedly missing from Action POST request.");
-    }
-    return context.redirect(referer2);
-  }
-  const referer = getOriginPathname(context.request);
-  if (referer) {
-    return context.redirect(referer);
-  }
-  return context.redirect(context.url.pathname);
-}
-function isActionPayload(json) {
-  if (typeof json !== "object" || json == null) return false;
-  if (!("actionResult" in json) || typeof json.actionResult !== "object") return false;
-  if (!("actionName" in json) || typeof json.actionName !== "string") return false;
-  return true;
-}
-export {
-  onRequest
-};

node_modules/astro/dist/actions/runtime/route.d.ts

@@ -1,2 +1,2 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 export declare const POST: APIRoute;

node_modules/astro/dist/actions/runtime/route.js

@@ -1,32 +1,10 @@
-import { ACTION_API_CONTEXT_SYMBOL, formContentTypes, hasContentType } from "./utils.js";
-import { getAction } from "./virtual/get-action.js";
-import { serializeActionResult } from "./virtual/shared.js";
+import { getActionContext } from "./virtual/server.js";
 const POST = async (context) => {
-  const { request, url } = context;
-  let baseAction;
-  try {
-    baseAction = await getAction(url.pathname);
-  } catch (e) {
-    if (import.meta.env.DEV) throw e;
-    console.error(e);
-    return new Response(e instanceof Error ? e.message : null, { status: 404 });
+  const { action, serializeActionResult } = getActionContext(context);
+  if (action?.calledFrom !== "rpc") {
+    return new Response("Not found", { status: 404 });
   }
-  const contentType = request.headers.get("Content-Type");
-  const contentLength = request.headers.get("Content-Length");
-  let args;
-  if (!contentType || contentLength === "0") {
-    args = void 0;
-  } else if (contentType && hasContentType(contentType, formContentTypes)) {
-    args = await request.clone().formData();
-  } else if (contentType && hasContentType(contentType, ["application/json"])) {
-    args = await request.clone().json();
-  } else {
-    return new Response(null, { status: 415 });
-  }
-  const { getActionResult, callAction, props, redirect, ...actionAPIContext } = context;
-  Reflect.set(actionAPIContext, ACTION_API_CONTEXT_SYMBOL, true);
-  const action = baseAction.bind(actionAPIContext);
-  const result = await action(args);
+  const result = await action.handler();
   const serialized = serializeActionResult(result);
   if (serialized.type === "empty") {
     return new Response(null, {

node_modules/astro/dist/actions/runtime/utils.d.ts

@@ -1,8 +1,22 @@
-import type { APIContext } from '../../@types/astro.js';
+import type { APIContext, AstroSharedContext } from '../../types/public/context.js';
+import type { SerializedActionResult } from './virtual/shared.js';
+export type ActionPayload = {
+    actionResult: SerializedActionResult;
+    actionName: string;
+};
+export type Locals = {
+    _actionPayload: ActionPayload;
+};
 export declare const ACTION_API_CONTEXT_SYMBOL: unique symbol;
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
-export type ActionAPIContext = Omit<APIContext, 'getActionResult' | 'callAction' | 'props' | 'redirect'>;
+export type ActionAPIContext = Pick<APIContext, 'rewrite' | 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'insertDirective' | 'insertScriptResource' | 'insertStyleResource' | 'insertScriptHash' | 'insertStyleHash'> & {
+    /**
+     * @deprecated
+     * The use of `rewrite` in Actions is deprecated
+     */
+    rewrite: AstroSharedContext['rewrite'];
+};
 export type MaybePromise<T> = T | Promise<T>;
 /**
  * Used to preserve the input schema type in the error object.

node_modules/astro/dist/actions/runtime/virtual/client.d.ts

@@ -1,2 +1,3 @@
 export * from './shared.js';
 export declare function defineAction(): void;
+export declare function getActionContext(): void;

node_modules/astro/dist/actions/runtime/virtual/client.js

@@ -2,6 +2,10 @@ export * from "./shared.js";
 function defineAction() {
   throw new Error("[astro:action] `defineAction()` unexpectedly used on the client.");
 }
+function getActionContext() {
+  throw new Error("[astro:action] `getActionContext()` unexpectedly used on the client.");
+}
 export {
-  defineAction
+  defineAction,
+  getActionContext
 };

node_modules/astro/dist/actions/runtime/virtual/get-action.d.ts

@@ -1,8 +0,0 @@
-import type { ZodType } from 'zod';
-import type { ActionAccept, ActionClient } from './server.js';
-/**
- * Get server-side action based on the route path.
- * Imports from the virtual module `astro:internal-actions`, which maps to
- * the user's `src/actions/index.ts` file at build-time.
- */
-export declare function getAction(path: string): Promise<ActionClient<unknown, ActionAccept, ZodType>>;

node_modules/astro/dist/actions/runtime/virtual/get-action.js

@@ -1,29 +0,0 @@
-import { ActionNotFoundError } from "../../../core/errors/errors-data.js";
-import { AstroError } from "../../../core/errors/errors.js";
-async function getAction(path) {
-  const pathKeys = path.replace(/^.*\/_actions\//, "").split(".").map((key) => decodeURIComponent(key));
-  let { server: actionLookup } = await import("astro:internal-actions");
-  if (actionLookup == null || !(typeof actionLookup === "object")) {
-    throw new TypeError(
-      `Expected \`server\` export in actions file to be an object. Received ${typeof actionLookup}.`
-    );
-  }
-  for (const key of pathKeys) {
-    if (!(key in actionLookup)) {
-      throw new AstroError({
-        ...ActionNotFoundError,
-        message: ActionNotFoundError.message(pathKeys.join("."))
-      });
-    }
-    actionLookup = actionLookup[key];
-  }
-  if (typeof actionLookup !== "function") {
-    throw new TypeError(
-      `Expected handler for action ${pathKeys.join(".")} to be a function. Received ${typeof actionLookup}.`
-    );
-  }
-  return actionLookup;
-}
-export {
-  getAction
-};

node_modules/astro/dist/actions/runtime/virtual/server.d.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
+import type { APIContext } from '../../../types/public/index.js';
 import { type ActionAPIContext, type ErrorInferenceObject, type MaybePromise } from '../utils.js';
-import { type SafeResult } from './shared.js';
+import { deserializeActionResult, type SafeResult, type SerializedActionResult, serializeActionResult } from './shared.js';
 export * from './shared.js';
 export type ActionAccept = 'form' | 'json';
 export type ActionHandler<TInputSchema, TOutput> = TInputSchema extends z.ZodType ? (input: z.infer<TInputSchema>, context: ActionAPIContext) => MaybePromise<TOutput> : (input: any, context: ActionAPIContext) => MaybePromise<TOutput>;
@@ -18,3 +19,32 @@ export declare function defineAction<TOutput, TAccept extends ActionAccept | und
 }): ActionClient<TOutput, TAccept, TInputSchema> & string;
 /** Transform form data to an object based on a Zod schema. */
 export declare function formDataToObject<T extends z.AnyZodObject>(formData: FormData, schema: T): Record<string, unknown>;
+export type AstroActionContext = {
+    /** Information about an incoming action request. */
+    action?: {
+        /** Whether an action was called using an RPC function or by using an HTML form action. */
+        calledFrom: 'rpc' | 'form';
+        /** The name of the action. Useful to track the source of an action result during a redirect. */
+        name: string;
+        /** Programmatically call the action to get the result. */
+        handler: () => Promise<SafeResult<any, any>>;
+    };
+    /**
+     * Manually set the action result accessed via `getActionResult()`.
+     * Calling this function from middleware will disable Astro's own action result handling.
+     */
+    setActionResult(actionName: string, actionResult: SerializedActionResult): void;
+    /**
+     * Serialize an action result to stored in a cookie or session.
+     * Also used to pass a result to Astro templates via `setActionResult()`.
+     */
+    serializeActionResult: typeof serializeActionResult;
+    /**
+     * Deserialize an action result to access data and error objects.
+     */
+    deserializeActionResult: typeof deserializeActionResult;
+};
+/**
+ * Access information about Action requests from middleware.
+ */
+export declare function getActionContext(context: APIContext): AstroActionContext;

node_modules/astro/dist/actions/runtime/virtual/server.js

@@ -1,10 +1,24 @@
 import { z } from "zod";
-import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
+import { shouldAppendForwardSlash } from "../../../core/build/util.js";
 import { AstroError } from "../../../core/errors/errors.js";
+import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
+import { removeTrailingForwardSlash } from "../../../core/path.js";
+import { apiContextRoutesSymbol } from "../../../core/render-context.js";
+import { ACTION_RPC_ROUTE_PATTERN } from "../../consts.js";
 import {
+  ACTION_API_CONTEXT_SYMBOL,
+  formContentTypes,
+  hasContentType,
   isActionAPIContext
 } from "../utils.js";
-import { ActionError, ActionInputError, callSafely } from "./shared.js";
+import {
+  ACTION_QUERY_PARAMS,
+  ActionError,
+  ActionInputError,
+  callSafely,
+  deserializeActionResult,
+  serializeActionResult
+} from "./shared.js";
 export * from "./shared.js";
 function defineAction({
   accept,
@@ -122,7 +136,82 @@ function unwrapBaseObjectSchema(schema, unparsedInput) {
   }
   return schema;
 }
+function getActionContext(context) {
+  const callerInfo = getCallerInfo(context);
+  const actionResultAlreadySet = Boolean(context.locals._actionPayload);
+  let action = void 0;
+  if (callerInfo && context.request.method === "POST" && !actionResultAlreadySet) {
+    action = {
+      calledFrom: callerInfo.from,
+      name: callerInfo.name,
+      handler: async () => {
+        const pipeline = Reflect.get(context, apiContextRoutesSymbol);
+        const callerInfoName = shouldAppendForwardSlash(
+          pipeline.manifest.trailingSlash,
+          pipeline.manifest.buildFormat
+        ) ? removeTrailingForwardSlash(callerInfo.name) : callerInfo.name;
+        const baseAction = await pipeline.getAction(callerInfoName);
+        let input;
+        try {
+          input = await parseRequestBody(context.request);
+        } catch (e) {
+          if (e instanceof TypeError) {
+            return { data: void 0, error: new ActionError({ code: "UNSUPPORTED_MEDIA_TYPE" }) };
+          }
+          throw e;
+        }
+        const omitKeys = ["props", "getActionResult", "callAction", "redirect"];
+        const actionAPIContext = Object.create(
+          Object.getPrototypeOf(context),
+          Object.fromEntries(
+            Object.entries(Object.getOwnPropertyDescriptors(context)).filter(
+              ([key]) => !omitKeys.includes(key)
+            )
+          )
+        );
+        Reflect.set(actionAPIContext, ACTION_API_CONTEXT_SYMBOL, true);
+        const handler = baseAction.bind(actionAPIContext);
+        return handler(input);
+      }
+    };
+  }
+  function setActionResult(actionName, actionResult) {
+    context.locals._actionPayload = {
+      actionResult,
+      actionName
+    };
+  }
+  return {
+    action,
+    setActionResult,
+    serializeActionResult,
+    deserializeActionResult
+  };
+}
+function getCallerInfo(ctx) {
+  if (ctx.routePattern === ACTION_RPC_ROUTE_PATTERN) {
+    return { from: "rpc", name: ctx.url.pathname.replace(/^.*\/_actions\//, "") };
+  }
+  const queryParam = ctx.url.searchParams.get(ACTION_QUERY_PARAMS.actionName);
+  if (queryParam) {
+    return { from: "form", name: queryParam };
+  }
+  return void 0;
+}
+async function parseRequestBody(request) {
+  const contentType = request.headers.get("content-type");
+  const contentLength = request.headers.get("Content-Length");
+  if (!contentType) return void 0;
+  if (hasContentType(contentType, formContentTypes)) {
+    return await request.clone().formData();
+  }
+  if (hasContentType(contentType, ["application/json"])) {
+    return contentLength === "0" ? void 0 : await request.clone().json();
+  }
+  throw new TypeError("Unsupported content type");
+}
 export {
   defineAction,
-  formDataToObject
+  formDataToObject,
+  getActionContext
 };

node_modules/astro/dist/actions/runtime/virtual/shared.d.ts

@@ -1,12 +1,14 @@
 import type { z } from 'zod';
-import type { ErrorInferenceObject, MaybePromise, ActionAPIContext as _ActionAPIContext } from '../utils.js';
+import { AstroError } from '../../../core/errors/errors.js';
+import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
+import type { ActionAPIContext as _ActionAPIContext, ErrorInferenceObject, MaybePromise } from '../utils.js';
 export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;
-    actionRedirect: string;
 };
-export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "TIMEOUT", "CONFLICT", "PRECONDITION_FAILED", "PAYLOAD_TOO_LARGE", "UNSUPPORTED_MEDIA_TYPE", "UNPROCESSABLE_CONTENT", "TOO_MANY_REQUESTS", "CLIENT_CLOSED_REQUEST", "INTERNAL_SERVER_ERROR"];
+export declare const appendForwardSlash: typeof _appendForwardSlash;
+export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "PAYMENT_REQUIRED", "FORBIDDEN", "NOT_FOUND", "METHOD_NOT_ALLOWED", "NOT_ACCEPTABLE", "PROXY_AUTHENTICATION_REQUIRED", "REQUEST_TIMEOUT", "CONFLICT", "GONE", "LENGTH_REQUIRED", "PRECONDITION_FAILED", "CONTENT_TOO_LARGE", "URI_TOO_LONG", "UNSUPPORTED_MEDIA_TYPE", "RANGE_NOT_SATISFIABLE", "EXPECTATION_FAILED", "MISDIRECTED_REQUEST", "UNPROCESSABLE_CONTENT", "LOCKED", "FAILED_DEPENDENCY", "TOO_EARLY", "UPGRADE_REQUIRED", "PRECONDITION_REQUIRED", "TOO_MANY_REQUESTS", "REQUEST_HEADER_FIELDS_TOO_LARGE", "UNAVAILABLE_FOR_LEGAL_REASONS", "INTERNAL_SERVER_ERROR", "NOT_IMPLEMENTED", "BAD_GATEWAY", "SERVICE_UNAVAILABLE", "GATEWAY_TIMEOUT", "HTTP_VERSION_NOT_SUPPORTED", "VARIANT_ALSO_NEGOTIATES", "INSUFFICIENT_STORAGE", "LOOP_DETECTED", "NETWORK_AUTHENTICATION_REQUIRED"];
 export type ActionErrorCode = (typeof ACTION_ERROR_CODES)[number];
 export declare class ActionError<_T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {
     type: string;
@@ -55,3 +57,4 @@ export type SerializedActionResult = {
 };
 export declare function serializeActionResult(res: SafeResult<any, any>): SerializedActionResult;
 export declare function deserializeActionResult(res: SerializedActionResult): SafeResult<any, any>;
+export declare function astroCalledServerError(): AstroError;

node_modules/astro/dist/actions/runtime/virtual/shared.js

@@ -1,40 +1,95 @@
 import { parse as devalueParse, stringify as devalueStringify } from "devalue";
 import { REDIRECT_STATUS_CODES } from "../../../core/constants.js";
-import { ActionsReturnedInvalidDataError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
+import {
+  ActionCalledFromServerError,
+  ActionsReturnedInvalidDataError
+} from "../../../core/errors/errors-data.js";
+import { appendForwardSlash as _appendForwardSlash } from "../../../core/path.js";
 import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../../consts.js";
 const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;
+const appendForwardSlash = _appendForwardSlash;
 const ACTION_ERROR_CODES = [
   "BAD_REQUEST",
   "UNAUTHORIZED",
+  "PAYMENT_REQUIRED",
   "FORBIDDEN",
   "NOT_FOUND",
-  "TIMEOUT",
+  "METHOD_NOT_ALLOWED",
+  "NOT_ACCEPTABLE",
+  "PROXY_AUTHENTICATION_REQUIRED",
+  "REQUEST_TIMEOUT",
   "CONFLICT",
+  "GONE",
+  "LENGTH_REQUIRED",
   "PRECONDITION_FAILED",
-  "PAYLOAD_TOO_LARGE",
+  "CONTENT_TOO_LARGE",
+  "URI_TOO_LONG",
   "UNSUPPORTED_MEDIA_TYPE",
+  "RANGE_NOT_SATISFIABLE",
+  "EXPECTATION_FAILED",
+  "MISDIRECTED_REQUEST",
   "UNPROCESSABLE_CONTENT",
+  "LOCKED",
+  "FAILED_DEPENDENCY",
+  "TOO_EARLY",
+  "UPGRADE_REQUIRED",
+  "PRECONDITION_REQUIRED",
   "TOO_MANY_REQUESTS",
-  "CLIENT_CLOSED_REQUEST",
-  "INTERNAL_SERVER_ERROR"
+  "REQUEST_HEADER_FIELDS_TOO_LARGE",
+  "UNAVAILABLE_FOR_LEGAL_REASONS",
+  "INTERNAL_SERVER_ERROR",
+  "NOT_IMPLEMENTED",
+  "BAD_GATEWAY",
+  "SERVICE_UNAVAILABLE",
+  "GATEWAY_TIMEOUT",
+  "HTTP_VERSION_NOT_SUPPORTED",
+  "VARIANT_ALSO_NEGOTIATES",
+  "INSUFFICIENT_STORAGE",
+  "LOOP_DETECTED",
+  "NETWORK_AUTHENTICATION_REQUIRED"
 ];
 const codeToStatusMap = {
-  // Implemented from tRPC error code table
-  // https://trpc.io/docs/server/error-handling#error-codes
+  // Implemented from IANA HTTP Status Code Registry
+  // https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
   BAD_REQUEST: 400,
   UNAUTHORIZED: 401,
+  PAYMENT_REQUIRED: 402,
   FORBIDDEN: 403,
   NOT_FOUND: 404,
-  TIMEOUT: 405,
+  METHOD_NOT_ALLOWED: 405,
+  NOT_ACCEPTABLE: 406,
+  PROXY_AUTHENTICATION_REQUIRED: 407,
+  REQUEST_TIMEOUT: 408,
   CONFLICT: 409,
+  GONE: 410,
+  LENGTH_REQUIRED: 411,
   PRECONDITION_FAILED: 412,
-  PAYLOAD_TOO_LARGE: 413,
+  CONTENT_TOO_LARGE: 413,
+  URI_TOO_LONG: 414,
   UNSUPPORTED_MEDIA_TYPE: 415,
+  RANGE_NOT_SATISFIABLE: 416,
+  EXPECTATION_FAILED: 417,
+  MISDIRECTED_REQUEST: 421,
   UNPROCESSABLE_CONTENT: 422,
+  LOCKED: 423,
+  FAILED_DEPENDENCY: 424,
+  TOO_EARLY: 425,
+  UPGRADE_REQUIRED: 426,
+  PRECONDITION_REQUIRED: 428,
   TOO_MANY_REQUESTS: 429,
-  CLIENT_CLOSED_REQUEST: 499,
-  INTERNAL_SERVER_ERROR: 500
+  REQUEST_HEADER_FIELDS_TOO_LARGE: 431,
+  UNAVAILABLE_FOR_LEGAL_REASONS: 451,
+  INTERNAL_SERVER_ERROR: 500,
+  NOT_IMPLEMENTED: 501,
+  BAD_GATEWAY: 502,
+  SERVICE_UNAVAILABLE: 503,
+  GATEWAY_TIMEOUT: 504,
+  HTTP_VERSION_NOT_SUPPORTED: 505,
+  VARIANT_ALSO_NEGOTIATES: 506,
+  INSUFFICIENT_STORAGE: 507,
+  LOOP_DETECTED: 508,
+  NETWORK_AUTHENTICATION_REQUIRED: 511
 };
 const statusToCodeMap = Object.entries(codeToStatusMap).reduce(
   // reverse the key-value pairs
@@ -126,14 +181,24 @@ function serializeActionResult(res) {
     if (import.meta.env?.DEV) {
       actionResultErrorStack.set(res.error.stack);
     }
+    let body2;
+    if (res.error instanceof ActionInputError) {
+      body2 = {
+        type: res.error.type,
+        issues: res.error.issues,
+        fields: res.error.fields
+      };
+    } else {
+      body2 = {
+        ...res.error,
+        message: res.error.message
+      };
+    }
     return {
       type: "error",
       status: res.error.status,
       contentType: "application/json",
-      body: JSON.stringify({
-        ...res.error,
-        message: res.error.message
-      })
+      body: JSON.stringify(body2)
     };
   }
   if (res.data === void 0) {
@@ -212,11 +277,16 @@ const actionResultErrorStack = /* @__PURE__ */ function actionResultErrorStackFn
     }
   };
 }();
+function astroCalledServerError() {
+  return new AstroError(ActionCalledFromServerError);
+}
 export {
   ACTION_ERROR_CODES,
   ACTION_QUERY_PARAMS,
   ActionError,
   ActionInputError,
+  appendForwardSlash,
+  astroCalledServerError,
   callSafely,
   deserializeActionResult,
   getActionQueryString,

node_modules/astro/dist/actions/utils.d.ts

@@ -1,11 +1,10 @@
 import type fsMod from 'node:fs';
-import type { APIContext } from '../@types/astro.js';
-import type { Locals } from './runtime/middleware.js';
-import { type ActionAPIContext } from './runtime/utils.js';
+import type { APIContext } from '../types/public/context.js';
+import { type ActionAPIContext, type Locals } from './runtime/utils.js';
 export declare function hasActionPayload(locals: APIContext['locals']): locals is Locals;
 export declare function createGetActionResult(locals: APIContext['locals']): APIContext['getActionResult'];
 export declare function createCallAction(context: ActionAPIContext): APIContext['callAction'];
 /**
  * Check whether the Actions config file is present.
  */
-export declare function isActionsFilePresent(fs: typeof fsMod, srcDir: URL): Promise<boolean>;
+export declare function isActionsFilePresent(fs: typeof fsMod, srcDir: URL): Promise<string | false>;

node_modules/astro/dist/actions/utils.js

@@ -26,20 +26,20 @@ async function isActionsFilePresent(fs, srcDir) {
   if (!actionsFile) return false;
   let contents;
   try {
-    contents = fs.readFileSync(actionsFile, "utf-8");
+    contents = fs.readFileSync(actionsFile.url, "utf-8");
   } catch {
     return false;
   }
-  const [, exports] = eslexer.parse(contents, actionsFile.pathname);
+  const [, exports] = eslexer.parse(contents, actionsFile.url.pathname);
   for (const exp of exports) {
     if (exp.n === "server") {
-      return true;
+      return actionsFile.filename;
     }
   }
   return false;
 }
 function search(fs, srcDir) {
-  const paths = [
+  const filenames = [
     "actions.mjs",
     "actions.js",
     "actions.mts",
@@ -48,10 +48,11 @@ function search(fs, srcDir) {
     "actions/index.js",
     "actions/index.mts",
     "actions/index.ts"
-  ].map((p) => new URL(p, srcDir));
-  for (const file of paths) {
-    if (fs.existsSync(file)) {
-      return file;
+  ];
+  for (const filename of filenames) {
+    const url = new URL(filename, srcDir);
+    if (fs.existsSync(url)) {
+      return { filename, url };
     }
   }
   return void 0;

node_modules/astro/dist/assets/build/generate.d.ts

@@ -1,8 +1,7 @@
-import type PQueue from 'p-queue';
-import type { AstroConfig } from '../../@types/astro.js';
 import type { BuildPipeline } from '../../core/build/pipeline.js';
 import type { Logger } from '../../core/logger/core.js';
 import type { MapValue } from '../../type-utils.js';
+import type { AstroConfig } from '../../types/public/config.js';
 import type { AssetsGlobalStaticImagesList } from '../types.js';
 type AssetEnv = {
     logger: Logger;
@@ -19,6 +18,6 @@ type AssetEnv = {
     assetsFolder: AstroConfig['build']['assets'];
 };
 export declare function prepareAssetsGenerationEnv(pipeline: BuildPipeline, totalCount: number): Promise<AssetEnv>;
-export declare function generateImagesForPath(originalFilePath: string, transformsAndPath: MapValue<AssetsGlobalStaticImagesList>, env: AssetEnv, queue: PQueue): Promise<void>;
+export declare function generateImagesForPath(originalFilePath: string, transformsAndPath: MapValue<AssetsGlobalStaticImagesList>, env: AssetEnv): Promise<void>;
 export declare function getStaticImageList(): AssetsGlobalStaticImagesList;
 export {};

node_modules/astro/dist/assets/build/generate.js

@@ -6,12 +6,11 @@ import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
-import { isServerLikeOutput } from "../../core/util.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
-import { loadRemoteImage } from "./remote.js";
+import { loadRemoteImage, revalidateRemoteImage } from "./remote.js";
 async function prepareAssetsGenerationEnv(pipeline, totalCount) {
-  const { config, logger } = pipeline;
+  const { config, logger, settings } = pipeline;
   let useCache = true;
   const assetsCacheDir = new URL("assets/", config.cacheDir);
   const count = { total: totalCount, current: 1 };
@@ -24,8 +23,9 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
     );
     useCache = false;
   }
+  const isServerOutput = settings.buildOutput === "server";
   let serverRoot, clientRoot;
-  if (isServerLikeOutput(config)) {
+  if (isServerOutput) {
     serverRoot = config.build.server;
     clientRoot = config.build.client;
   } else {
@@ -34,7 +34,7 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
   }
   return {
     logger,
-    isSSR: isServerLikeOutput(config),
+    isSSR: isServerOutput,
     count,
     useCache,
     assetsCacheDir,
@@ -47,12 +47,10 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
 function getFullImagePath(originalFilePath, env) {
   return new URL(removeLeadingForwardSlash(originalFilePath), env.serverRoot);
 }
-async function generateImagesForPath(originalFilePath, transformsAndPath, env, queue) {
+async function generateImagesForPath(originalFilePath, transformsAndPath, env) {
   let originalImage;
   for (const [_, transform] of transformsAndPath.transforms) {
-    await queue.add(async () => generateImage(transform.finalPath, transform.transform)).catch((e) => {
-      throw e;
-    });
+    await generateImage(transform.finalPath, transform.transform);
   }
   if (!env.isSSR && transformsAndPath.originalSrcPath && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
     try {
@@ -72,7 +70,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     const timeEnd = performance.now();
     const timeChange = getTimeStat(timeStart, timeEnd);
     const timeIncrease = `(+${timeChange})`;
-    const statsText = generationData.cached ? `(reused cache entry)` : `(before: ${generationData.weight.before}kB, after: ${generationData.weight.after}kB)`;
+    const statsText = generationData.cached !== "miss" ? generationData.cached === "hit" ? `(reused cache entry)` : `(revalidated cache entry)` : `(before: ${generationData.weight.before}kB, after: ${generationData.weight.after}kB)`;
     const count = `(${env.count.current}/${env.count.total})`;
     env.logger.info(
       null,
@@ -85,30 +83,69 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     const finalFileURL = new URL("." + filepath, env.clientRoot);
     const finalFolderURL = new URL("./", finalFileURL);
     await fs.promises.mkdir(finalFolderURL, { recursive: true });
-    const cacheFile = basename(filepath) + (isLocalImage ? "" : ".json");
+    const cacheFile = basename(filepath);
     const cachedFileURL = new URL(cacheFile, env.assetsCacheDir);
+    const cacheMetaFile = cacheFile + ".json";
+    const cachedMetaFileURL = new URL(cacheMetaFile, env.assetsCacheDir);
     try {
       if (isLocalImage) {
         await fs.promises.copyFile(cachedFileURL, finalFileURL, fs.constants.COPYFILE_FICLONE);
         return {
-          cached: true
+          cached: "hit"
         };
       } else {
-        const JSONData = JSON.parse(readFileSync(cachedFileURL, "utf-8"));
-        if (!JSONData.data || !JSONData.expires) {
-          await fs.promises.unlink(cachedFileURL);
+        const JSONData = JSON.parse(readFileSync(cachedMetaFileURL, "utf-8"));
+        if (!JSONData.expires) {
+          try {
+            await fs.promises.unlink(cachedFileURL);
+          } catch {
+          }
+          await fs.promises.unlink(cachedMetaFileURL);
           throw new Error(
             `Malformed cache entry for ${filepath}, cache will be regenerated for this file.`
           );
         }
-        if (JSONData.expires > Date.now()) {
-          await fs.promises.writeFile(finalFileURL, Buffer.from(JSONData.data, "base64"));
-          return {
-            cached: true
-          };
-        } else {
-          await fs.promises.unlink(cachedFileURL);
+        if (JSONData.data) {
+          const { data, ...meta } = JSONData;
+          await Promise.all([
+            fs.promises.writeFile(cachedFileURL, Buffer.from(data, "base64")),
+            writeCacheMetaFile(cachedMetaFileURL, meta, env)
+          ]);
         }
+        if (JSONData.expires > Date.now()) {
+          await fs.promises.copyFile(cachedFileURL, finalFileURL, fs.constants.COPYFILE_FICLONE);
+          return {
+            cached: "hit"
+          };
+        }
+        if (JSONData.etag || JSONData.lastModified) {
+          try {
+            const revalidatedData = await revalidateRemoteImage(options.src, {
+              etag: JSONData.etag,
+              lastModified: JSONData.lastModified
+            });
+            if (revalidatedData.data.length) {
+              originalImage = revalidatedData;
+            } else {
+              await writeCacheMetaFile(cachedMetaFileURL, revalidatedData, env);
+              await fs.promises.copyFile(
+                cachedFileURL,
+                finalFileURL,
+                fs.constants.COPYFILE_FICLONE
+              );
+              return { cached: "revalidated" };
+            }
+          } catch (e) {
+            env.logger.warn(
+              null,
+              `An error was encountered while revalidating a cached remote asset. Proceeding with stale cache. ${e}`
+            );
+            await fs.promises.copyFile(cachedFileURL, finalFileURL, fs.constants.COPYFILE_FICLONE);
+            return { cached: "hit" };
+          }
+        }
+        await fs.promises.unlink(cachedFileURL);
+        await fs.promises.unlink(cachedMetaFileURL);
       }
     } catch (e) {
       if (e.code !== "ENOENT") {
@@ -121,7 +158,9 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     }
     let resultData = {
       data: void 0,
-      expires: originalImage.expires
+      expires: originalImage.expires,
+      etag: originalImage.etag,
+      lastModified: originalImage.lastModified
     };
     const imageService = await getConfiguredImageService();
     try {
@@ -131,6 +170,9 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
         env.imageConfig
       )).data;
     } catch (e) {
+      if (AstroError.is(e)) {
+        throw e;
+      }
       const error = new AstroError(
         {
           ...AstroErrorData.CouldNotTransformImage,
@@ -145,13 +187,10 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
         if (isLocalImage) {
           await fs.promises.writeFile(cachedFileURL, resultData.data);
         } else {
-          await fs.promises.writeFile(
-            cachedFileURL,
-            JSON.stringify({
-              data: Buffer.from(resultData.data).toString("base64"),
-              expires: resultData.expires
-            })
-          );
+          await Promise.all([
+            fs.promises.writeFile(cachedFileURL, resultData.data),
+            writeCacheMetaFile(cachedMetaFileURL, resultData, env)
+          ]);
         }
       }
     } catch (e) {
@@ -163,7 +202,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
       await fs.promises.writeFile(finalFileURL, resultData.data);
     }
     return {
-      cached: false,
+      cached: "miss",
       weight: {
         // Divide by 1024 to get size in kilobytes
         before: Math.trunc(originalImage.data.byteLength / 1024),
@@ -172,6 +211,23 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
     };
   }
 }
+async function writeCacheMetaFile(cachedMetaFileURL, resultData, env) {
+  try {
+    return await fs.promises.writeFile(
+      cachedMetaFileURL,
+      JSON.stringify({
+        expires: resultData.expires,
+        etag: resultData.etag,
+        lastModified: resultData.lastModified
+      })
+    );
+  } catch (e) {
+    env.logger.warn(
+      null,
+      `An error was encountered while writing the cache file for a remote asset. Proceeding without caching this asset. Error: ${e}`
+    );
+  }
+}
 function getStaticImageList() {
   if (!globalThis?.astroAsset?.staticImages) {
     return /* @__PURE__ */ new Map();
@@ -180,11 +236,7 @@ function getStaticImageList() {
 }
 async function loadImage(path, env) {
   if (isRemotePath(path)) {
-    const remoteImage = await loadRemoteImage(path);
-    return {
-      data: remoteImage.data,
-      expires: remoteImage.expires
-    };
+    return await loadRemoteImage(path);
   }
   return {
     data: await fs.promises.readFile(getFullImagePath(path, env)),

node_modules/astro/dist/assets/build/remote.d.ts

@@ -1,8 +1,30 @@
 export type RemoteCacheEntry = {
-    data: string;
+    data?: string;
     expires: number;
+    etag?: string;
+    lastModified?: string;
 };
 export declare function loadRemoteImage(src: string): Promise<{
     data: Buffer;
     expires: number;
+    etag: string | undefined;
+    lastModified: string | undefined;
+}>;
+/**
+ * Revalidate a cached remote asset using its entity-tag or modified date.
+ * Uses the [If-None-Match](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-None-Match) and [If-Modified-Since](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Modified-Since)
+ * headers to check with the remote server if the cached version of a remote asset is still up to date.
+ * The remote server may respond that the cached asset is still up-to-date if the entity-tag or modification time matches (304 Not Modified), or respond with an updated asset (200 OK)
+ * @param src - url to remote asset
+ * @param revalidationData - an object containing the stored Entity-Tag of the cached asset and/or the Last Modified time
+ * @returns An ImageData object containing the asset data, a new expiry time, and the asset's etag. The data buffer will be empty if the asset was not modified.
+ */
+export declare function revalidateRemoteImage(src: string, revalidationData: {
+    etag?: string;
+    lastModified?: string;
+}): Promise<{
+    data: Buffer;
+    expires: number;
+    etag: string | undefined;
+    lastModified: string | undefined;
 }>;

node_modules/astro/dist/assets/build/remote.js

@@ -11,7 +11,41 @@ async function loadRemoteImage(src) {
   const expires = policy.storable() ? policy.timeToLive() : 0;
   return {
     data: Buffer.from(await res.arrayBuffer()),
-    expires: Date.now() + expires
+    expires: Date.now() + expires,
+    etag: res.headers.get("Etag") ?? void 0,
+    lastModified: res.headers.get("Last-Modified") ?? void 0
+  };
+}
+async function revalidateRemoteImage(src, revalidationData) {
+  const headers = {
+    ...revalidationData.etag && { "If-None-Match": revalidationData.etag },
+    ...revalidationData.lastModified && { "If-Modified-Since": revalidationData.lastModified }
+  };
+  const req = new Request(src, { headers });
+  const res = await fetch(req);
+  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})`
+    );
+  }
+  const data = Buffer.from(await res.arrayBuffer());
+  if (res.ok && !data.length) {
+    return await loadRemoteImage(src);
+  }
+  const policy = new CachePolicy(
+    webToCachePolicyRequest(req),
+    webToCachePolicyResponse(
+      res.ok ? res : new Response(null, { status: 200, headers: res.headers })
+    )
+    // 304 responses themselves are not cacheable, so just pretend to get the refreshed TTL
+  );
+  const expires = policy.storable() ? policy.timeToLive() : 0;
+  return {
+    data,
+    expires: Date.now() + expires,
+    // While servers should respond with the same headers as a 200 response, if they don't we should reuse the stored value
+    etag: res.headers.get("Etag") ?? (res.ok ? void 0 : revalidationData.etag),
+    lastModified: res.headers.get("Last-Modified") ?? (res.ok ? void 0 : revalidationData.lastModified)
   };
 }
 function webToCachePolicyRequest({ url, method, headers: _headers }) {
@@ -38,5 +72,6 @@ function webToCachePolicyResponse({ status, headers: _headers }) {
   };
 }
 export {
-  loadRemoteImage
+  loadRemoteImage,
+  revalidateRemoteImage
 };

node_modules/astro/dist/assets/consts.js

@@ -22,7 +22,15 @@ const VALID_SUPPORTED_FORMATS = [
 ];
 const DEFAULT_OUTPUT_FORMAT = "webp";
 const VALID_OUTPUT_FORMATS = ["avif", "png", "webp", "jpeg", "jpg", "svg"];
-const DEFAULT_HASH_PROPS = ["src", "width", "height", "format", "quality"];
+const DEFAULT_HASH_PROPS = [
+  "src",
+  "width",
+  "height",
+  "format",
+  "quality",
+  "fit",
+  "position"
+];
 export {
   DEFAULT_HASH_PROPS,
   DEFAULT_OUTPUT_FORMAT,

node_modules/astro/dist/assets/endpoint/config.d.ts

@@ -1,2 +1,2 @@
-import type { AstroSettings } from '../../@types/astro.js';
-export declare function injectImageEndpoint(settings: AstroSettings, mode: 'dev' | 'build'): AstroSettings;
+import type { AstroSettings, RoutesList } from '../../types/astro.js';
+export declare function injectImageEndpoint(settings: AstroSettings, manifest: RoutesList, mode: 'dev' | 'build', cwd?: string): void;

node_modules/astro/dist/assets/endpoint/config.js

@@ -1,11 +1,39 @@
-function injectImageEndpoint(settings, mode) {
-  const endpointEntrypoint = settings.config.image.endpoint ?? (mode === "dev" ? "astro/assets/endpoint/node" : "astro/assets/endpoint/generic");
-  settings.injectedRoutes.push({
-    pattern: "/_image",
-    entrypoint: endpointEntrypoint,
-    prerender: false
-  });
-  return settings;
+import {
+  removeLeadingForwardSlash,
+  removeTrailingForwardSlash
+} from "@astrojs/internal-helpers/path";
+import { resolveInjectedRoute } from "../../core/routing/manifest/create.js";
+import { getPattern } from "../../core/routing/manifest/pattern.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/node" : "astro/assets/endpoint/generic" : settings.config.image.endpoint.entrypoint;
+  const segments = [
+    [
+      {
+        content: removeTrailingForwardSlash(
+          removeLeadingForwardSlash(settings.config.image.endpoint.route)
+        ),
+        dynamic: false,
+        spread: false
+      }
+    ]
+  ];
+  return {
+    type: "endpoint",
+    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,
+    generate: () => "",
+    pathname: settings.config.image.endpoint.route,
+    prerender: false,
+    fallbackRoutes: [],
+    origin: "internal"
+  };
 }
 export {
   injectImageEndpoint

node_modules/astro/dist/assets/endpoint/generic.d.ts

@@ -1,4 +1,4 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */

node_modules/astro/dist/assets/endpoint/generic.js

@@ -1,9 +1,9 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 async function loadRemoteImage(src, headers) {
   try {
     const res = await fetch(src, {

node_modules/astro/dist/assets/endpoint/node.d.ts

@@ -1,4 +1,4 @@
-import type { APIRoute } from '../../@types/astro.js';
+import type { APIRoute } from '../../types/public/common.js';
 /**
  * Endpoint used in dev and SSR to serve optimized images by the base image services
  */

node_modules/astro/dist/assets/endpoint/node.js

@@ -1,13 +1,13 @@
+import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { readFile } from "node:fs/promises";
 import os from "node:os";
 import { isAbsolute } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
+import { isRemoteAllowed } from "@astrojs/internal-helpers/remote";
 import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
-import { isRemoteAllowed } from "../utils/remotePattern.js";
 function replaceFileSystemReferences(src) {
   return os.platform().includes("win32") ? src.replace(/^\/@fs\//, "") : src.replace(/^\/@fs/, "");
 }

node_modules/astro/dist/assets/fonts/config.d.ts

@@ -0,0 +1,363 @@
+import { z } from 'zod';
+export declare const styleSchema: z.ZodEnum<["normal", "italic", "oblique"]>;
+export declare const fontProviderSchema: z.ZodObject<{
+    /**
+     * URL, path relative to the root or package import.
+     */
+    entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
+    /**
+     * Optional serializable object passed to the unifont provider.
+     */
+    config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+}, "strict", z.ZodTypeAny, {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+}, {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+}>;
+export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+    /**
+     * The font family name, as identified by your font provider.
+     */
+    name: z.ZodString;
+    /**
+     * A valid [ident](https://developer.mozilla.org/en-US/docs/Web/CSS/ident) in the form of a CSS variable (i.e. starting with `--`).
+     */
+    cssVariable: z.ZodString;
+}, {
+    /**
+     * @default `["sans-serif"]`
+     *
+     * An array of fonts to use when your chosen font is unavailable, or loading. Fallback fonts will be chosen in the order listed. The first available font will be used:
+     *
+     * ```js
+     * fallbacks: ["CustomFont", "serif"]
+     * ```
+     *
+     * To disable fallback fonts completely, configure an empty array:
+     *
+     * ```js
+     * fallbacks: []
+     * ```
+     *
+
+     * If the last font in the `fallbacks` array is a [generic family name](https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#generic-name), Astro will attempt to generate [optimized fallbacks](https://developer.chrome.com/blog/font-fallbacks) using font metrics will be generated. To disable this optimization, set `optimizedFallbacks` to false.
+     */
+    fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    /**
+     * @default `true`
+     *
+     * Whether or not to enable optimized fallback generation. You may disable this default optimization to have full control over `fallbacks`.
+     */
+    optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
+}>, {
+    /**
+     * The source of your font files. Set to `"local"` to use local font files.
+     */
+    provider: z.ZodLiteral<"local">;
+    /**
+     * Each variant represents a [`@font-face` declaration](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/).
+     */
+    variants: z.ZodArray<z.ZodObject<z.objectUtil.extendShape<{
+        /**
+         * A [font weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
+         *
+         * ```js
+         * weight: "100 900"
+         * ```
+         */
+        weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
+        /**
+         * A [font style](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style).
+         */
+        style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+        /**
+         * @default `"swap"`
+         *
+         * A [font display](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display).
+         */
+        display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
+        /**
+         * A [font stretch](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-stretch).
+         */
+        stretch: z.ZodOptional<z.ZodString>;
+        /**
+         * Font [feature settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-feature-settings).
+         */
+        featureSettings: z.ZodOptional<z.ZodString>;
+        /**
+         * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
+         */
+        variationSettings: z.ZodOptional<z.ZodString>;
+    }, {
+        /**
+         * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import or a URL. URLs are particularly useful if you inject local fonts through an integration.
+         */
+        src: z.ZodArray<z.ZodUnion<[z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>, z.ZodObject<{
+            url: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
+            tech: z.ZodOptional<z.ZodString>;
+        }, "strict", z.ZodTypeAny, {
+            url: string | URL;
+            tech?: string | undefined;
+        }, {
+            url: string | URL;
+            tech?: string | undefined;
+        }>]>, "atleastone">;
+        /**
+         * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
+         */
+        unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+    }>, "strict", z.ZodTypeAny, {
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }, {
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }>, "atleastone">;
+}>, "strict", z.ZodTypeAny, {
+    name: string;
+    cssVariable: string;
+    provider: "local";
+    variants: [{
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }, ...{
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }[]];
+    fallbacks?: string[] | undefined;
+    optimizedFallbacks?: boolean | undefined;
+}, {
+    name: string;
+    cssVariable: string;
+    provider: "local";
+    variants: [{
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }, ...{
+        src: [string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        }, ...(string | URL | {
+            url: string | URL;
+            tech?: string | undefined;
+        })[]];
+        weight?: string | number | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+        stretch?: string | undefined;
+        featureSettings?: string | undefined;
+        variationSettings?: string | undefined;
+        unicodeRange?: [string, ...string[]] | undefined;
+    }[]];
+    fallbacks?: string[] | undefined;
+    optimizedFallbacks?: boolean | undefined;
+}>;
+export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
+    /**
+     * The font family name, as identified by your font provider.
+     */
+    name: z.ZodString;
+    /**
+     * A valid [ident](https://developer.mozilla.org/en-US/docs/Web/CSS/ident) in the form of a CSS variable (i.e. starting with `--`).
+     */
+    cssVariable: z.ZodString;
+}, Omit<{
+    /**
+     * A [font weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
+     *
+     * ```js
+     * weight: "100 900"
+     * ```
+     */
+    weight: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
+    /**
+     * A [font style](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style).
+     */
+    style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+    /**
+     * @default `"swap"`
+     *
+     * A [font display](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display).
+     */
+    display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
+    /**
+     * A [font stretch](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-stretch).
+     */
+    stretch: z.ZodOptional<z.ZodString>;
+    /**
+     * Font [feature settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-feature-settings).
+     */
+    featureSettings: z.ZodOptional<z.ZodString>;
+    /**
+     * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
+     */
+    variationSettings: z.ZodOptional<z.ZodString>;
+}, "weight" | "style">>, {
+    /**
+     * @default `["sans-serif"]`
+     *
+     * An array of fonts to use when your chosen font is unavailable, or loading. Fallback fonts will be chosen in the order listed. The first available font will be used:
+     *
+     * ```js
+     * fallbacks: ["CustomFont", "serif"]
+     * ```
+     *
+     * To disable fallback fonts completely, configure an empty array:
+     *
+     * ```js
+     * fallbacks: []
+     * ```
+     *
+
+     * If the last font in the `fallbacks` array is a [generic family name](https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#generic-name), Astro will attempt to generate [optimized fallbacks](https://developer.chrome.com/blog/font-fallbacks) using font metrics will be generated. To disable this optimization, set `optimizedFallbacks` to false.
+     */
+    fallbacks: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    /**
+     * @default `true`
+     *
+     * Whether or not to enable optimized fallback generation. You may disable this default optimization to have full control over `fallbacks`.
+     */
+    optimizedFallbacks: z.ZodOptional<z.ZodBoolean>;
+}>, {
+    /**
+     * The source of your font files. You can use a built-in provider or write your own custom provider.
+     */
+    provider: z.ZodObject<{
+        /**
+         * URL, path relative to the root or package import.
+         */
+        entrypoint: z.ZodUnion<[z.ZodString, z.ZodType<URL, z.ZodTypeDef, URL>]>;
+        /**
+         * Optional serializable object passed to the unifont provider.
+         */
+        config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    }, "strict", z.ZodTypeAny, {
+        entrypoint: string | URL;
+        config?: Record<string, any> | undefined;
+    }, {
+        entrypoint: string | URL;
+        config?: Record<string, any> | undefined;
+    }>;
+    /**
+     * @default `[400]`
+     *
+     * An array of [font weights](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
+     *
+     * ```js
+     * weight: "100 900"
+     * ```
+     */
+    weights: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "atleastone">>;
+    /**
+     * @default `["normal", "italic"]`
+     *
+     * An array of [font styles](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style).
+     */
+    styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
+    /**
+     * @default `["cyrillic-ext", "cyrillic", "greek-ext", "greek", "vietnamese", "latin-ext", "latin"]`
+     *
+     * An array of [font subsets](https://knaap.dev/posts/font-subsetting/):
+     */
+    subsets: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+    /**
+     * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
+     */
+    unicodeRange: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+}>, "strict", z.ZodTypeAny, {
+    name: string;
+    cssVariable: string;
+    provider: {
+        entrypoint: string | URL;
+        config?: Record<string, any> | undefined;
+    };
+    weights?: [string | number, ...(string | number)[]] | undefined;
+    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
+    subsets?: [string, ...string[]] | undefined;
+    fallbacks?: string[] | undefined;
+    optimizedFallbacks?: boolean | undefined;
+    display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+    stretch?: string | undefined;
+    featureSettings?: string | undefined;
+    variationSettings?: string | undefined;
+    unicodeRange?: [string, ...string[]] | undefined;
+}, {
+    name: string;
+    cssVariable: string;
+    provider: {
+        entrypoint: string | URL;
+        config?: Record<string, any> | undefined;
+    };
+    weights?: [string | number, ...(string | number)[]] | undefined;
+    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
+    subsets?: [string, ...string[]] | undefined;
+    fallbacks?: string[] | undefined;
+    optimizedFallbacks?: boolean | undefined;
+    display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
+    stretch?: string | undefined;
+    featureSettings?: string | undefined;
+    variationSettings?: string | undefined;
+    unicodeRange?: [string, ...string[]] | undefined;
+}>;

node_modules/astro/dist/assets/fonts/config.js

@@ -0,0 +1,161 @@
+import { z } from "zod";
+import { LOCAL_PROVIDER_NAME } from "./constants.js";
+const weightSchema = z.union([z.string(), z.number()]);
+const styleSchema = z.enum(["normal", "italic", "oblique"]);
+const unicodeRangeSchema = z.array(z.string()).nonempty();
+const familyPropertiesSchema = z.object({
+  /**
+   * A [font weight](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
+   *
+   * ```js
+   * weight: "100 900"
+   * ```
+   */
+  weight: weightSchema.optional(),
+  /**
+   * A [font style](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style).
+   */
+  style: styleSchema.optional(),
+  /**
+   * @default `"swap"`
+   *
+   * A [font display](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display).
+   */
+  display: z.enum(["auto", "block", "swap", "fallback", "optional"]).optional(),
+  /**
+   * A [font stretch](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-stretch).
+   */
+  stretch: z.string().optional(),
+  /**
+   * Font [feature settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-feature-settings).
+   */
+  featureSettings: z.string().optional(),
+  /**
+   * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
+   */
+  variationSettings: z.string().optional()
+});
+const fallbacksSchema = z.object({
+  /**
+  	 * @default `["sans-serif"]`
+  	 *
+  	 * An array of fonts to use when your chosen font is unavailable, or loading. Fallback fonts will be chosen in the order listed. The first available font will be used:
+  	 *
+  	 * ```js
+  	 * fallbacks: ["CustomFont", "serif"]
+  	 * ```
+  	 *
+  	 * To disable fallback fonts completely, configure an empty array:
+  	 *
+  	 * ```js
+  	 * fallbacks: []
+  	 * ```
+  	 *
+  
+  	 * If the last font in the `fallbacks` array is a [generic family name](https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#generic-name), Astro will attempt to generate [optimized fallbacks](https://developer.chrome.com/blog/font-fallbacks) using font metrics will be generated. To disable this optimization, set `optimizedFallbacks` to false.
+  	 */
+  fallbacks: z.array(z.string()).optional(),
+  /**
+   * @default `true`
+   *
+   * Whether or not to enable optimized fallback generation. You may disable this default optimization to have full control over `fallbacks`.
+   */
+  optimizedFallbacks: z.boolean().optional()
+});
+const requiredFamilyAttributesSchema = z.object({
+  /**
+   * The font family name, as identified by your font provider.
+   */
+  name: z.string(),
+  /**
+   * A valid [ident](https://developer.mozilla.org/en-US/docs/Web/CSS/ident) in the form of a CSS variable (i.e. starting with `--`).
+   */
+  cssVariable: z.string()
+});
+const entrypointSchema = z.union([z.string(), z.instanceof(URL)]);
+const fontProviderSchema = z.object({
+  /**
+   * URL, path relative to the root or package import.
+   */
+  entrypoint: entrypointSchema,
+  /**
+   * Optional serializable object passed to the unifont provider.
+   */
+  config: z.record(z.string(), z.any()).optional()
+}).strict();
+const localFontFamilySchema = requiredFamilyAttributesSchema.merge(fallbacksSchema).merge(
+  z.object({
+    /**
+     * The source of your font files. Set to `"local"` to use local font files.
+     */
+    provider: z.literal(LOCAL_PROVIDER_NAME),
+    /**
+     * Each variant represents a [`@font-face` declaration](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/).
+     */
+    variants: z.array(
+      familyPropertiesSchema.merge(
+        z.object({
+          /**
+           * Font [sources](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src). It can be a path relative to the root, a package import or a URL. URLs are particularly useful if you inject local fonts through an integration.
+           */
+          src: z.array(
+            z.union([
+              entrypointSchema,
+              z.object({ url: entrypointSchema, tech: z.string().optional() }).strict()
+            ])
+          ).nonempty(),
+          /**
+           * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
+           */
+          unicodeRange: unicodeRangeSchema.optional()
+          // TODO: find a way to support subsets (through fontkit?)
+        }).strict()
+      )
+    ).nonempty()
+  })
+).strict();
+const remoteFontFamilySchema = requiredFamilyAttributesSchema.merge(
+  familyPropertiesSchema.omit({
+    weight: true,
+    style: true
+  })
+).merge(fallbacksSchema).merge(
+  z.object({
+    /**
+     * The source of your font files. You can use a built-in provider or write your own custom provider.
+     */
+    provider: fontProviderSchema,
+    /**
+     * @default `[400]`
+     *
+     * An array of [font weights](https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight). If the associated font is a [variable font](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide), you can specify a range of weights:
+     *
+     * ```js
+     * weight: "100 900"
+     * ```
+     */
+    weights: z.array(weightSchema).nonempty().optional(),
+    /**
+     * @default `["normal", "italic"]`
+     *
+     * An array of [font styles](https://developer.mozilla.org/en-US/docs/Web/CSS/font-style).
+     */
+    styles: z.array(styleSchema).nonempty().optional(),
+    /**
+     * @default `["cyrillic-ext", "cyrillic", "greek-ext", "greek", "vietnamese", "latin-ext", "latin"]`
+     *
+     * An array of [font subsets](https://knaap.dev/posts/font-subsetting/):
+     */
+    subsets: z.array(z.string()).nonempty().optional(),
+    /**
+     * A [unicode range](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/unicode-range).
+     */
+    unicodeRange: unicodeRangeSchema.optional()
+  })
+).strict();
+export {
+  fontProviderSchema,
+  localFontFamilySchema,
+  remoteFontFamilySchema,
+  styleSchema
+};

node_modules/astro/dist/assets/fonts/constants.d.ts

@@ -0,0 +1,14 @@
+import type { Defaults, FontType } from './types.js';
+export declare const LOCAL_PROVIDER_NAME = "local";
+export declare const DEFAULTS: Defaults;
+export declare const VIRTUAL_MODULE_ID = "virtual:astro:assets/fonts/internal";
+export declare const RESOLVED_VIRTUAL_MODULE_ID: string;
+export declare const ASSETS_DIR = "fonts";
+export declare const CACHE_DIR = "./fonts/";
+export declare const FONT_TYPES: readonly ["woff2", "woff", "otf", "ttf", "eot"];
+export declare const FONT_FORMATS: Array<{
+    type: FontType;
+    format: string;
+}>;
+export declare const GENERIC_FALLBACK_NAMES: readonly ["serif", "sans-serif", "monospace", "cursive", "fantasy", "system-ui", "ui-serif", "ui-sans-serif", "ui-monospace", "ui-rounded", "emoji", "math", "fangsong"];
+export declare const FONTS_TYPES_FILE = "fonts.d.ts";

node_modules/astro/dist/assets/fonts/constants.js

@@ -0,0 +1,49 @@
+const LOCAL_PROVIDER_NAME = "local";
+const DEFAULTS = {
+  weights: ["400"],
+  styles: ["normal", "italic"],
+  subsets: ["cyrillic-ext", "cyrillic", "greek-ext", "greek", "vietnamese", "latin-ext", "latin"],
+  // Technically serif is the browser default but most websites these days use sans-serif
+  fallbacks: ["sans-serif"],
+  optimizedFallbacks: true
+};
+const VIRTUAL_MODULE_ID = "virtual:astro:assets/fonts/internal";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
+const ASSETS_DIR = "fonts";
+const CACHE_DIR = "./fonts/";
+const FONT_TYPES = ["woff2", "woff", "otf", "ttf", "eot"];
+const FONT_FORMATS = [
+  { type: "woff2", format: "woff2" },
+  { type: "woff", format: "woff" },
+  { type: "otf", format: "opentype" },
+  { type: "ttf", format: "truetype" },
+  { type: "eot", format: "embedded-opentype" }
+];
+const GENERIC_FALLBACK_NAMES = [
+  "serif",
+  "sans-serif",
+  "monospace",
+  "cursive",
+  "fantasy",
+  "system-ui",
+  "ui-serif",
+  "ui-sans-serif",
+  "ui-monospace",
+  "ui-rounded",
+  "emoji",
+  "math",
+  "fangsong"
+];
+const FONTS_TYPES_FILE = "fonts.d.ts";
+export {
+  ASSETS_DIR,
+  CACHE_DIR,
+  DEFAULTS,
+  FONTS_TYPES_FILE,
+  FONT_FORMATS,
+  FONT_TYPES,
+  GENERIC_FALLBACK_NAMES,
+  LOCAL_PROVIDER_NAME,
+  RESOLVED_VIRTUAL_MODULE_ID,
+  VIRTUAL_MODULE_ID
+};

node_modules/astro/dist/assets/fonts/definitions.d.ts

@@ -0,0 +1,88 @@
+import type * as unifont from 'unifont';
+import type { CollectedFontForMetrics } from './logic/optimize-fallbacks.js';
+import type { AstroFontProvider, FontFaceMetrics, FontFileData, FontType, GenericFallbackName, PreloadData, ResolvedFontProvider, Style } from './types.js';
+export interface Hasher {
+    hashString: (input: string) => string;
+    hashObject: (input: Record<string, any>) => string;
+}
+export interface RemoteFontProviderModResolver {
+    resolve: (id: string) => Promise<any>;
+}
+export interface RemoteFontProviderResolver {
+    resolve: (provider: AstroFontProvider) => Promise<ResolvedFontProvider>;
+}
+export interface LocalProviderUrlResolver {
+    resolve: (input: string) => string;
+}
+type SingleErrorInput<TType extends string, TData extends Record<string, any>> = {
+    type: TType;
+    data: TData;
+    cause: unknown;
+};
+export type ErrorHandlerInput = SingleErrorInput<'cannot-load-font-provider', {
+    entrypoint: string;
+}> | SingleErrorInput<'unknown-fs-error', {}> | SingleErrorInput<'cannot-fetch-font-file', {
+    url: string;
+}> | SingleErrorInput<'cannot-extract-font-type', {
+    url: string;
+}> | SingleErrorInput<'cannot-extract-data', {
+    family: string;
+    url: string;
+}>;
+export interface ErrorHandler {
+    handle: (input: ErrorHandlerInput) => Error;
+}
+export interface UrlProxy {
+    proxy: (input: Pick<FontFileData, 'url' | 'init'> & {
+        type: FontType;
+        collectPreload: boolean;
+        data: Partial<unifont.FontFaceData>;
+    }) => string;
+}
+export interface UrlResolver {
+    resolve: (hash: string) => string;
+}
+export interface UrlProxyContentResolver {
+    resolve: (url: string) => string;
+}
+export interface DataCollector {
+    collect: (input: FontFileData & {
+        data: Partial<unifont.FontFaceData>;
+        preload: PreloadData | null;
+    }) => void;
+}
+export type CssProperties = Record<string, string | undefined>;
+export interface CssRenderer {
+    generateFontFace: (family: string, properties: CssProperties) => string;
+    generateCssVariable: (key: string, values: Array<string>) => string;
+}
+export interface FontMetricsResolver {
+    getMetrics: (name: string, font: CollectedFontForMetrics) => Promise<FontFaceMetrics>;
+    generateFontFace: (input: {
+        metrics: FontFaceMetrics;
+        fallbackMetrics: FontFaceMetrics;
+        name: string;
+        font: string;
+        properties: CssProperties;
+    }) => string;
+}
+export interface SystemFallbacksProvider {
+    getLocalFonts: (fallback: GenericFallbackName) => Array<string> | null;
+    getMetricsForLocalFont: (family: string) => FontFaceMetrics;
+}
+export interface FontFetcher {
+    fetch: (input: FontFileData) => Promise<Buffer>;
+}
+export interface FontTypeExtractor {
+    extract: (url: string) => FontType;
+}
+export interface FontFileReader {
+    extract: (input: {
+        family: string;
+        url: string;
+    }) => {
+        weight: string;
+        style: Style;
+    };
+}
+export {};

node_modules/astro/dist/assets/fonts/implementations/css-renderer.d.ts

@@ -0,0 +1,9 @@
+import type { CssProperties, CssRenderer } from '../definitions.js';
+export declare function renderFontFace(properties: CssProperties, minify: boolean): string;
+export declare function renderCssVariable(key: string, values: Array<string>, minify: boolean): string;
+export declare function withFamily(family: string, properties: CssProperties): CssProperties;
+/** If the value contains spaces (which would be incorrectly interpreted), we wrap it in quotes. */
+export declare function handleValueWithSpaces(value: string): string;
+export declare function createMinifiableCssRenderer({ minify }: {
+    minify: boolean;
+}): CssRenderer;

node_modules/astro/dist/assets/fonts/implementations/css-renderer.js

@@ -0,0 +1,42 @@
+function renderFontFace(properties, minify) {
+  const lf = minify ? "" : `
+`;
+  const sp = minify ? "" : " ";
+  return `@font-face${sp}{${lf}${Object.entries(properties).filter(([, value]) => Boolean(value)).map(([key, value]) => `${sp}${sp}${key}:${sp}${value};`).join(lf)}${lf}}${lf}`;
+}
+function renderCssVariable(key, values, minify) {
+  const lf = minify ? "" : `
+`;
+  const sp = minify ? "" : " ";
+  return `:root${sp}{${lf}${sp}${sp}${key}:${sp}${values.map((v) => handleValueWithSpaces(v)).join(`,${sp}`)};${lf}}${lf}`;
+}
+function withFamily(family, properties) {
+  return {
+    "font-family": handleValueWithSpaces(family),
+    ...properties
+  };
+}
+const SPACE_RE = /\s/;
+function handleValueWithSpaces(value) {
+  if (SPACE_RE.test(value)) {
+    return JSON.stringify(value);
+  }
+  return value;
+}
+function createMinifiableCssRenderer({ minify }) {
+  return {
+    generateFontFace(family, properties) {
+      return renderFontFace(withFamily(family, properties), minify);
+    },
+    generateCssVariable(key, values) {
+      return renderCssVariable(key, values, minify);
+    }
+  };
+}
+export {
+  createMinifiableCssRenderer,
+  handleValueWithSpaces,
+  renderCssVariable,
+  renderFontFace,
+  withFamily
+};

node_modules/astro/dist/assets/fonts/implementations/data-collector.d.ts

@@ -0,0 +1,3 @@
+import type { DataCollector } from '../definitions.js';
+import type { CreateUrlProxyParams } from '../types.js';
+export declare function createDataCollector({ hasUrl, saveUrl, savePreload, saveFontData, }: Omit<CreateUrlProxyParams, 'local'>): DataCollector;

node_modules/astro/dist/assets/fonts/implementations/data-collector.js

@@ -0,0 +1,21 @@
+function createDataCollector({
+  hasUrl,
+  saveUrl,
+  savePreload,
+  saveFontData
+}) {
+  return {
+    collect({ hash, url, init, preload, data }) {
+      if (!hasUrl(hash)) {
+        saveUrl({ hash, url, init });
+        if (preload) {
+          savePreload(preload);
+        }
+      }
+      saveFontData({ hash, url, data, init });
+    }
+  };
+}
+export {
+  createDataCollector
+};

node_modules/astro/dist/assets/fonts/implementations/error-handler.d.ts

@@ -0,0 +1,2 @@
+import type { ErrorHandler } from '../definitions.js';
+export declare function createAstroErrorHandler(): ErrorHandler;

node_modules/astro/dist/assets/fonts/implementations/error-handler.js

@@ -0,0 +1,41 @@
+import { AstroError, AstroErrorData } from "../../../core/errors/index.js";
+function getProps(input) {
+  if (input.type === "cannot-load-font-provider") {
+    return {
+      ...AstroErrorData.CannotLoadFontProvider,
+      message: AstroErrorData.CannotLoadFontProvider.message(input.data.entrypoint)
+    };
+  } else if (input.type === "unknown-fs-error") {
+    return AstroErrorData.UnknownFilesystemError;
+  } else if (input.type === "cannot-fetch-font-file") {
+    return {
+      ...AstroErrorData.CannotFetchFontFile,
+      message: AstroErrorData.CannotFetchFontFile.message(input.data.url)
+    };
+  } else if (input.type === "cannot-extract-font-type") {
+    return {
+      ...AstroErrorData.CannotExtractFontType,
+      message: AstroErrorData.CannotExtractFontType.message(input.data.url)
+    };
+  } else if (input.type === "cannot-extract-data") {
+    return {
+      ...AstroErrorData.CannotDetermineWeightAndStyleFromFontFile,
+      message: AstroErrorData.CannotDetermineWeightAndStyleFromFontFile.message(
+        input.data.family,
+        input.data.url
+      )
+    };
+  }
+  input;
+  return AstroErrorData.UnknownError;
+}
+function createAstroErrorHandler() {
+  return {
+    handle(input) {
+      return new AstroError(getProps(input), { cause: input.cause });
+    }
+  };
+}
+export {
+  createAstroErrorHandler
+};

node_modules/astro/dist/assets/fonts/implementations/font-fetcher.d.ts

@@ -0,0 +1,8 @@
+import type { Storage } from 'unstorage';
+import type { ErrorHandler, FontFetcher } from '../definitions.js';
+export declare function createCachedFontFetcher({ storage, errorHandler, fetch, readFile, }: {
+    storage: Storage;
+    errorHandler: ErrorHandler;
+    fetch: (url: string, init?: RequestInit) => Promise<Response>;
+    readFile: (url: string) => Promise<Buffer>;
+}): FontFetcher;

node_modules/astro/dist/assets/fonts/implementations/font-fetcher.js

@@ -0,0 +1,34 @@
+import { isAbsolute } from "node:path";
+import { cache } from "../utils.js";
+function createCachedFontFetcher({
+  storage,
+  errorHandler,
+  fetch,
+  readFile
+}) {
+  return {
+    async fetch({ hash, url, init }) {
+      return await cache(storage, hash, async () => {
+        try {
+          if (isAbsolute(url)) {
+            return await readFile(url);
+          }
+          const response = await fetch(url, init ?? void 0);
+          if (!response.ok) {
+            throw new Error(`Response was not successful, received status code ${response.status}`);
+          }
+          return Buffer.from(await response.arrayBuffer());
+        } catch (cause) {
+          throw errorHandler.handle({
+            type: "cannot-fetch-font-file",
+            data: { url },
+            cause
+          });
+        }
+      });
+    }
+  };
+}
+export {
+  createCachedFontFetcher
+};

node_modules/astro/dist/assets/fonts/implementations/font-file-reader.d.ts

@@ -0,0 +1,4 @@
+import type { ErrorHandler, FontFileReader } from '../definitions.js';
+export declare function createFontaceFontFileReader({ errorHandler, }: {
+    errorHandler: ErrorHandler;
+}): FontFileReader;

node_modules/astro/dist/assets/fonts/implementations/font-file-reader.js

@@ -0,0 +1,26 @@
+import { readFileSync } from "node:fs";
+import { fontace } from "fontace";
+function createFontaceFontFileReader({
+  errorHandler
+}) {
+  return {
+    extract({ family, url }) {
+      try {
+        const data = fontace(readFileSync(url));
+        return {
+          weight: data.weight,
+          style: data.style
+        };
+      } catch (cause) {
+        throw errorHandler.handle({
+          type: "cannot-extract-data",
+          data: { family, url },
+          cause
+        });
+      }
+    }
+  };
+}
+export {
+  createFontaceFontFileReader
+};

node_modules/astro/dist/assets/fonts/implementations/font-metrics-resolver.d.ts

@@ -0,0 +1,5 @@
+import type { CssRenderer, FontFetcher, FontMetricsResolver } from '../definitions.js';
+export declare function createCapsizeFontMetricsResolver({ fontFetcher, cssRenderer, }: {
+    fontFetcher: FontFetcher;
+    cssRenderer: CssRenderer;
+}): FontMetricsResolver;

node_modules/astro/dist/assets/fonts/implementations/font-metrics-resolver.js

@@ -0,0 +1,60 @@
+import { fromBuffer } from "@capsizecss/unpack";
+import { renderFontSrc } from "../utils.js";
+function filterRequiredMetrics({
+  ascent,
+  descent,
+  lineGap,
+  unitsPerEm,
+  xWidthAvg
+}) {
+  return {
+    ascent,
+    descent,
+    lineGap,
+    unitsPerEm,
+    xWidthAvg
+  };
+}
+function toPercentage(value, fractionDigits = 4) {
+  const percentage = value * 100;
+  return `${+percentage.toFixed(fractionDigits)}%`;
+}
+function createCapsizeFontMetricsResolver({
+  fontFetcher,
+  cssRenderer
+}) {
+  const cache = {};
+  return {
+    async getMetrics(name, input) {
+      cache[name] ??= filterRequiredMetrics(await fromBuffer(await fontFetcher.fetch(input)));
+      return cache[name];
+    },
+    // Source: https://github.com/unjs/fontaine/blob/f00f84032c5d5da72c8798eae4cd68d3ddfbf340/src/css.ts#L170
+    generateFontFace({
+      metrics,
+      fallbackMetrics,
+      name: fallbackName,
+      font: fallbackFontName,
+      properties
+    }) {
+      const preferredFontXAvgRatio = metrics.xWidthAvg / metrics.unitsPerEm;
+      const fallbackFontXAvgRatio = fallbackMetrics.xWidthAvg / fallbackMetrics.unitsPerEm;
+      const sizeAdjust = preferredFontXAvgRatio / fallbackFontXAvgRatio;
+      const adjustedEmSquare = metrics.unitsPerEm * sizeAdjust;
+      const ascentOverride = metrics.ascent / adjustedEmSquare;
+      const descentOverride = Math.abs(metrics.descent) / adjustedEmSquare;
+      const lineGapOverride = metrics.lineGap / adjustedEmSquare;
+      return cssRenderer.generateFontFace(fallbackName, {
+        ...properties,
+        src: renderFontSrc([{ name: fallbackFontName }]),
+        "size-adjust": toPercentage(sizeAdjust),
+        "ascent-override": toPercentage(ascentOverride),
+        "descent-override": toPercentage(descentOverride),
+        "line-gap-override": toPercentage(lineGapOverride)
+      });
+    }
+  };
+}
+export {
+  createCapsizeFontMetricsResolver
+};

node_modules/astro/dist/assets/fonts/implementations/font-type-extractor.d.ts

@@ -0,0 +1,4 @@
+import type { ErrorHandler, FontTypeExtractor } from '../definitions.js';
+export declare function createFontTypeExtractor({ errorHandler, }: {
+    errorHandler: ErrorHandler;
+}): FontTypeExtractor;

node_modules/astro/dist/assets/fonts/implementations/font-type-extractor.js

@@ -0,0 +1,22 @@
+import { extname } from "node:path";
+import { isFontType } from "../utils.js";
+function createFontTypeExtractor({
+  errorHandler
+}) {
+  return {
+    extract(url) {
+      const extension = extname(url).slice(1);
+      if (!isFontType(extension)) {
+        throw errorHandler.handle({
+          type: "cannot-extract-font-type",
+          data: { url },
+          cause: `Unexpected extension, got "${extension}"`
+        });
+      }
+      return extension;
+    }
+  };
+}
+export {
+  createFontTypeExtractor
+};

node_modules/astro/dist/assets/fonts/implementations/hasher.d.ts

@@ -0,0 +1,2 @@
+import type { Hasher } from '../definitions.js';
+export declare function createXxHasher(): Promise<Hasher>;

node_modules/astro/dist/assets/fonts/implementations/hasher.js

@@ -0,0 +1,14 @@
+import xxhash from "xxhash-wasm";
+import { sortObjectByKey } from "../utils.js";
+async function createXxHasher() {
+  const { h64ToString: hashString } = await xxhash();
+  return {
+    hashString,
+    hashObject(input) {
+      return hashString(JSON.stringify(sortObjectByKey(input)));
+    }
+  };
+}
+export {
+  createXxHasher
+};

node_modules/astro/dist/assets/fonts/implementations/local-provider-url-resolver.d.ts

@@ -0,0 +1,5 @@
+import type { LocalProviderUrlResolver } from '../definitions.js';
+export declare function createRequireLocalProviderUrlResolver({ root, intercept, }: {
+    root: URL;
+    intercept?: (path: string) => void;
+}): LocalProviderUrlResolver;

node_modules/astro/dist/assets/fonts/implementations/local-provider-url-resolver.js

@@ -0,0 +1,17 @@
+import { fileURLToPath } from "node:url";
+import { resolveEntrypoint } from "../utils.js";
+function createRequireLocalProviderUrlResolver({
+  root,
+  intercept
+}) {
+  return {
+    resolve(input) {
+      const path = fileURLToPath(resolveEntrypoint(root, input));
+      intercept?.(path);
+      return path;
+    }
+  };
+}
+export {
+  createRequireLocalProviderUrlResolver
+};

node_modules/astro/dist/assets/fonts/implementations/remote-font-provider-mod-resolver.d.ts

@@ -0,0 +1,6 @@
+import type { ViteDevServer } from 'vite';
+import type { RemoteFontProviderModResolver } from '../definitions.js';
+export declare function createBuildRemoteFontProviderModResolver(): RemoteFontProviderModResolver;
+export declare function createDevServerRemoteFontProviderModResolver({ server, }: {
+    server: ViteDevServer;
+}): RemoteFontProviderModResolver;

node_modules/astro/dist/assets/fonts/implementations/remote-font-provider-mod-resolver.js

@@ -0,0 +1,20 @@
+function createBuildRemoteFontProviderModResolver() {
+  return {
+    resolve(id) {
+      return import(id);
+    }
+  };
+}
+function createDevServerRemoteFontProviderModResolver({
+  server
+}) {
+  return {
+    resolve(id) {
+      return server.ssrLoadModule(id);
+    }
+  };
+}
+export {
+  createBuildRemoteFontProviderModResolver,
+  createDevServerRemoteFontProviderModResolver
+};

node_modules/astro/dist/assets/fonts/implementations/remote-font-provider-resolver.d.ts

@@ -0,0 +1,6 @@
+import type { ErrorHandler, RemoteFontProviderModResolver, RemoteFontProviderResolver } from '../definitions.js';
+export declare function createRemoteFontProviderResolver({ root, modResolver, errorHandler, }: {
+    root: URL;
+    modResolver: RemoteFontProviderModResolver;
+    errorHandler: ErrorHandler;
+}): RemoteFontProviderResolver;

node_modules/astro/dist/assets/fonts/implementations/remote-font-provider-resolver.js

@@ -0,0 +1,47 @@
+import { resolveEntrypoint } from "../utils.js";
+function validateMod({
+  mod,
+  entrypoint,
+  errorHandler
+}) {
+  try {
+    if (typeof mod !== "object" || mod === null) {
+      throw new Error(`Expected an object for the module, but received ${typeof mod}.`);
+    }
+    if (typeof mod.provider !== "function") {
+      throw new Error(`Invalid provider export in module, expected a function.`);
+    }
+    return {
+      provider: mod.provider
+    };
+  } catch (cause) {
+    throw errorHandler.handle({
+      type: "cannot-load-font-provider",
+      data: {
+        entrypoint
+      },
+      cause
+    });
+  }
+}
+function createRemoteFontProviderResolver({
+  root,
+  modResolver,
+  errorHandler
+}) {
+  return {
+    async resolve({ entrypoint, config }) {
+      const id = resolveEntrypoint(root, entrypoint.toString()).href;
+      const mod = await modResolver.resolve(id);
+      const { provider } = validateMod({
+        mod,
+        entrypoint: id,
+        errorHandler
+      });
+      return { config, provider };
+    }
+  };
+}
+export {
+  createRemoteFontProviderResolver
+};

node_modules/astro/dist/assets/fonts/implementations/storage.d.ts

@@ -0,0 +1,4 @@
+import { type Storage } from 'unstorage';
+export declare function createFsStorage({ base }: {
+    base: URL;
+}): Storage;

node_modules/astro/dist/assets/fonts/implementations/storage.js

@@ -0,0 +1,14 @@
+import { fileURLToPath } from "node:url";
+import { createStorage } from "unstorage";
+import fsLiteDriver from "unstorage/drivers/fs-lite";
+function createFsStorage({ base }) {
+  return createStorage({
+    // Types are weirly exported
+    driver: fsLiteDriver({
+      base: fileURLToPath(base)
+    })
+  });
+}
+export {
+  createFsStorage
+};

node_modules/astro/dist/assets/fonts/implementations/system-fallbacks-provider.d.ts

@@ -0,0 +1,11 @@
+import type { SystemFallbacksProvider } from '../definitions.js';
+export declare const DEFAULT_FALLBACKS: {
+    serif: "Times New Roman"[];
+    'sans-serif': "Arial"[];
+    monospace: "Courier New"[];
+    'system-ui': ("Arial" | "BlinkMacSystemFont" | "Segoe UI" | "Roboto" | "Helvetica Neue")[];
+    'ui-serif': "Times New Roman"[];
+    'ui-sans-serif': "Arial"[];
+    'ui-monospace': "Courier New"[];
+};
+export declare function createSystemFallbacksProvider(): SystemFallbacksProvider;

node_modules/astro/dist/assets/fonts/implementations/system-fallbacks-provider.js

@@ -0,0 +1,74 @@
+const SYSTEM_METRICS = {
+  "Times New Roman": {
+    ascent: 1825,
+    descent: -443,
+    lineGap: 87,
+    unitsPerEm: 2048,
+    xWidthAvg: 832
+  },
+  Arial: {
+    ascent: 1854,
+    descent: -434,
+    lineGap: 67,
+    unitsPerEm: 2048,
+    xWidthAvg: 913
+  },
+  "Courier New": {
+    ascent: 1705,
+    descent: -615,
+    lineGap: 0,
+    unitsPerEm: 2048,
+    xWidthAvg: 1229
+  },
+  BlinkMacSystemFont: {
+    ascent: 1980,
+    descent: -432,
+    lineGap: 0,
+    unitsPerEm: 2048,
+    xWidthAvg: 853
+  },
+  "Segoe UI": {
+    ascent: 2210,
+    descent: -514,
+    lineGap: 0,
+    unitsPerEm: 2048,
+    xWidthAvg: 908
+  },
+  Roboto: {
+    ascent: 1900,
+    descent: -500,
+    lineGap: 0,
+    unitsPerEm: 2048,
+    xWidthAvg: 911
+  },
+  "Helvetica Neue": {
+    ascent: 952,
+    descent: -213,
+    lineGap: 28,
+    unitsPerEm: 1e3,
+    xWidthAvg: 450
+  }
+};
+const DEFAULT_FALLBACKS = {
+  serif: ["Times New Roman"],
+  "sans-serif": ["Arial"],
+  monospace: ["Courier New"],
+  "system-ui": ["BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica Neue", "Arial"],
+  "ui-serif": ["Times New Roman"],
+  "ui-sans-serif": ["Arial"],
+  "ui-monospace": ["Courier New"]
+};
+function createSystemFallbacksProvider() {
+  return {
+    getLocalFonts(fallback) {
+      return DEFAULT_FALLBACKS[fallback] ?? null;
+    },
+    getMetricsForLocalFont(family) {
+      return SYSTEM_METRICS[family];
+    }
+  };
+}
+export {
+  DEFAULT_FALLBACKS,
+  createSystemFallbacksProvider
+};

node_modules/astro/dist/assets/fonts/implementations/url-proxy-content-resolver.d.ts

@@ -0,0 +1,5 @@
+import type { ErrorHandler, UrlProxyContentResolver } from '../definitions.js';
+export declare function createLocalUrlProxyContentResolver({ errorHandler, }: {
+    errorHandler: ErrorHandler;
+}): UrlProxyContentResolver;
+export declare function createRemoteUrlProxyContentResolver(): UrlProxyContentResolver;

node_modules/astro/dist/assets/fonts/implementations/url-proxy-content-resolver.js

@@ -0,0 +1,28 @@
+import { readFileSync } from "node:fs";
+function createLocalUrlProxyContentResolver({
+  errorHandler
+}) {
+  return {
+    resolve(url) {
+      try {
+        return url + readFileSync(url, "utf-8");
+      } catch (cause) {
+        throw errorHandler.handle({
+          type: "unknown-fs-error",
+          data: {},
+          cause
+        });
+      }
+    }
+  };
+}
+function createRemoteUrlProxyContentResolver() {
+  return {
+    // Passthrough, the remote provider URL is enough
+    resolve: (url) => url
+  };
+}
+export {
+  createLocalUrlProxyContentResolver,
+  createRemoteUrlProxyContentResolver
+};

node_modules/astro/dist/assets/fonts/implementations/url-proxy.d.ts

@@ -0,0 +1,7 @@
+import type { DataCollector, Hasher, UrlProxy, UrlProxyContentResolver, UrlResolver } from '../definitions.js';
+export declare function createUrlProxy({ contentResolver, hasher, dataCollector, urlResolver, }: {
+    contentResolver: UrlProxyContentResolver;
+    hasher: Hasher;
+    dataCollector: DataCollector;
+    urlResolver: UrlResolver;
+}): UrlProxy;

node_modules/astro/dist/assets/fonts/implementations/url-proxy.js

@@ -0,0 +1,24 @@
+function createUrlProxy({
+  contentResolver,
+  hasher,
+  dataCollector,
+  urlResolver
+}) {
+  return {
+    proxy({ url: originalUrl, type, data, collectPreload, init }) {
+      const hash = `${hasher.hashString(contentResolver.resolve(originalUrl))}.${type}`;
+      const url = urlResolver.resolve(hash);
+      dataCollector.collect({
+        url: originalUrl,
+        hash,
+        preload: collectPreload ? { url, type } : null,
+        data,
+        init
+      });
+      return url;
+    }
+  };
+}
+export {
+  createUrlProxy
+};

node_modules/astro/dist/assets/fonts/implementations/url-resolver.d.ts

@@ -0,0 +1,9 @@
+import type { AssetsPrefix } from '../../../types/public/index.js';
+import type { UrlResolver } from '../definitions.js';
+export declare function createDevUrlResolver({ base }: {
+    base: string;
+}): UrlResolver;
+export declare function createBuildUrlResolver({ base, assetsPrefix, }: {
+    base: string;
+    assetsPrefix: AssetsPrefix;
+}): UrlResolver;

node_modules/astro/dist/assets/fonts/implementations/url-resolver.js

@@ -0,0 +1,27 @@
+import { fileExtension, joinPaths, prependForwardSlash } from "../../../core/path.js";
+import { getAssetsPrefix } from "../../utils/getAssetsPrefix.js";
+function createDevUrlResolver({ base }) {
+  return {
+    resolve(hash) {
+      return prependForwardSlash(joinPaths(base, hash));
+    }
+  };
+}
+function createBuildUrlResolver({
+  base,
+  assetsPrefix
+}) {
+  return {
+    resolve(hash) {
+      const prefix = assetsPrefix ? getAssetsPrefix(fileExtension(hash), assetsPrefix) : void 0;
+      if (prefix) {
+        return joinPaths(prefix, base, hash);
+      }
+      return prependForwardSlash(joinPaths(base, hash));
+    }
+  };
+}
+export {
+  createBuildUrlResolver,
+  createDevUrlResolver
+};

node_modules/astro/dist/assets/fonts/logic/extract-unifont-providers.d.ts

@@ -0,0 +1,10 @@
+import type * as unifont from 'unifont';
+import type { Hasher } from '../definitions.js';
+import type { ResolvedFontFamily } from '../types.js';
+export declare function extractUnifontProviders({ families, hasher, }: {
+    families: Array<ResolvedFontFamily>;
+    hasher: Hasher;
+}): {
+    families: Array<ResolvedFontFamily>;
+    providers: Array<unifont.Provider>;
+};

node_modules/astro/dist/assets/fonts/logic/extract-unifont-providers.js

@@ -0,0 +1,28 @@
+import { LOCAL_PROVIDER_NAME } from "../constants.js";
+function extractUnifontProviders({
+  families,
+  hasher
+}) {
+  const hashes = /* @__PURE__ */ new Set();
+  const providers = [];
+  for (const { provider } of families) {
+    if (provider === LOCAL_PROVIDER_NAME) {
+      continue;
+    }
+    const unifontProvider = provider.provider(provider.config);
+    const hash = hasher.hashObject({
+      name: unifontProvider._name,
+      ...provider.config
+    });
+    unifontProvider._name += `-${hash}`;
+    provider.name = unifontProvider._name;
+    if (!hashes.has(hash)) {
+      hashes.add(hash);
+      providers.push(unifontProvider);
+    }
+  }
+  return { families, providers };
+}
+export {
+  extractUnifontProviders
+};

node_modules/astro/dist/assets/fonts/logic/normalize-remote-font-faces.d.ts

@@ -0,0 +1,7 @@
+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>;

node_modules/astro/dist/assets/fonts/logic/normalize-remote-font-faces.js

@@ -0,0 +1,40 @@
+import { FONT_FORMATS } from "../constants.js";
+function normalizeRemoteFontFaces({
+  fonts,
+  urlProxy,
+  fontTypeExtractor
+}) {
+  return fonts.filter((font) => typeof font.meta?.priority === "number" ? font.meta.priority === 0 : 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
+            },
+            init: font.meta?.init ?? null
+          })
+        };
+        index++;
+        return proxied;
+      })
+    };
+  });
+}
+export {
+  normalizeRemoteFontFaces
+};

node_modules/astro/dist/assets/fonts/logic/optimize-fallbacks.d.ts

@@ -0,0 +1,17 @@
+import type * as unifont from 'unifont';
+import type { FontMetricsResolver, SystemFallbacksProvider } from '../definitions.js';
+import type { FontFileData, ResolvedFontFamily } from '../types.js';
+export interface CollectedFontForMetrics extends FontFileData {
+    data: Partial<unifont.FontFaceData>;
+}
+export declare function optimizeFallbacks({ family, fallbacks: _fallbacks, collectedFonts, enabled, systemFallbacksProvider, fontMetricsResolver, }: {
+    family: Pick<ResolvedFontFamily, 'name' | 'nameWithHash'>;
+    fallbacks: Array<string>;
+    collectedFonts: Array<CollectedFontForMetrics>;
+    enabled: boolean;
+    systemFallbacksProvider: SystemFallbacksProvider;
+    fontMetricsResolver: FontMetricsResolver;
+}): Promise<null | {
+    css: string;
+    fallbacks: Array<string>;
+}>;

node_modules/astro/dist/assets/fonts/logic/optimize-fallbacks.js

@@ -0,0 +1,47 @@
+import { isGenericFontFamily, unifontFontFaceDataToProperties } from "../utils.js";
+async function optimizeFallbacks({
+  family,
+  fallbacks: _fallbacks,
+  collectedFonts,
+  enabled,
+  systemFallbacksProvider,
+  fontMetricsResolver
+}) {
+  let fallbacks = [..._fallbacks];
+  if (fallbacks.length === 0 || !enabled || collectedFonts.length === 0) {
+    return null;
+  }
+  const lastFallback = fallbacks[fallbacks.length - 1];
+  if (!isGenericFontFamily(lastFallback)) {
+    return null;
+  }
+  const localFonts = systemFallbacksProvider.getLocalFonts(lastFallback);
+  if (!localFonts || localFonts.length === 0) {
+    return null;
+  }
+  if (localFonts.includes(family.name)) {
+    return null;
+  }
+  const localFontsMappings = localFonts.map((font) => ({
+    font,
+    // We must't wrap in quote because that's handled by the CSS renderer
+    name: `${family.nameWithHash} fallback: ${font}`
+  }));
+  fallbacks = [...localFontsMappings.map((m) => m.name), ...fallbacks];
+  let css = "";
+  for (const { font, name } of localFontsMappings) {
+    for (const collected of collectedFonts) {
+      css += fontMetricsResolver.generateFontFace({
+        metrics: await fontMetricsResolver.getMetrics(family.name, collected),
+        fallbackMetrics: systemFallbacksProvider.getMetricsForLocalFont(font),
+        font,
+        name,
+        properties: unifontFontFaceDataToProperties(collected.data)
+      });
+    }
+  }
+  return { css, fallbacks };
+}
+export {
+  optimizeFallbacks
+};

node_modules/astro/dist/assets/fonts/logic/resolve-families.d.ts

@@ -0,0 +1,17 @@
+import type { Hasher, LocalProviderUrlResolver, RemoteFontProviderResolver } from '../definitions.js';
+import type { FontFamily, ResolvedFontFamily } from '../types.js';
+/**
+ * Dedupes properties if applicable and resolves entrypoints.
+ */
+export declare function resolveFamily({ family, hasher, remoteFontProviderResolver, localProviderUrlResolver, }: {
+    family: FontFamily;
+    hasher: Hasher;
+    remoteFontProviderResolver: RemoteFontProviderResolver;
+    localProviderUrlResolver: LocalProviderUrlResolver;
+}): Promise<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'>): Promise<Array<ResolvedFontFamily>>;

node_modules/astro/dist/assets/fonts/logic/resolve-families.js

@@ -0,0 +1,67 @@
+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
+      };
+    })
+  }));
+}
+async function resolveFamily({
+  family,
+  hasher,
+  remoteFontProviderResolver,
+  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,
+    fallbacks: family.fallbacks ? dedupe(family.fallbacks) : void 0,
+    unicodeRange: family.unicodeRange ? dedupe(family.unicodeRange) : void 0,
+    // This will be Astro specific eventually
+    provider: await remoteFontProviderResolver.resolve(family.provider)
+  };
+}
+async function resolveFamilies({
+  families,
+  ...dependencies
+}) {
+  return await Promise.all(
+    families.map(
+      (family) => resolveFamily({
+        family,
+        ...dependencies
+      })
+    )
+  );
+}
+export {
+  resolveFamilies,
+  resolveFamily
+};

node_modules/astro/dist/assets/fonts/orchestrate.d.ts

@@ -0,0 +1,40 @@
+import type { Storage } from 'unstorage';
+import type { Logger } from '../../core/logger/core.js';
+import type { CssRenderer, FontFileReader, FontMetricsResolver, FontTypeExtractor, Hasher, LocalProviderUrlResolver, RemoteFontProviderResolver, SystemFallbacksProvider, UrlProxy } from './definitions.js';
+import type { ConsumableMap, CreateUrlProxyParams, Defaults, FontFamily, FontFileDataMap } from './types.js';
+/**
+ * Manages how fonts are resolved:
+ *
+ * - families are resolved
+ * - unifont providers are extracted from families
+ * - unifont 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, remoteFontProviderResolver, localProviderUrlResolver, storage, cssRenderer, systemFallbacksProvider, fontMetricsResolver, fontTypeExtractor, fontFileReader, logger, createUrlProxy, defaults, }: {
+    families: Array<FontFamily>;
+    hasher: Hasher;
+    remoteFontProviderResolver: RemoteFontProviderResolver;
+    localProviderUrlResolver: LocalProviderUrlResolver;
+    storage: Storage;
+    cssRenderer: CssRenderer;
+    systemFallbacksProvider: SystemFallbacksProvider;
+    fontMetricsResolver: FontMetricsResolver;
+    fontTypeExtractor: FontTypeExtractor;
+    fontFileReader: FontFileReader;
+    logger: Logger;
+    createUrlProxy: (params: CreateUrlProxyParams) => UrlProxy;
+    defaults: Defaults;
+}): Promise<{
+    fontFileDataMap: FontFileDataMap;
+    consumableMap: ConsumableMap;
+}>;

node_modules/astro/dist/assets/fonts/orchestrate.js

@@ -0,0 +1,135 @@
+import { bold } from "kleur/colors";
+import * as unifont from "unifont";
+import { LOCAL_PROVIDER_NAME } from "./constants.js";
+import { extractUnifontProviders } from "./logic/extract-unifont-providers.js";
+import { normalizeRemoteFontFaces } from "./logic/normalize-remote-font-faces.js";
+import { optimizeFallbacks } from "./logic/optimize-fallbacks.js";
+import { resolveFamilies } from "./logic/resolve-families.js";
+import { resolveLocalFont } from "./providers/local.js";
+import { pickFontFaceProperty, unifontFontFaceDataToProperties } from "./utils.js";
+async function orchestrate({
+  families,
+  hasher,
+  remoteFontProviderResolver,
+  localProviderUrlResolver,
+  storage,
+  cssRenderer,
+  systemFallbacksProvider,
+  fontMetricsResolver,
+  fontTypeExtractor,
+  fontFileReader,
+  logger,
+  createUrlProxy,
+  defaults
+}) {
+  let resolvedFamilies = await resolveFamilies({
+    families,
+    hasher,
+    remoteFontProviderResolver,
+    localProviderUrlResolver
+  });
+  const extractedUnifontProvidersResult = extractUnifontProviders({
+    families: resolvedFamilies,
+    hasher
+  });
+  resolvedFamilies = extractedUnifontProvidersResult.families;
+  const unifontProviders = extractedUnifontProvidersResult.providers;
+  const { resolveFont } = await unifont.createUnifont(unifontProviders, {
+    storage
+  });
+  const fontFileDataMap = /* @__PURE__ */ new Map();
+  const consumableMap = /* @__PURE__ */ new Map();
+  for (const family of resolvedFamilies) {
+    const preloadData = [];
+    let css = "";
+    const collectedFonts = [];
+    const fallbacks = family.fallbacks ?? defaults.fallbacks ?? [];
+    const urlProxy = createUrlProxy({
+      local: family.provider === LOCAL_PROVIDER_NAME,
+      hasUrl: (hash) => fontFileDataMap.has(hash),
+      saveUrl: ({ hash, url, init }) => {
+        fontFileDataMap.set(hash, { url, init });
+      },
+      savePreload: (preload) => {
+        preloadData.push(preload);
+      },
+      saveFontData: (collected) => {
+        if (fallbacks && fallbacks.length > 0 && // If the same data has already been sent for this family, we don't want to have
+        // duplicated fallbacks. Such scenario can occur with unicode ranges.
+        !collectedFonts.some((f) => JSON.stringify(f.data) === JSON.stringify(collected.data))) {
+          collectedFonts.push(collected);
+        }
+      }
+    });
+    let fonts;
+    if (family.provider === LOCAL_PROVIDER_NAME) {
+      const result = resolveLocalFont({
+        family,
+        urlProxy,
+        fontTypeExtractor,
+        fontFileReader
+      });
+      fonts = result.fonts;
+    } else {
+      const result = await resolveFont(
+        family.name,
+        // We do not merge the defaults, we only provide defaults as a fallback
+        {
+          weights: family.weights ?? defaults.weights,
+          styles: family.styles ?? defaults.styles,
+          subsets: family.subsets ?? defaults.subsets,
+          fallbacks: family.fallbacks ?? defaults.fallbacks
+        },
+        // By default, unifont goes through all providers. We use a different approach where
+        // we specify a provider per font. Name has been set while extracting unifont providers
+        // from families (inside extractUnifontProviders).
+        [family.provider.name]
+      );
+      if (result.fonts.length === 0) {
+        logger.warn(
+          "assets",
+          `No data found for font family ${bold(family.name)}. Review your configuration`
+        );
+      }
+      fonts = normalizeRemoteFontFaces({ fonts: result.fonts, urlProxy, fontTypeExtractor });
+    }
+    for (const data of fonts) {
+      css += cssRenderer.generateFontFace(
+        family.nameWithHash,
+        unifontFontFaceDataToProperties({
+          src: data.src,
+          weight: data.weight,
+          style: data.style,
+          // User settings override the generated font settings. We use a helper function
+          // because local and remote providers store this data in different places.
+          display: pickFontFaceProperty("display", { data, family }),
+          unicodeRange: pickFontFaceProperty("unicodeRange", { data, family }),
+          stretch: pickFontFaceProperty("stretch", { data, family }),
+          featureSettings: pickFontFaceProperty("featureSettings", { data, family }),
+          variationSettings: pickFontFaceProperty("variationSettings", { data, family })
+        })
+      );
+    }
+    const cssVarValues = [family.nameWithHash];
+    const optimizeFallbacksResult = await optimizeFallbacks({
+      family,
+      fallbacks,
+      collectedFonts,
+      enabled: family.optimizedFallbacks ?? defaults.optimizedFallbacks ?? false,
+      systemFallbacksProvider,
+      fontMetricsResolver
+    });
+    if (optimizeFallbacksResult) {
+      css += optimizeFallbacksResult.css;
+      cssVarValues.push(...optimizeFallbacksResult.fallbacks);
+    } else {
+      cssVarValues.push(...fallbacks);
+    }
+    css += cssRenderer.generateCssVariable(family.cssVariable, cssVarValues);
+    consumableMap.set(family.cssVariable, { preloadData, css });
+  }
+  return { fontFileDataMap, consumableMap };
+}
+export {
+  orchestrate
+};

node_modules/astro/dist/assets/fonts/providers/entrypoints/adobe.d.ts

@@ -0,0 +1,2 @@
+import { providers } from 'unifont';
+export declare const provider: typeof providers.adobe;

node_modules/astro/dist/assets/fonts/providers/entrypoints/adobe.js

@@ -0,0 +1,5 @@
+import { providers } from "unifont";
+const provider = providers.adobe;
+export {
+  provider
+};

node_modules/astro/dist/assets/fonts/providers/entrypoints/bunny.d.ts

@@ -0,0 +1 @@
+export declare const provider: () => import("unifont").Provider;

node_modules/astro/dist/assets/fonts/providers/entrypoints/bunny.js

@@ -0,0 +1,5 @@
+import { providers } from "unifont";
+const provider = providers.bunny;
+export {
+  provider
+};

node_modules/astro/dist/assets/fonts/providers/entrypoints/fontshare.d.ts

@@ -0,0 +1 @@
+export declare const provider: () => import("unifont").Provider;

node_modules/astro/dist/assets/fonts/providers/entrypoints/fontshare.js

@@ -0,0 +1,5 @@
+import { providers } from "unifont";
+const provider = providers.fontshare;
+export {
+  provider
+};

node_modules/astro/dist/assets/fonts/providers/entrypoints/fontsource.d.ts

@@ -0,0 +1 @@
+export declare const provider: () => import("unifont").Provider;

node_modules/astro/dist/assets/fonts/providers/entrypoints/fontsource.js

@@ -0,0 +1,5 @@
+import { providers } from "unifont";
+const provider = providers.fontsource;
+export {
+  provider
+};

node_modules/astro/dist/assets/fonts/providers/entrypoints/google.d.ts

@@ -0,0 +1,2 @@
+import { providers } from 'unifont';
+export declare const provider: typeof providers.google;

node_modules/astro/dist/assets/fonts/providers/entrypoints/google.js

@@ -0,0 +1,5 @@
+import { providers } from "unifont";
+const provider = providers.google;
+export {
+  provider
+};

node_modules/astro/dist/assets/fonts/providers/index.d.ts

@@ -0,0 +1,48 @@
+import type { providers } from 'unifont';
+import type { AstroFontProvider } from '../types.js';
+/** [Adobe](https://fonts.adobe.com/) */
+declare function adobe(config: Parameters<typeof providers.adobe>[0]): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+/** [Bunny](https://fonts.bunny.net/) */
+declare function bunny(): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+/** [Fontshare](https://www.fontshare.com/) */
+declare function fontshare(): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+/** [Fontsource](https://fontsource.org/) */
+declare function fontsource(): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+/** [Google](https://fonts.google.com/) */
+declare function google(config?: Parameters<typeof providers.google>[0]): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+/**
+ * Astro re-exports most [unifont](https://github.com/unjs/unifont/) 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/)
+ */
+export declare const fontProviders: {
+    adobe: typeof adobe;
+    bunny: typeof bunny;
+    fontshare: typeof fontshare;
+    fontsource: typeof fontsource;
+    google: typeof google;
+};
+/** A type helper for defining Astro font providers config objects */
+export declare function defineAstroFontProvider(provider: AstroFontProvider): {
+    entrypoint: string | URL;
+    config?: Record<string, any> | undefined;
+};
+export {};

node_modules/astro/dist/assets/fonts/providers/index.js

@@ -0,0 +1,41 @@
+function adobe(config) {
+  return defineAstroFontProvider({
+    entrypoint: "astro/assets/fonts/providers/adobe",
+    config
+  });
+}
+function bunny() {
+  return defineAstroFontProvider({
+    entrypoint: "astro/assets/fonts/providers/bunny"
+  });
+}
+function fontshare() {
+  return defineAstroFontProvider({
+    entrypoint: "astro/assets/fonts/providers/fontshare"
+  });
+}
+function fontsource() {
+  return defineAstroFontProvider({
+    entrypoint: "astro/assets/fonts/providers/fontsource"
+  });
+}
+function google(config) {
+  return defineAstroFontProvider({
+    entrypoint: "astro/assets/fonts/providers/google",
+    config
+  });
+}
+const fontProviders = {
+  adobe,
+  bunny,
+  fontshare,
+  fontsource,
+  google
+};
+function defineAstroFontProvider(provider) {
+  return provider;
+}
+export {
+  defineAstroFontProvider,
+  fontProviders
+};

node_modules/astro/dist/assets/fonts/providers/local.d.ts

@@ -0,0 +1,13 @@
+import type * as unifont from 'unifont';
+import type { FontFileReader, FontTypeExtractor, UrlProxy } from '../definitions.js';
+import type { ResolvedLocalFontFamily } from '../types.js';
+interface Options {
+    family: ResolvedLocalFontFamily;
+    urlProxy: UrlProxy;
+    fontTypeExtractor: FontTypeExtractor;
+    fontFileReader: FontFileReader;
+}
+export declare function resolveLocalFont({ family, urlProxy, fontTypeExtractor, fontFileReader, }: Options): {
+    fonts: Array<unifont.FontFaceData>;
+};
+export {};

node_modules/astro/dist/assets/fonts/providers/local.js

@@ -0,0 +1,53 @@
+import { FONT_FORMATS } from "../constants.js";
+function resolveLocalFont({
+  family,
+  urlProxy,
+  fontTypeExtractor,
+  fontFileReader
+}) {
+  return {
+    fonts: family.variants.map((variant) => {
+      const shouldInfer = variant.weight === void 0 || variant.style === void 0;
+      const data = {
+        // If it should be inferred, we don't want to set the value
+        weight: variant.weight,
+        style: variant.style,
+        src: [],
+        unicodeRange: variant.unicodeRange,
+        display: variant.display,
+        stretch: variant.stretch,
+        featureSettings: variant.featureSettings,
+        variationSettings: variant.variationSettings
+      };
+      data.src = variant.src.map((source, index) => {
+        if (shouldInfer && index === 0) {
+          const result = fontFileReader.extract({ family: family.name, url: source.url });
+          if (variant.weight === void 0) data.weight = result.weight;
+          if (variant.style === void 0) data.style = result.style;
+        }
+        const type = fontTypeExtractor.extract(source.url);
+        return {
+          originalURL: source.url,
+          url: urlProxy.proxy({
+            url: source.url,
+            type,
+            // We only use the first source for preloading. For example if woff2 and woff
+            // are available, we only keep woff2.
+            collectPreload: index === 0,
+            data: {
+              weight: data.weight,
+              style: data.style
+            },
+            init: null
+          }),
+          format: FONT_FORMATS.find((e) => e.type === type)?.format,
+          tech: source.tech
+        };
+      });
+      return data;
+    })
+  };
+}
+export {
+  resolveLocalFont
+};

node_modules/astro/dist/assets/fonts/sync.d.ts

@@ -0,0 +1,2 @@
+import type { AstroSettings } from '../../types/astro.js';
+export declare function syncFonts(settings: AstroSettings): void;