astro 6.4.1 → 6.4.3

package/dist/assets/fonts/core/optimize-fallbacks.js

@@ -1,4 +1,17 @@
 import { isGenericFontFamily, unifontFontFaceDataToProperties } from "../utils.js";
+function deriveFallbackVariant(data) {
+  const weight = data.weight;
+  if (typeof weight === "number" && weight >= 700) {
+    return "bold";
+  }
+  if (typeof weight === "string") {
+    if (weight === "bold") return "bold";
+    if (weight.includes(" ")) return "normal";
+    const n = Number.parseInt(weight, 10);
+    if (!Number.isNaN(n) && n >= 700) return "bold";
+  }
+  return "normal";
+}
 async function optimizeFallbacks({
   family,
   fallbacks: _fallbacks,
@@ -14,28 +27,40 @@ async function optimizeFallbacks({
   if (!isGenericFontFamily(lastFallback)) {
     return null;
   }
-  const localFonts = systemFallbacksProvider.getLocalFonts(lastFallback);
-  if (!localFonts || localFonts.length === 0) {
+  const collectedWithLocalFonts = collectedFonts.map((collected) => ({
+    collected,
+    localFonts: systemFallbacksProvider.getLocalFonts(lastFallback, deriveFallbackVariant(collected.data)) ?? []
+  }));
+  const uniqueLocalFonts = [];
+  for (const { localFonts } of collectedWithLocalFonts) {
+    for (const font of localFonts) {
+      if (!uniqueLocalFonts.includes(font)) {
+        uniqueLocalFonts.push(font);
+      }
+    }
+  }
+  if (uniqueLocalFonts.length === 0) {
     return null;
   }
-  if (localFonts.includes(family.name)) {
+  if (uniqueLocalFonts.includes(family.name)) {
     return null;
   }
-  const localFontsMappings = localFonts.map((font) => ({
-    font,
+  const nameForFont = (font) => (
     // We mustn't wrap in quote because that's handled by the CSS renderer
-    name: `${family.uniqueName} fallback: ${font}`
-  }));
-  fallbacks = [...localFontsMappings.map((m) => m.name), ...fallbacks];
+    `${family.uniqueName} fallback: ${font}`
+  );
+  fallbacks = [...uniqueLocalFonts.map(nameForFont), ...fallbacks];
   let css = "";
-  for (const { font, name } of localFontsMappings) {
-    for (const collected of collectedFonts) {
+  for (const { collected, localFonts } of collectedWithLocalFonts) {
+    const properties = unifontFontFaceDataToProperties(collected.data);
+    const metrics = await fontMetricsResolver.getMetrics(family.name, collected);
+    for (const font of localFonts) {
       css += fontMetricsResolver.generateFontFace({
-        metrics: await fontMetricsResolver.getMetrics(family.name, collected),
+        metrics,
         fallbackMetrics: systemFallbacksProvider.getMetricsForLocalFont(font),
         font,
-        name,
-        properties: unifontFontFaceDataToProperties(collected.data)
+        name: nameForFont(font),
+        properties
       });
     }
   }

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

@@ -1,6 +1,6 @@
 import type * as unifont from 'unifont';
 import type { CollectedFontForMetrics } from './core/optimize-fallbacks.js';
-import type { CssProperties, FontFaceMetrics, FontFileData, FontProvider, FontType, GenericFallbackName, ResolveFontOptions, Style } from './types.js';
+import type { CssProperties, FallbackVariant, FontFaceMetrics, FontFileData, FontProvider, FontType, GenericFallbackName, ResolveFontOptions, Style } from './types.js';
 export interface Hasher {
     hashString: (input: string) => string;
     hashObject: (input: Record<string, any>) => string;
@@ -28,7 +28,7 @@ export interface FontMetricsResolver {
     }) => string;
 }
 export interface SystemFallbacksProvider {
-    getLocalFonts: (fallback: GenericFallbackName) => Array<string> | null;
+    getLocalFonts: (fallback: GenericFallbackName, variant: FallbackVariant) => Array<string> | null;
     getMetricsForLocalFont: (family: string) => FontFaceMetrics;
 }
 export interface FontFetcher {

package/dist/assets/fonts/infra/system-fallbacks-provider.d.ts

@@ -1,6 +1,6 @@
 import type { SystemFallbacksProvider } from '../definitions.js';
-import type { FontFaceMetrics, GenericFallbackName } from '../types.js';
+import type { FallbackVariant, FontFaceMetrics, GenericFallbackName } from '../types.js';
 export declare class RealSystemFallbacksProvider implements SystemFallbacksProvider {
-    getLocalFonts(fallback: GenericFallbackName): Array<string> | null;
+    getLocalFonts(fallback: GenericFallbackName, variant: FallbackVariant): Array<string> | null;
     getMetricsForLocalFont(family: string): FontFaceMetrics;
 }

package/dist/assets/fonts/infra/system-fallbacks-provider.js

@@ -6,6 +6,14 @@ const SYSTEM_METRICS = {
     unitsPerEm: 2048,
     xWidthAvg: 832
   },
+  "Times New Roman Bold": {
+    ascent: 1825,
+    descent: -443,
+    lineGap: 87,
+    unitsPerEm: 2048,
+    xWidthAvg: 886
+  },
+  // Times New Roman Italic almost has the same properties as Times New Roman, we don't include it
   Arial: {
     ascent: 1854,
     descent: -434,
@@ -13,6 +21,14 @@ const SYSTEM_METRICS = {
     unitsPerEm: 2048,
     xWidthAvg: 913
   },
+  "Arial Bold": {
+    ascent: 1854,
+    descent: -434,
+    lineGap: 67,
+    unitsPerEm: 2048,
+    xWidthAvg: 983
+  },
+  // Arial Italic has the same properties as Arial, we don't include it
   "Courier New": {
     ascent: 1705,
     descent: -615,
@@ -20,6 +36,8 @@ const SYSTEM_METRICS = {
     unitsPerEm: 2048,
     xWidthAvg: 1229
   },
+  // Courier New Bold has the same properties as Courier New, we don't include it
+  // Courier New Italic has the same properties as Courier New, we don't include it
   BlinkMacSystemFont: {
     ascent: 1980,
     descent: -432,
@@ -50,17 +68,36 @@ const SYSTEM_METRICS = {
   }
 };
 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"]
+  serif: {
+    normal: ["Times New Roman"],
+    bold: ["Times New Roman Bold"]
+  },
+  "sans-serif": {
+    normal: ["Arial"],
+    bold: ["Arial Bold"]
+  },
+  monospace: { normal: ["Courier New"] },
+  "system-ui": {
+    normal: ["BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica Neue", "Arial"],
+    bold: ["BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica Neue", "Arial Bold"]
+  },
+  "ui-serif": {
+    normal: ["Times New Roman"],
+    bold: ["Times New Roman Bold"]
+  },
+  "ui-sans-serif": {
+    normal: ["Arial"],
+    bold: ["Arial Bold"]
+  },
+  "ui-monospace": { normal: ["Courier New"] }
 };
 class RealSystemFallbacksProvider {
-  getLocalFonts(fallback) {
-    return DEFAULT_FALLBACKS[fallback] ?? null;
+  getLocalFonts(fallback, variant) {
+    const entry = DEFAULT_FALLBACKS[fallback];
+    if (!entry) {
+      return null;
+    }
+    return entry[variant] ?? entry.normal ?? null;
   }
   getMetricsForLocalFont(family) {
     return SYSTEM_METRICS[family];

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

@@ -191,6 +191,7 @@ export interface PreloadData {
 }
 export type FontFaceMetrics = Pick<Font, 'ascent' | 'descent' | 'lineGap' | 'unitsPerEm' | 'xWidthAvg'>;
 export type GenericFallbackName = (typeof GENERIC_FALLBACK_NAMES)[number];
+export type FallbackVariant = 'normal' | 'bold';
 export type Defaults = Required<Pick<ResolvedFontFamily, 'weights' | 'styles' | 'subsets' | 'fallbacks' | 'optimizedFallbacks' | 'formats'>>;
 export interface FontFileData {
     id: string;

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.4.1";
+  version = "6.4.3";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

@@ -197,7 +197,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.4.1") {
+    if (previousAstroVersion && previousAstroVersion !== "6.4.3") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -205,8 +205,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.4.1") {
-      this.#store.metaStore().set("astro-version", "6.4.1");
+    if ("6.4.3") {
+      this.#store.metaStore().set("astro-version", "6.4.3");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/base.js

@@ -151,6 +151,10 @@ class BaseApp {
       return routeData;
     }
     if (routeData.prerender) {
+      if (routeData.params.length > 0) {
+        const allMatches = this.pipeline.matchAllRoutes(decodeURI(pathname));
+        return allMatches.find((r) => !r.prerender);
+      }
       return void 0;
     }
     return routeData;

package/dist/core/base-pipeline.d.ts

@@ -29,6 +29,9 @@ export declare const PipelineFeatures: {
     readonly i18n: number;
     readonly cache: number;
 };
+/** All feature bits ORed together. Keep next to `PipelineFeatures` so
+ *  new flags are hard to forget. */
+export declare const ALL_PIPELINE_FEATURES: number;
 /**
  * The `Pipeline` represents the static parts of rendering that do not change between requests.
  * These are mostly known when the server first starts up and do not change.
@@ -117,6 +120,13 @@ export declare abstract class Pipeline {
      * routes or check public assets — use `BaseApp.match()` for that.
      */
     matchRoute(pathname: string): RouteData | undefined;
+    /**
+     * Returns all routes matching the given pathname, in priority order.
+     * Used when the first match cannot serve the request (e.g. a
+     * prerendered dynamic route that doesn't cover this specific path)
+     * and the caller needs to try subsequent matches.
+     */
+    matchAllRoutes(pathname: string): RouteData[];
     /**
      * Rebuilds the internal router after routes have been added or
      * removed (e.g. by the dev server on HMR).

package/dist/core/base-pipeline.js

@@ -21,6 +21,7 @@ const PipelineFeatures = {
   i18n: 1 << 4,
   cache: 1 << 5
 };
+const ALL_PIPELINE_FEATURES = PipelineFeatures.redirects | PipelineFeatures.sessions | PipelineFeatures.actions | PipelineFeatures.middleware | PipelineFeatures.i18n | PipelineFeatures.cache;
 class Pipeline {
   internalMiddleware;
   resolvedMiddleware = void 0;
@@ -123,6 +124,15 @@ class Pipeline {
     if (match.type !== "match") return void 0;
     return match.route;
   }
+  /**
+   * Returns all routes matching the given pathname, in priority order.
+   * Used when the first match cannot serve the request (e.g. a
+   * prerendered dynamic route that doesn't cover this specific path)
+   * and the caller needs to try subsequent matches.
+   */
+  matchAllRoutes(pathname) {
+    return this.#router.matchAll(pathname, { allowWithoutBase: true });
+  }
   /**
    * Rebuilds the internal router after routes have been added or
    * removed (e.g. by the dev server on HMR).
@@ -286,6 +296,7 @@ class Pipeline {
   }
 }
 export {
+  ALL_PIPELINE_FEATURES,
   Pipeline,
   PipelineFeatures
 };

package/dist/core/config/validate.js

@@ -35,6 +35,7 @@ function warnDeprecatedMarkdownOptions(config) {
 }
 let didWarnAboutLegacyMarkdownPlugins = false;
 let didWarnAboutProcessorMismatch = false;
+const migratedLegacyPluginCounts = /* @__PURE__ */ new WeakMap();
 async function coerceLegacyMarkdownPlugins(config) {
   const md = config?.markdown;
   if (!md) return;
@@ -48,18 +49,24 @@ async function coerceLegacyMarkdownPlugins(config) {
   const current = md.processor;
   if (!current || isUnifiedProcessor(current)) {
     const target = current ?? (md.processor = unified());
-    target.options.remarkPlugins.push(...remarkPlugins);
-    target.options.rehypePlugins.push(...rehypePlugins);
+    const counts = migratedLegacyPluginCounts.get(target.options) ?? { remark: 0, rehype: 0 };
+    if (remarkPlugins.length > counts.remark) {
+      target.options.remarkPlugins.push(...remarkPlugins.slice(counts.remark));
+    }
+    if (rehypePlugins.length > counts.rehype) {
+      target.options.rehypePlugins.push(...rehypePlugins.slice(counts.rehype));
+    }
     Object.assign(target.options.remarkRehype, remarkRehype);
+    migratedLegacyPluginCounts.set(target.options, {
+      remark: remarkPlugins.length,
+      rehype: rehypePlugins.length
+    });
     if (!didWarnAboutLegacyMarkdownPlugins) {
       didWarnAboutLegacyMarkdownPlugins = true;
       console.warn(
         "[astro] `markdown.remarkPlugins`, `markdown.rehypePlugins`, and `markdown.remarkRehype` are deprecated. Pass them to `unified({...})` from `@astrojs/markdown-remark` directly instead."
       );
     }
-    delete md.remarkPlugins;
-    delete md.rehypePlugins;
-    delete md.remarkRehype;
   } else if (!didWarnAboutProcessorMismatch) {
     didWarnAboutProcessorMismatch = true;
     console.warn(

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "6.4.1";
+const ASTRO_VERSION = "6.4.3";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

package/dist/core/dev/dev.js

@@ -37,7 +37,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "6.4.1";
+  const currentVersion = "6.4.3";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/fetch/fetch-state.js

@@ -10,7 +10,6 @@ import { AstroCookies } from "../cookies/index.js";
 import { Slots } from "../render/index.js";
 import {
   ASTRO_GENERATOR,
-  DEFAULT_404_COMPONENT,
   fetchStateSymbol,
   originPathnameSymbol,
   pipelineSymbol,
@@ -30,7 +29,7 @@ import { Rewrites } from "../rewrites/handler.js";
 import { isRoute404or500, isRouteServerIsland } from "../routing/match.js";
 import { normalizeUrl } from "../util/normalized-url.js";
 import { getOriginPathname, setOriginPathname } from "../routing/rewrite.js";
-import { routeHasHtmlExtension } from "../routing/helpers.js";
+import { getCustom404Route, routeHasHtmlExtension } from "../routing/helpers.js";
 import { getRenderOptions } from "../app/render-options.js";
 import { getFirstForwardedValue, validateForwardedHeaders } from "../app/validate-headers.js";
 function getFetchStateFromAPIContext(context) {
@@ -422,10 +421,8 @@ class FetchState {
     }
     return {
       insertDirective(payload) {
-        if (state?.result?.directives) {
+        if (state.result) {
           state.result.directives = pushDirective(state.result.directives, payload);
-        } else {
-          state?.result?.directives.push(payload);
         }
       },
       insertScriptResource(resource) {
@@ -608,16 +605,22 @@ class FetchState {
     }
     const matched = pipeline.matchRoute(this.pathname);
     if (matched && matched.prerender && pipeline.manifest.serverLike) {
-      this.routeData = void 0;
+      if (matched.params.length > 0) {
+        const allMatches = pipeline.matchAllRoutes(this.pathname);
+        this.routeData = allMatches.find((r) => !r.prerender);
+      } else {
+        this.routeData = void 0;
+      }
     } else {
       this.routeData = matched;
     }
     pipeline.logger.debug("router", "Astro matched the following route for " + this.request.url);
     pipeline.logger.debug("router", "RouteData:\n" + this.routeData);
     if (!this.routeData) {
-      this.routeData = pipeline.manifestData.routes.find(
-        (route) => route.component === "404.astro" || route.component === DEFAULT_404_COMPONENT
-      );
+      const custom404 = getCustom404Route(pipeline.manifestData);
+      if (custom404 && !custom404.prerender) {
+        this.routeData = custom404;
+      }
     }
     if (!this.routeData) {
       pipeline.logger.debug("router", "Astro hasn't found routes that match " + this.request.url);

package/dist/core/i18n/handler.js

@@ -37,6 +37,9 @@ class I18n {
     state.pipeline.usedFeatures |= PipelineFeatures.i18n;
     const i18n = this.#i18n;
     const typeHeader = response.headers.get(ROUTE_TYPE_HEADER);
+    if (typeHeader) {
+      response.headers.delete(ROUTE_TYPE_HEADER);
+    }
     const isReroute = response.headers.get(REROUTE_DIRECTIVE_HEADER);
     if (isReroute === "no" && typeof i18n.fallback === "undefined") {
       return response;

package/dist/core/messages/runtime.js

@@ -276,7 +276,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"6.4.1"}`
+        `v${"6.4.3"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/astro-middleware.js

@@ -1,5 +1,4 @@
 import { PipelineFeatures } from "../base-pipeline.js";
-import { ROUTE_TYPE_HEADER } from "../constants.js";
 import { attachCookiesToResponse } from "../cookies/index.js";
 import { applyRewriteToState } from "../rewrites/handler.js";
 import { callMiddleware } from "./callMiddleware.js";
@@ -43,9 +42,6 @@ class AstroMiddleware {
     return response;
   }
   #finalize(state, response) {
-    if (response.headers.get(ROUTE_TYPE_HEADER)) {
-      response.headers.delete(ROUTE_TYPE_HEADER);
-    }
     attachCookiesToResponse(response, state.cookies);
     return response;
   }

package/dist/core/routing/handler.js

@@ -12,7 +12,7 @@ import { PagesHandler } from "../pages/handler.js";
 import { renderRedirect } from "../redirects/render.js";
 import { provideSession } from "../session/handler.js";
 import { prepareResponse } from "../app/prepare-response.js";
-import { PipelineFeatures } from "../base-pipeline.js";
+import { ALL_PIPELINE_FEATURES, PipelineFeatures } from "../base-pipeline.js";
 class AstroHandler {
   #app;
   #trailingSlashHandler;
@@ -64,6 +64,7 @@ class AstroHandler {
     return this.#pagesHandler.handle(state, ctx);
   }
   async handle(state) {
+    state.pipeline.usedFeatures |= ALL_PIPELINE_FEATURES;
     const trailingSlashRedirect = this.#trailingSlashHandler.handle(state);
     if (trailingSlashRedirect) {
       return trailingSlashRedirect;

package/dist/core/routing/router.d.ts

@@ -46,5 +46,13 @@ export declare class Router {
     match(inputPathname: string, { allowWithoutBase }?: {
         allowWithoutBase?: boolean;
     }): RouterMatch;
+    /**
+     * Returns all routes that match the given pathname, in priority order.
+     * Used when the first match (e.g. a prerendered route) cannot serve
+     * the request and subsequent matches need to be tried.
+     */
+    matchAll(inputPathname: string, { allowWithoutBase }?: {
+        allowWithoutBase?: boolean;
+    }): RouteData[];
 }
 export {};

package/dist/core/routing/router.js

@@ -57,6 +57,34 @@ class Router {
     const params = getParams(route, pathname);
     return { type: "match", route, params, pathname };
   }
+  /**
+   * Returns all routes that match the given pathname, in priority order.
+   * Used when the first match (e.g. a prerendered route) cannot serve
+   * the request and subsequent matches need to be tried.
+   */
+  matchAll(inputPathname, { allowWithoutBase = false } = {}) {
+    const normalized = getRedirectForPathname(inputPathname);
+    if (normalized.redirect) {
+      return [];
+    }
+    const baseResult = stripBase(
+      normalized.pathname,
+      this.#base,
+      this.#baseWithoutTrailingSlash,
+      this.#trailingSlash
+    );
+    if (!baseResult && !allowWithoutBase) {
+      return [];
+    }
+    let pathname = baseResult ?? normalized.pathname;
+    if (this.#buildFormat === "file") {
+      pathname = normalizeFileFormatPathname(pathname);
+    }
+    return this.#routes.filter((candidate) => {
+      if (candidate.pattern.test(pathname)) return true;
+      return candidate.fallbackRoutes.some((fallbackRoute) => fallbackRoute.pattern.test(pathname));
+    });
+  }
 }
 function normalizeBase(base) {
   if (!base) return "/";

package/dist/runtime/client/dev-toolbar/apps/audit/rules/a11y.js

@@ -25,6 +25,14 @@
 import { aria, roles } from "aria-query";
 import { AXObjectRoles, elementAXObjects } from "axobject-query";
 const WHITESPACE_REGEX = /\s+/;
+function isHiddenByClosedDetails(element) {
+  for (let parent = element.parentElement; parent; parent = parent.parentElement) {
+    if (parent.localName !== "details" || parent.open) continue;
+    const summary = Array.from(parent.children).find((child) => child.localName === "summary");
+    if (!summary?.contains(element)) return true;
+  }
+  return false;
+}
 const a11y_required_attributes = {
   a: ["href"],
   area: ["alt", "aria-label", "aria-labelledby"],
@@ -321,6 +329,7 @@ const a11y = [
     message: "Headings and anchors must have an accessible name, which can come from: inner text, aria-label, aria-labelledby, an img with alt property, or an svg with a tag <title></title>.",
     selector: a11y_required_content.join(","),
     match(element) {
+      if (isHiddenByClosedDetails(element)) return false;
       const innerText = element.innerText?.trim();
       if (innerText && innerText !== "") return false;
       const ariaLabel = element.getAttribute("aria-label")?.trim();

package/dist/virtual-modules/i18n.d.ts

@@ -207,9 +207,9 @@ export type I18nMiddlewareOptions = {
 /**
  * @param {AstroConfig['i18n']['routing']} customOptions
  *
- * A function that allows to programmatically create the Astro i18n middleware.
+ * A function that allows you to programmatically create the Astro i18n middleware.
  *
- * This is use useful when you still want to use the default i18n logic, but add only few exceptions to your website.
+ * This is useful when you still want to use the default i18n logic, but add only a few exceptions to your website.
  *
  * ## Examples
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.4.1",
+  "version": "6.4.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -124,7 +124,7 @@
     "clsx": "^2.1.1",
     "common-ancestor-path": "^2.0.0",
     "cookie": "^1.1.1",
-    "devalue": "^5.6.3",
+    "devalue": "^5.8.1",
     "diff": "^8.0.3",
     "dset": "^3.1.4",
     "es-module-lexer": "^2.0.0",