astro 5.7.12 → 5.7.13

package/components/Font.astro

@@ -1,10 +1,12 @@
 ---
+import * as mod from 'virtual:astro:assets/fonts/internal';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 
-// TODO: remove dynamic import when fonts are stabilized
-const { fontsData } = await import('virtual:astro:assets/fonts/internal').catch(() => {
+// TODO: remove check when fonts are stabilized
+const { fontsData } = mod;
+if (!fontsData) {
 	throw new AstroError(AstroErrorData.ExperimentalFontsNotEnabled);
-});
+}
 
 interface Props {
 	/** The `cssVariable` registered in your Astro configuration. */
@@ -13,7 +15,7 @@ interface Props {
 	preload?: boolean;
 }
 
-const { cssVariable, preload = false } = Astro.props;
+const { cssVariable, preload = false } = Astro.props as Props;
 const data = fontsData.get(cssVariable);
 if (!data) {
 	throw new AstroError({

package/components/Picture.astro

@@ -54,6 +54,7 @@ if (useResponsive) {
 
 for (const key in props) {
 	if (key.startsWith('data-astro-cid')) {
+		// @ts-expect-error This is for island props so they're not properly typed
 		pictureAttributes[key] = props[key];
 	}
 }

package/components/env.d.ts

@@ -0,0 +1,2 @@
+/// <reference path="../client.d.ts" />
+/// <reference path="../dev-only.d.ts" />

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

@@ -3,7 +3,7 @@ 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 URL_PREFIX = "/_astro/fonts/";
+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<{

package/dist/assets/fonts/constants.js

@@ -9,7 +9,7 @@ const DEFAULTS = {
 };
 const VIRTUAL_MODULE_ID = "virtual:astro:assets/fonts/internal";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
-const URL_PREFIX = "/_astro/fonts/";
+const ASSETS_DIR = "fonts";
 const CACHE_DIR = "./fonts/";
 const FONT_TYPES = ["woff2", "woff", "otf", "ttf", "eot"];
 const FONT_FORMATS = [
@@ -36,6 +36,7 @@ const GENERIC_FALLBACK_NAMES = [
 ];
 const FONTS_TYPES_FILE = "fonts.d.ts";
 export {
+  ASSETS_DIR,
   CACHE_DIR,
   DEFAULTS,
   FONTS_TYPES_FILE,
@@ -44,6 +45,5 @@ export {
   GENERIC_FALLBACK_NAMES,
   LOCAL_PROVIDER_NAME,
   RESOLVED_VIRTUAL_MODULE_ID,
-  URL_PREFIX,
   VIRTUAL_MODULE_ID
 };

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

@@ -40,6 +40,9 @@ export interface UrlProxy {
         data: Partial<unifont.FontFaceData>;
     }) => string;
 }
+export interface UrlResolver {
+    resolve: (hash: string) => string;
+}
 export interface UrlProxyContentResolver {
     resolve: (url: string) => string;
 }

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

@@ -1,7 +1,7 @@
-import type { DataCollector, Hasher, UrlProxy, UrlProxyContentResolver } from '../definitions.js';
-export declare function createUrlProxy({ base, contentResolver, hasher, dataCollector, }: {
-    base: string;
+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;

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

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

package/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;

package/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
+};

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

@@ -2,16 +2,16 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
-import { removeTrailingForwardSlash } from "@astrojs/internal-helpers/path";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import { AstroError, AstroErrorData, isAstroError } from "../../core/errors/index.js";
 import { formatErrorMessage } from "../../core/messages.js";
+import { appendForwardSlash, joinPaths, prependForwardSlash } from "../../core/path.js";
 import { getClientOutputDirectory } from "../../prerender/utils.js";
 import {
+  ASSETS_DIR,
   CACHE_DIR,
   DEFAULTS,
   RESOLVED_VIRTUAL_MODULE_ID,
-  URL_PREFIX,
   VIRTUAL_MODULE_ID
 } from "./constants.js";
 import { createMinifiableCssRenderer } from "./implementations/css-renderer.js";
@@ -35,6 +35,7 @@ import {
   createRemoteUrlProxyContentResolver
 } from "./implementations/url-proxy-content-resolver.js";
 import { createUrlProxy } from "./implementations/url-proxy.js";
+import { createBuildUrlResolver, createDevUrlResolver } from "./implementations/url-resolver.js";
 import { orchestrate } from "./orchestrate.js";
 function fontsPlugin({ settings, sync, logger }) {
   if (!settings.config.experimental.fonts) {
@@ -54,7 +55,10 @@ function fontsPlugin({ settings, sync, logger }) {
       }
     };
   }
-  const baseUrl = removeTrailingForwardSlash(settings.config.base) + URL_PREFIX;
+  const assetsDir = prependForwardSlash(
+    appendForwardSlash(joinPaths(settings.config.build.assets, ASSETS_DIR))
+  );
+  const baseUrl = joinPaths(settings.config.base, assetsDir);
   let fontFileDataMap = null;
   let consumableMap = null;
   let isBuild;
@@ -68,7 +72,8 @@ function fontsPlugin({ settings, sync, logger }) {
   async function initialize({
     cacheDir,
     modResolver,
-    cssRenderer
+    cssRenderer,
+    urlResolver
   }) {
     const { root } = settings.config;
     const hasher = await createXxHasher();
@@ -116,7 +121,7 @@ function fontsPlugin({ settings, sync, logger }) {
         const dataCollector = createDataCollector(params);
         const contentResolver = local ? createLocalUrlProxyContentResolver({ errorHandler }) : createRemoteUrlProxyContentResolver();
         return createUrlProxy({
-          base: baseUrl,
+          urlResolver,
           contentResolver,
           hasher,
           dataCollector
@@ -137,7 +142,11 @@ function fontsPlugin({ settings, sync, logger }) {
         await initialize({
           cacheDir: new URL(CACHE_DIR, settings.config.cacheDir),
           modResolver: createBuildRemoteFontProviderModResolver(),
-          cssRenderer: createMinifiableCssRenderer({ minify: true })
+          cssRenderer: createMinifiableCssRenderer({ minify: true }),
+          urlResolver: createBuildUrlResolver({
+            base: baseUrl,
+            assetsPrefix: settings.config.build.assetsPrefix
+          })
         });
       }
     },
@@ -146,7 +155,8 @@ function fontsPlugin({ settings, sync, logger }) {
         // In dev, we cache fonts data in .astro so it can be easily inspected and cleared
         cacheDir: new URL(CACHE_DIR, settings.dotAstroDir),
         modResolver: createDevServerRemoteFontProviderModResolver({ server }),
-        cssRenderer: createMinifiableCssRenderer({ minify: false })
+        cssRenderer: createMinifiableCssRenderer({ minify: false }),
+        urlResolver: createDevUrlResolver({ base: baseUrl })
       });
       const localPaths = [...fontFileDataMap.values()].filter(({ url }) => isAbsolute(url)).map((v) => v.url);
       server.watcher.on("change", (path) => {
@@ -163,7 +173,7 @@ function fontsPlugin({ settings, sync, logger }) {
           );
         }
       });
-      server.middlewares.use(URL_PREFIX, async (req, res, next) => {
+      server.middlewares.use(assetsDir, async (req, res, next) => {
         if (!req.url) {
           return next();
         }
@@ -212,7 +222,7 @@ function fontsPlugin({ settings, sync, logger }) {
       }
       try {
         const dir = getClientOutputDirectory(settings);
-        const fontsDir = new URL("." + baseUrl, dir);
+        const fontsDir = new URL(`.${assetsDir}`, dir);
         try {
           mkdirSync(fontsDir, { recursive: true });
         } catch (cause) {

package/dist/assets/services/sharp.js

@@ -76,7 +76,17 @@ const sharpService = {
           quality = transform.quality in qualityTable ? qualityTable[transform.quality] : void 0;
         }
       }
-      result.toFormat(transform.format, { quality });
+      const isGifInput = inputBuffer[0] === 71 && // 'G'
+      inputBuffer[1] === 73 && // 'I'
+      inputBuffer[2] === 70 && // 'F'
+      inputBuffer[3] === 56 && // '8'
+      (inputBuffer[4] === 57 || inputBuffer[4] === 55) && // '9' or '7'
+      inputBuffer[5] === 97;
+      if (transform.format === "webp" && isGifInput) {
+        result.webp({ quality: typeof quality === "number" ? quality : void 0, loop: 0 });
+      } else {
+        result.toFormat(transform.format, { quality });
+      }
     }
     const { data, info } = await result.toBuffer({ resolveWithObject: true });
     return {

package/dist/content/content-layer.js

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

package/dist/content/loaders/file.js

@@ -1,14 +1,12 @@
 import { promises as fs, existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import yaml from "js-yaml";
+import { FileGlobNotSupported, FileParserNotFound } from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/index.js";
 import { posixRelative } from "../utils.js";
 function file(fileName, options) {
   if (fileName.includes("*")) {
-    throw new AstroError({
-      name: "Glob Pattern Error",
-      message: "Glob patterns are not supported in `file` loader. Use `glob` loader instead."
-    });
+    throw new AstroError(FileGlobNotSupported);
   }
   let parse = null;
   const ext = fileName.split(".").at(-1);
@@ -22,8 +20,8 @@ function file(fileName, options) {
   if (options?.parser) parse = options.parser;
   if (parse === null) {
     throw new AstroError({
-      name: "Parser Not Found",
-      message: `No parser found for file '${fileName}'. Try passing a parser to the \`file\` loader.`
+      ...FileParserNotFound,
+      message: FileParserNotFound.message(fileName)
     });
   }
   async function syncData(filePath, { logger, parseData, store, config }) {

package/dist/core/build/generate.js

@@ -160,7 +160,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
         const path = paths[i];
         promises.push(limit(() => generatePathWithLogs(path, route, i, paths, true)));
       }
-      await Promise.allSettled(promises);
+      await Promise.all(promises);
     } else {
       for (let i = 0; i < paths.length; i++) {
         const path = paths[i];

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.7.12";
+const ASTRO_VERSION = "5.7.13";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

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

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

@@ -1170,7 +1170,7 @@ export declare const CannotExtractFontType: {
 /**
  * @docs
  * @description
- * Cannot determine weight and style from font file.
+ * Cannot determine weight and style from font file, update your family config and set `weight` and `style` manually instead.
  * @message
  * An error occured while determining the weight and style from the local font file.
  */
@@ -1601,6 +1601,31 @@ export declare const UnsupportedConfigTransformError: {
     message: (parseError: string) => string;
     hint: string;
 };
+/**
+ * @docs
+ * @see
+ *  - [Passing a `parser` to the `file` loader](https://docs.astro.build/en/guides/content-collections/#parser-function)
+ * @description
+ * The `file` loader can’t determine which parser to use. Please provide a custom parser (e.g. `toml.parse` or `csv-parse`) to create a collection from your file type.
+ */
+export declare const FileParserNotFound: {
+    name: string;
+    title: string;
+    message: (fileName: string) => string;
+};
+/**
+ * @docs
+ * @see
+ *  - [Astro's built-in loaders](https://docs.astro.build/en/guides/content-collections/#built-in-loaders)
+ * @description
+ * The `file` loader must be passed a single local file. Glob patterns are not supported. Use the built-in `glob` loader to create entries from patterns of multiple local files.
+ */
+export declare const FileGlobNotSupported: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
 /**
  * @docs
  * @kind heading

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

@@ -640,6 +640,17 @@ const UnsupportedConfigTransformError = {
 Full error: ${parseError}`,
   hint: "See the devalue library for all supported types: https://github.com/rich-harris/devalue"
 };
+const FileParserNotFound = {
+  name: "FileParserNotFound",
+  title: "File parser not found",
+  message: (fileName) => `No parser was found for '${fileName}'. Pass a parser function (e.g. \`parser: csv\`) to the \`file\` loader.`
+};
+const FileGlobNotSupported = {
+  name: "FileGlobNotSupported",
+  title: "Glob patterns are not supported in the file loader",
+  message: "Glob patterns are not supported in the `file` loader. Use the `glob` loader instead.",
+  hint: `See Astro's built-in file and glob loaders https://docs.astro.build/en/guides/content-collections/#built-in-loaders for supported usage.`
+};
 const ActionsWithoutServerOutputError = {
   name: "ActionsWithoutServerOutputError",
   title: "Actions must be used with server output.",
@@ -736,6 +747,8 @@ export {
   FailedToFetchRemoteImageDimensions,
   FailedToFindPageMapSSR,
   FailedToLoadModuleSSR,
+  FileGlobNotSupported,
+  FileParserNotFound,
   FontFamilyNotFound,
   ForbiddenRewrite,
   GenerateContentTypesError,

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.7.12";
+  const version = "5.7.13";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.7.12"}`
+        `v${"5.7.13"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.7.12",
+  "version": "5.7.13",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -80,7 +80,7 @@
     "astro": "astro.js"
   },
   "files": [
-    "components",
+    "components/*.{astro,css,ts}",
     "tsconfigs",
     "dist",
     "types",
@@ -194,6 +194,7 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.37.0",
     "sass": "^1.86.0",
+    "typescript": "^5.8.3",
     "undici": "^7.5.0",
     "unified": "^11.0.5",
     "vitest": "^3.0.9",
@@ -213,7 +214,7 @@
   },
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
-    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc",
+    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm && tsc && astro-check --root ./components",
     "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" --copy-wasm",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.{ts,js}\"",
     "test": "pnpm run test:unit && pnpm run test:integration && pnpm run test:types",