astro 7.2.0 → 7.2.2

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

@@ -15,3 +15,11 @@ export declare const FONT_FORMATS: Array<{
 }>;
 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";
+/**
+ * Variable name used in the font-file-url-resolver virtual module to hold
+ * the ephemeral font HTTP server address. The incremental build plugin
+ * strips the variable declaration (which contains an OS-assigned port that
+ * changes every build) from the module source before hashing so that the
+ * dependency hash is deterministic across builds.
+ */
+export declare const FONTS_SERVER_ADDRESS_PLACEHOLDER = "__ASTRO_FONTS_SERVER_ADDRESS__";

package/dist/assets/fonts/constants.js

@@ -39,10 +39,12 @@ const GENERIC_FALLBACK_NAMES = [
   "fangsong"
 ];
 const FONTS_TYPES_FILE = "fonts.d.ts";
+const FONTS_SERVER_ADDRESS_PLACEHOLDER = "__ASTRO_FONTS_SERVER_ADDRESS__";
 export {
   ASSETS_DIR,
   CACHE_DIR,
   DEFAULTS,
+  FONTS_SERVER_ADDRESS_PLACEHOLDER,
   FONTS_TYPES_FILE,
   FONT_FORMATS,
   FONT_TYPES,

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

@@ -13,6 +13,7 @@ import {
   ASSETS_DIR,
   CACHE_DIR,
   DEFAULTS,
+  FONTS_SERVER_ADDRESS_PLACEHOLDER,
   RESOLVED_RUNTIME_FONT_FILE_URL_RESOLVER_VIRTUAL_MODULE_ID,
   RESOLVED_RUNTIME_VIRTUAL_MODULE_ID,
   RESOLVED_VIRTUAL_MODULE_ID,
@@ -285,9 +286,10 @@ function fontsPlugin({ settings, sync, logger }) {
           return {
             code: `
 							import { RemoteRuntimeFontFileUrlResolver } from ${JSON.stringify(new URL("./infra/remote-runtime-font-file-url-resolver.js", import.meta.url))};
+							const ${FONTS_SERVER_ADDRESS_PLACEHOLDER} = ${JSON.stringify(serverAddress)};
 							export const runtimeFontFileUrlResolver = new RemoteRuntimeFontFileUrlResolver({
 								urls: new Set(${JSON.stringify(urls)}),
-								address: ${JSON.stringify(serverAddress)},
+								address: ${FONTS_SERVER_ADDRESS_PLACEHOLDER},
 							});
 						`
           };

package/dist/assets/utils/node.js

@@ -36,6 +36,35 @@ async function handleSvgDeduplication(fileData, filename, fileEmitter) {
     return handle;
   }
 }
+const TRANSIENT_ERROR_CODES = /* @__PURE__ */ new Set(["EMFILE", "ENFILE", "EAGAIN", "EBUSY"]);
+const MAX_CONCURRENT_READS = 200;
+let activeReads = 0;
+const readQueue = [];
+async function readFileWithRetry(url, maxRetries = 5) {
+  if (activeReads >= MAX_CONCURRENT_READS) {
+    await new Promise((resolve) => readQueue.push(resolve));
+  }
+  activeReads++;
+  try {
+    for (let attempt = 0; ; attempt++) {
+      try {
+        return await fs.readFile(url);
+      } catch (err) {
+        const code = err instanceof Error && "code" in err ? err.code : void 0;
+        if (code && TRANSIENT_ERROR_CODES.has(code) && attempt < maxRetries) {
+          await new Promise((resolve) => setTimeout(resolve, 50 * 2 ** attempt));
+          continue;
+        }
+        throw err;
+      }
+    }
+  } finally {
+    activeReads--;
+    if (readQueue.length > 0) {
+      readQueue.shift()();
+    }
+  }
+}
 async function emitImageMetadata(id, fileEmitter) {
   if (!id) {
     return void 0;
@@ -43,9 +72,12 @@ async function emitImageMetadata(id, fileEmitter) {
   const url = pathToFileURL(id);
   let fileData;
   try {
-    fileData = await fs.readFile(url);
-  } catch {
-    return void 0;
+    fileData = await readFileWithRetry(url);
+  } catch (err) {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+      return void 0;
+    }
+    throw err;
   }
   const fileMetadata = await imageMetadata(fileData, id);
   const emittedImage = {

package/dist/assets/utils/resolveImports.d.ts

@@ -6,4 +6,3 @@
  * @returns A module id of the image that can be resolved by Vite, or undefined if it is not a local image
  */
 export declare function imageSrcToImportId(imageSrc: string, filePath?: string): string | undefined;
-export declare const importIdToSymbolName: (importId: string) => string;

package/dist/assets/utils/resolveImports.js

@@ -1,6 +1,5 @@
 import { isRemotePath, removeBase } from "@astrojs/internal-helpers/path";
 import { CONTENT_IMAGE_FLAG, IMAGE_IMPORT_PREFIX } from "../../content/consts.js";
-import { shorthash } from "../../runtime/server/shorthash.js";
 import { VALID_INPUT_FORMATS } from "../consts.js";
 function imageSrcToImportId(imageSrc, filePath) {
   imageSrc = removeBase(imageSrc, IMAGE_IMPORT_PREFIX);
@@ -17,8 +16,6 @@ function imageSrcToImportId(imageSrc, filePath) {
   }
   return `${imageSrc}?${params.toString()}`;
 }
-const importIdToSymbolName = (importId) => `__ASTRO_IMAGE_IMPORT_${shorthash(importId)}`;
 export {
-  imageSrcToImportId,
-  importIdToSymbolName
+  imageSrcToImportId
 };

package/dist/cli/dev/index.js

@@ -128,7 +128,7 @@ Run \`astro dev --help\` to see available commands.`
   }
   const root = pathToFileURL(resolveRoot(flags.root) + "/");
   if (ignoreLock) {
-    const existingServer2 = checkExistingServer(root);
+    const existingServer2 = await checkExistingServer(root);
     if (existingServer2) {
       logger.info(
         "SKIP_FORMAT",
@@ -141,7 +141,7 @@ Run \`astro dev --help\` to see available commands.`
     const inlineConfig2 = flagsToAstroInlineConfig(flags);
     return await devServer(inlineConfig2);
   }
-  const existingServer = checkExistingServer(root);
+  const existingServer = await checkExistingServer(root);
   if (existingServer) {
     if (flags.force) {
       await killDevServer(root, existingServer);

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

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

package/dist/cli/preview/index.js

@@ -69,7 +69,7 @@ Run \`astro preview --help\` to see available commands.`
     process.exit(1);
   }
   const root = pathToFileURL(resolveRoot(flags.root) + "/");
-  const existingServer = checkExistingServer(root, "preview");
+  const existingServer = await checkExistingServer(root, "preview");
   if (existingServer) {
     const message = [
       "Another astro preview server is already running.",

package/dist/cli/server.js

@@ -101,7 +101,7 @@ async function background({
   config
 }) {
   const root = getRootURL(flags);
-  const existing = checkExistingServer(root, config.command);
+  const existing = await checkExistingServer(root, config.command);
   if (existing && !flags.force) {
     logger.info("SKIP_FORMAT", formatServerRunningMessage(existing, config, { existing: true }));
     return;
@@ -160,7 +160,7 @@ async function stop({
   config
 }) {
   const root = getRootURL(flags);
-  const existing = checkExistingServer(root, config.command);
+  const existing = await checkExistingServer(root, config.command);
   if (!existing) {
     logger.info("SKIP_FORMAT", `No ${config.command} server is running.`);
     return;
@@ -174,7 +174,7 @@ async function status({
   config
 }) {
   const root = getRootURL(flags);
-  const existing = checkExistingServer(root, config.command);
+  const existing = await checkExistingServer(root, config.command);
   if (!existing) {
     logger.info("SKIP_FORMAT", `No ${config.command} server is running.`);
     return;
@@ -198,7 +198,7 @@ async function logs({
   config
 }) {
   const root = getRootURL(flags);
-  const existing = checkExistingServer(root, config.command);
+  const existing = await checkExistingServer(root, config.command);
   if (!existing) {
     logger.error("SKIP_FORMAT", `No ${config.command} server is running.`);
     process.exit(1);

package/dist/content/content-layer.js

@@ -196,7 +196,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "7.2.0") {
+    if (previousAstroVersion && previousAstroVersion !== "7.2.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -204,8 +204,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("7.2.0") {
-      this.#store.metaStore().set("astro-version", "7.2.0");
+    if ("7.2.2") {
+      this.#store.metaStore().set("astro-version", "7.2.2");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -265,6 +265,7 @@ ${contentConfig.error.message}`
         }
       })
     );
+    this.#validateReferences(contentConfig.config.collections, logger);
     await fs.mkdir(this.#settings.config.cacheDir, { recursive: true });
     await fs.mkdir(this.#settings.dotAstroDir, { recursive: true });
     const assetImportsFile = new URL(ASSET_IMPORTS_FILE, this.#settings.dotAstroDir);
@@ -277,6 +278,65 @@ ${contentConfig.error.message}`
       await this.regenerateCollectionFileManifest();
     }
   }
+  /**
+   * After all loaders complete, walks every entry's data to find reference objects
+   * (`{ id, collection }`) and checks that the referenced entry exists in the store.
+   * This replaces the inline Zod validation that was removed in the Zod 4 upgrade.
+   */
+  #validateReferences(collections, logger) {
+    const collectionNames = new Set(Object.keys(collections));
+    for (const collectionName of collectionNames) {
+      for (const entry of this.#store.values(collectionName)) {
+        if (entry?.data) {
+          this.#findInvalidReferences(
+            entry.data,
+            collectionNames,
+            collectionName,
+            entry.id,
+            logger,
+            ""
+          );
+        }
+      }
+    }
+  }
+  #findInvalidReferences(value, collectionNames, ownerCollection, ownerId, logger, path) {
+    if (value == null || typeof value !== "object") return;
+    if (Array.isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        this.#findInvalidReferences(
+          value[i],
+          collectionNames,
+          ownerCollection,
+          ownerId,
+          logger,
+          `${path}[${i}]`
+        );
+      }
+      return;
+    }
+    const obj = value;
+    if (typeof obj.collection === "string" && collectionNames.has(obj.collection)) {
+      const refId = typeof obj.id === "string" ? obj.id : typeof obj.slug === "string" ? obj.slug : void 0;
+      if (refId !== void 0 && !this.#store.has(obj.collection, refId)) {
+        const fieldPath = path ? ` (field: ${path})` : "";
+        logger.error(
+          `Invalid content reference: entry "${ownerId}" in collection "${ownerCollection}"${fieldPath} references "${refId}" in collection "${obj.collection}", but that entry does not exist.`
+        );
+      }
+      return;
+    }
+    for (const [key, val] of Object.entries(obj)) {
+      this.#findInvalidReferences(
+        val,
+        collectionNames,
+        ownerCollection,
+        ownerId,
+        logger,
+        path ? `${path}.${key}` : key
+      );
+    }
+  }
   async regenerateCollectionFileManifest() {
     const collectionsManifest = new URL(COLLECTIONS_MANIFEST_FILE, this.#settings.dotAstroDir);
     this.#logger.debug("content", "Regenerating collection file manifest");

package/dist/content/loaders/file.js

@@ -1,8 +1,12 @@
 import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
-import yaml from "js-yaml";
+import * as yaml from "js-yaml";
 import * as toml from "smol-toml";
-import { FileGlobNotSupported, FileParserNotFound } from "../../core/errors/errors-data.js";
+import {
+  DuplicateContentEntrySlugError,
+  FileGlobNotSupported,
+  FileParserNotFound
+} from "../../core/errors/errors-data.js";
 import { AstroError } from "../../core/errors/index.js";
 import { posixRelative } from "../utils.js";
 function file(fileName, options) {
@@ -27,7 +31,7 @@ function file(fileName, options) {
       message: FileParserNotFound.message(fileName)
     });
   }
-  async function syncData(filePath, { logger, parseData, store, config }) {
+  async function syncData(filePath, { logger, parseData, store, config, collection }) {
     let data;
     try {
       const contents = await fs.readFile(filePath, "utf-8");
@@ -52,9 +56,20 @@ function file(fileName, options) {
           continue;
         }
         if (idList.has(id)) {
-          logger.warn(
-            `Duplicate id "${id}" found in ${fileName}. Later items with the same id will overwrite earlier ones.`
+          const message = DuplicateContentEntrySlugError.message(
+            collection,
+            id,
+            fileName,
+            fileName
           );
+          if (config.prerenderConflictBehavior === "error") {
+            throw new AstroError({
+              ...DuplicateContentEntrySlugError,
+              message
+            });
+          } else if (config.prerenderConflictBehavior !== "ignore") {
+            logger.warn(message);
+          }
         }
         idList.add(id);
         const parsedData = await parseData({ id, data: rawItem, filePath });

package/dist/content/loaders/glob.js

@@ -5,10 +5,12 @@ import pLimit from "p-limit";
 import colors from "piccolore";
 import picomatch from "picomatch";
 import { glob as tinyglobby } from "tinyglobby";
+import * as AstroErrorData from "../../core/errors/errors-data.js";
+import { AstroError } from "../../core/errors/index.js";
 import { getContentEntryIdAndSlug, posixRelative } from "../utils.js";
 function generateIdDefault({ entry, base, data }, isLegacy) {
   if (data.slug) {
-    return data.slug;
+    return String(data.slug);
   }
   const entryURL = new URL(encodeURI(entry), base);
   if (isLegacy) {
@@ -45,7 +47,8 @@ function glob(globOptions) {
     );
   }
   const isLegacy = !!globOptions[secretLegacyFlag];
-  const generateId = globOptions?.generateId ?? ((opts) => generateIdDefault(opts, isLegacy));
+  const userGenerateId = globOptions?.generateId ?? ((opts) => generateIdDefault(opts, isLegacy));
+  const generateId = (opts) => String(userGenerateId(opts));
   const fileToIdMap = /* @__PURE__ */ new Map();
   return {
     name: "glob-loader",
@@ -106,9 +109,20 @@ function glob(globOptions) {
         if (existingEntry && existingEntry.filePath && existingEntry.filePath !== relativePath2) {
           const oldFilePath = new URL(existingEntry.filePath, config.root);
           if (existsSync(oldFilePath)) {
-            logger.warn(
-              `Duplicate id "${id}" found in ${filePath2}. Later items with the same id will overwrite earlier ones.`
+            const message = AstroErrorData.DuplicateContentEntrySlugError.message(
+              collection,
+              id,
+              existingEntry.filePath,
+              relativePath2
             );
+            if (config.prerenderConflictBehavior === "error") {
+              throw new AstroError({
+                ...AstroErrorData.DuplicateContentEntrySlugError,
+                message
+              });
+            } else if (config.prerenderConflictBehavior !== "ignore") {
+              logger.warn(message);
+            }
           }
         }
         if (entryType.getRenderFunction && !globOptions.deferRender) {

package/dist/content/mutable-data-store.js

@@ -2,7 +2,7 @@ import { existsSync, promises as fs } from "node:fs";
 import { fileURLToPath } from "node:url";
 import * as devalue from "devalue";
 import { forEach } from "neotraverse";
-import { imageSrcToImportId, importIdToSymbolName } from "../assets/utils/resolveImports.js";
+import { imageSrcToImportId } from "../assets/utils/resolveImports.js";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DATA_STORE_MANIFEST_FILE, IMAGE_IMPORT_PREFIX } from "./consts.js";
 import {
@@ -109,8 +109,8 @@ class MutableDataStore extends ImmutableDataStore {
     const imports = [];
     const exports = [];
     const sortedAssetImports = [...this.#assetImports].sort();
-    sortedAssetImports.forEach((id) => {
-      const symbol = importIdToSymbolName(id);
+    sortedAssetImports.forEach((id, index) => {
+      const symbol = `__ASTRO_IMAGE_IMPORT_${index}`;
       imports.push(`import ${symbol} from ${JSON.stringify(id)};`);
       exports.push(`[${JSON.stringify(id)}, ${symbol}]`);
     });

package/dist/content/runtime.d.ts

@@ -71,6 +71,7 @@ type RenderResult = {
     remarkPluginFrontmatter: Record<string, any>;
 };
 export declare function updateImageReferencesInData<T extends Record<string, unknown>>(data: T, fileName?: string, imageAssetMap?: Map<string, ImageMetadata>): T;
+export declare function resolveEntryData<T extends Record<string, unknown>>(entry: DataEntry<T>, imageAssetMap?: Map<string, ImageMetadata>): T;
 export declare function renderEntry(entry: DataEntry): Promise<RenderResult>;
 export declare function createReference(): (collection: string) => z.ZodPipe<z.ZodUnion<readonly [z.ZodPipe<z.ZodNumber, z.ZodTransform<string, number>>, z.ZodString, z.ZodObject<{
     id: z.ZodString;

package/dist/content/runtime.js

@@ -78,7 +78,7 @@ function createGetCollection({
       const { default: imageAssetMap } = await import("astro:asset-imports");
       const result = [];
       for (const rawEntry of await store.values(collection)) {
-        const data = updateImageReferencesInData(rawEntry.data, rawEntry.filePath, imageAssetMap);
+        const data = resolveEntryData(rawEntry, imageAssetMap);
         let entry = {
           ...rawEntry,
           data,
@@ -135,7 +135,7 @@ function createGetEntry({ liveCollections }) {
         return;
       }
       const { default: imageAssetMap } = await import("astro:asset-imports");
-      const data = updateImageReferencesInData(entry.data, entry.filePath, imageAssetMap);
+      const data = resolveEntryData(entry, imageAssetMap);
       const result = {
         ...entry,
         data,
@@ -382,6 +382,9 @@ function updateImageReferencesInData(data, fileName, imageAssetMap) {
   });
   return copy;
 }
+function resolveEntryData(entry, imageAssetMap) {
+  return entry.assetImports?.length ? updateImageReferencesInData(entry.data, entry.filePath, imageAssetMap) : structuredClone(entry.data);
+}
 async function renderEntry(entry) {
   if (!entry) {
     throw new AstroError(AstroErrorData.RenderUndefinedEntryError);
@@ -563,5 +566,6 @@ export {
   defineCollection,
   defineLiveCollection,
   renderEntry,
+  resolveEntryData,
   updateImageReferencesInData
 };

package/dist/core/app/types.d.ts

@@ -193,6 +193,8 @@ export type SSRManifestCSP = {
         resources: CspResourceEntry[];
         hashes: CspHashEntry[];
     };
+    /** Static speculation rules JSON to inject in the head when CSP + clientPrerender are both enabled. */
+    speculationRulesContent?: string;
 };
 export interface SSRManifestSession extends BaseSessionConfig {
     driver: string;

package/dist/core/build/generate.js

@@ -222,7 +222,16 @@ ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
     if (prerenderer.collectStaticImages) {
       const adapterImages = await prerenderer.collectStaticImages();
       for (const [path, entry] of adapterImages) {
-        staticImageList.set(path, entry);
+        const existing = staticImageList.get(path);
+        if (existing) {
+          for (const [hash, transform] of entry.transforms) {
+            if (!existing.transforms.has(hash)) {
+              existing.transforms.set(hash, transform);
+            }
+          }
+        } else {
+          staticImageList.set(path, entry);
+        }
       }
     }
   } finally {