astro 5.15.4 → 6.0.0-alpha.0

package/{astro.js → bin/astro.mjs}

@@ -1,9 +1,6 @@
 #!/usr/bin/env node
 'use strict';
 
-// ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED
-// This file has to run as both ESM and CJS on older Node.js versions
-
 const CI_INSTRUCTIONS = {
 	NETLIFY: 'https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript',
 	GITHUB_ACTIONS:
@@ -11,9 +8,12 @@ const CI_INSTRUCTIONS = {
 	VERCEL: 'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
 };
 
+// TODO: remove once Stackblitz supports Node 22
+const IS_STACKBLITZ = !!process.versions.webcontainer;
+
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = '>=18.20.8';
-const skipSemverCheckIfAbove = 19;
+const engines = IS_STACKBLITZ ? '>=20.19.5' : '>=22.12.0';
+const skipSemverCheckIfAbove = IS_STACKBLITZ ? 21 : 23;
 
 /** `astro *` */
 async function main() {
@@ -39,7 +39,7 @@ async function main() {
 		if (correctedCwd !== cwd) process.chdir(correctedCwd);
 	}
 
-	return import('./dist/cli/index.js')
+	return import('../dist/cli/index.js')
 		.then(({ cli }) => cli(process.argv))
 		.catch((error) => {
 			console.error(error);
@@ -52,8 +52,7 @@ async function errorNodeUnsupported() {
 Node.js v${process.versions.node} is not supported by Astro!
 Please upgrade Node.js to a supported version: "${engines}"\n`);
 
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const ci = typeof require !== 'undefined' ? require('ci-info') : await import('ci-info');
+	const ci = await import('ci-info');
 
 	// Special instructions for CI environments, which may have special steps needed.
 	// This is a common issue that we can help users with proactively.

package/client.d.ts

@@ -5,8 +5,10 @@
 /// <reference path="./types/fonts.d.ts" />
 
 interface ImportMetaEnv {
+	// TODO: remove in Astro 7
 	/**
 	 * The prefix for Astro-generated asset links if the build.assetsPrefix config option is set. This can be used to create asset links not handled by Astro.
+	 * @deprecated This will be removed in a future major version of Astro. Use `build.assetsPrefix` from `astro:config/server` instead.
 	 */
 	readonly ASSETS_PREFIX: string | Record<string, string>;
 	/**
@@ -124,10 +126,6 @@ declare module 'astro:transitions' {
 	export const createAnimationScope: TransitionModule['createAnimationScope'];
 
 	type ClientRouterModule = typeof import('./components/ClientRouter.astro');
-	/**
-	 * @deprecated The ViewTransitions component has been renamed to ClientRouter
-	 */
-	export const ViewTransitions: ClientRouterModule['default'];
 	export const ClientRouter: ClientRouterModule['default'];
 }
 

package/components/ClientRouter.astro

@@ -3,11 +3,6 @@ type Fallback = 'none' | 'animate' | 'swap';
 
 export interface Props {
 	fallback?: Fallback;
-	/** @deprecated handleForms is enabled by default in Astro 4.0
-	 *
-	 * Set `data-astro-reload` on your form to opt-out of the default behavior.
-	 */
-	handleForms?: boolean;
 }
 
 const { fallback = 'animate' } = Astro.props;

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

@@ -1,4 +1,4 @@
-import type { APIContext, AstroSharedContext } from '../../types/public/context.js';
+import type { APIContext } from '../../types/public/context.js';
 import type { SerializedActionResult } from './shared.js';
 export type ActionPayload = {
     actionResult: SerializedActionResult;
@@ -10,13 +10,7 @@ export type Locals = {
 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 = Pick<APIContext, 'rewrite' | 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'csp'> & {
-    /**
-     * @deprecated
-     * The use of `rewrite` in Actions is deprecated
-     */
-    rewrite: AstroSharedContext['rewrite'];
-};
+export type ActionAPIContext = Pick<APIContext, 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'csp'>;
 export type MaybePromise<T> = T | Promise<T>;
 /**
  * Used to preserve the input schema type in the error object.

package/dist/assets/build/remote.js

@@ -48,27 +48,17 @@ async function revalidateRemoteImage(src, revalidationData) {
     lastModified: res.headers.get("Last-Modified") ?? (res.ok ? void 0 : revalidationData.lastModified)
   };
 }
-function webToCachePolicyRequest({ url, method, headers: _headers }) {
-  let headers = {};
-  try {
-    headers = Object.fromEntries(_headers.entries());
-  } catch {
-  }
+function webToCachePolicyRequest({ url, method, headers }) {
   return {
     method,
     url,
-    headers
+    headers: Object.fromEntries(headers.entries())
   };
 }
-function webToCachePolicyResponse({ status, headers: _headers }) {
-  let headers = {};
-  try {
-    headers = Object.fromEntries(_headers.entries());
-  } catch {
-  }
+function webToCachePolicyResponse({ status, headers }) {
   return {
     status,
-    headers
+    headers: Object.fromEntries(headers.entries())
   };
 }
 export {

package/dist/assets/fonts/implementations/font-metrics-resolver.js

@@ -15,9 +15,11 @@ function filterRequiredMetrics({
     xWidthAvg
   };
 }
-function toPercentage(value, fractionDigits = 4) {
-  const percentage = value * 100;
-  return `${+percentage.toFixed(fractionDigits)}%`;
+function round(value) {
+  return parseFloat(value.toFixed(4));
+}
+function toPercentString(value) {
+  return `${round(value * 100)}%`;
 }
 function createCapsizeFontMetricsResolver({
   fontFetcher,
@@ -29,7 +31,8 @@ function createCapsizeFontMetricsResolver({
       cache[name] ??= filterRequiredMetrics(await fromBuffer(await fontFetcher.fetch(input)));
       return cache[name];
     },
-    // Source: https://github.com/unjs/fontaine/blob/f00f84032c5d5da72c8798eae4cd68d3ddfbf340/src/css.ts#L170
+    // Adapted from Capsize
+    // Source: https://github.com/seek-oss/capsize/blob/b752693428b45994442433f7e3476ca4e3e3c507/packages/core/src/createFontStack.ts
     generateFontFace({
       metrics,
       fallbackMetrics,
@@ -39,18 +42,21 @@ function createCapsizeFontMetricsResolver({
     }) {
       const preferredFontXAvgRatio = metrics.xWidthAvg / metrics.unitsPerEm;
       const fallbackFontXAvgRatio = fallbackMetrics.xWidthAvg / fallbackMetrics.unitsPerEm;
-      const sizeAdjust = preferredFontXAvgRatio / fallbackFontXAvgRatio;
+      const sizeAdjust = preferredFontXAvgRatio && fallbackFontXAvgRatio ? preferredFontXAvgRatio / fallbackFontXAvgRatio : 1;
       const adjustedEmSquare = metrics.unitsPerEm * sizeAdjust;
       const ascentOverride = metrics.ascent / adjustedEmSquare;
       const descentOverride = Math.abs(metrics.descent) / adjustedEmSquare;
       const lineGapOverride = metrics.lineGap / adjustedEmSquare;
+      const fallbackAscentOverride = fallbackMetrics.ascent / adjustedEmSquare;
+      const fallbackDescentOverride = Math.abs(fallbackMetrics.descent) / adjustedEmSquare;
+      const fallbackLineGapOverride = fallbackMetrics.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)
+        "size-adjust": sizeAdjust && sizeAdjust !== 1 ? toPercentString(sizeAdjust) : void 0,
+        "ascent-override": ascentOverride && ascentOverride !== fallbackAscentOverride ? toPercentString(ascentOverride) : void 0,
+        "descent-override": descentOverride && descentOverride !== fallbackDescentOverride ? toPercentString(descentOverride) : void 0,
+        "line-gap-override": lineGapOverride !== fallbackLineGapOverride ? toPercentString(lineGapOverride) : void 0
       });
     }
   };

package/dist/assets/services/sharp.js

@@ -45,25 +45,24 @@ const sharpService = {
       limitInputPixels: config.service.config.limitInputPixels
     });
     result.rotate();
-    const withoutEnlargement = Boolean(transform.fit);
-    if (transform.width && transform.height && transform.fit) {
-      const fit = fitMap[transform.fit] ?? "inside";
+    if (transform.width && transform.height) {
+      const fit = transform.fit ? fitMap[transform.fit] ?? "inside" : void 0;
       result.resize({
         width: Math.round(transform.width),
         height: Math.round(transform.height),
         fit,
         position: transform.position,
-        withoutEnlargement
+        withoutEnlargement: true
       });
     } else if (transform.height && !transform.width) {
       result.resize({
         height: Math.round(transform.height),
-        withoutEnlargement
+        withoutEnlargement: true
       });
     } else if (transform.width) {
       result.resize({
         width: Math.round(transform.width),
-        withoutEnlargement
+        withoutEnlargement: true
       });
     }
     if (transform.format) {

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

@@ -6,11 +6,7 @@
  */
 export { isESMImportedImage, isRemoteImage, resolveSrc } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
-export { 
-/**
- * @deprecated
- */
-emitESMImage, emitImageMetadata, } from './node/emitAsset.js';
+export { emitImageMetadata } from './node/emitAsset.js';
 export { getOrigQueryParams } from './queryParams.js';
 export { isRemoteAllowed, matchHostname, matchPathname, matchPattern, matchPort, matchProtocol, type RemotePattern, } from './remotePattern.js';
 export { inferRemoteSize } from './remoteProbe.js';

package/dist/assets/utils/index.js

@@ -1,9 +1,6 @@
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./imageKind.js";
 import { imageMetadata } from "./metadata.js";
-import {
-  emitESMImage,
-  emitImageMetadata
-} from "./node/emitAsset.js";
+import { emitImageMetadata } from "./node/emitAsset.js";
 import { getOrigQueryParams } from "./queryParams.js";
 import {
   isRemoteAllowed,
@@ -16,7 +13,6 @@ import {
 import { inferRemoteSize } from "./remoteProbe.js";
 import { hashTransform, propsToFilename } from "./transformToPath.js";
 export {
-  emitESMImage,
   emitImageMetadata,
   getOrigQueryParams,
   hashTransform,

package/dist/assets/utils/node/emitAsset.d.ts

@@ -4,20 +4,6 @@ type FileEmitter = vite.Rollup.EmitFile;
 type ImageMetadataWithContents = ImageMetadata & {
     contents?: Buffer;
 };
-/**
- * Processes an image file and emits its metadata and optionally its contents. This function supports both build and development modes.
- *
- * @param {string | undefined} id - The identifier or path of the image file to process. If undefined, the function returns immediately.
- * @param {boolean} _watchMode - **Deprecated**: Indicates if the method is operating in watch mode. This parameter will be removed or updated in the future.
- * @param {boolean} _experimentalSvgEnabled - **Deprecated**: A flag to enable experimental handling of SVG files. Embeds SVG file data if set to true.
- * @param {FileEmitter | undefined} [fileEmitter] - Function for emitting files during the build process. May throw in certain scenarios.
- * @return {Promise<ImageMetadataWithContents | undefined>} Resolves to metadata with optional image contents or `undefined` if processing fails.
- */
-export declare function emitESMImage(id: string | undefined, 
-/** @deprecated */
-_watchMode: boolean, 
-/** @deprecated */
-_experimentalSvgEnabled: boolean, fileEmitter?: FileEmitter): Promise<ImageMetadataWithContents | undefined>;
 /**
  * Processes an image file and emits its metadata and optionally its contents. This function supports both build and development modes.
  *

package/dist/assets/utils/node/emitAsset.js

@@ -35,55 +35,6 @@ async function handleSvgDeduplication(fileData, filename, fileEmitter) {
     return handle;
   }
 }
-async function emitESMImage(id, _watchMode, _experimentalSvgEnabled, fileEmitter) {
-  if (!id) {
-    return void 0;
-  }
-  const url = pathToFileURL(id);
-  let fileData;
-  try {
-    fileData = await fs.readFile(url);
-  } catch {
-    return void 0;
-  }
-  const fileMetadata = await imageMetadata(fileData, id);
-  const emittedImage = {
-    src: "",
-    ...fileMetadata
-  };
-  Object.defineProperty(emittedImage, "fsPath", {
-    enumerable: false,
-    writable: false,
-    value: id
-  });
-  let isBuild = typeof fileEmitter === "function";
-  if (isBuild) {
-    const pathname = decodeURI(url.pathname);
-    const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
-    try {
-      let handle;
-      if (fileMetadata.format === "svg") {
-        handle = await handleSvgDeduplication(fileData, filename, fileEmitter);
-      } else {
-        handle = fileEmitter({
-          name: filename,
-          source: fileData,
-          type: "asset"
-        });
-      }
-      emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
-    } catch {
-      isBuild = false;
-    }
-  }
-  if (!isBuild) {
-    url.searchParams.append("origWidth", fileMetadata.width.toString());
-    url.searchParams.append("origHeight", fileMetadata.height.toString());
-    url.searchParams.append("origFormat", fileMetadata.format);
-    emittedImage.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
-  }
-  return emittedImage;
-}
 async function emitImageMetadata(id, fileEmitter) {
   if (!id) {
     return void 0;
@@ -137,6 +88,5 @@ function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");
 }
 export {
-  emitESMImage,
   emitImageMetadata
 };

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

@@ -13,7 +13,7 @@ import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./co
 import { fontsPlugin } from "./fonts/vite-plugin-fonts.js";
 import { getAssetsPrefix } from "./utils/getAssetsPrefix.js";
 import { isESMImportedImage } from "./utils/imageKind.js";
-import { emitESMImage } from "./utils/node/emitAsset.js";
+import { emitImageMetadata } from "./utils/node/emitAsset.js";
 import { getProxyCode } from "./utils/proxy.js";
 import { makeSvgComponent } from "./utils/svg.js";
 import { hashTransform, propsToFilename } from "./utils/transformToPath.js";
@@ -190,13 +190,8 @@ function assets({ fs, settings, sync, logger }) {
           if (!assetRegexEnds.test(id)) {
             return;
           }
-          const emitFile = shouldEmitFile ? this.emitFile.bind(this) : void 0;
-          const imageMetadata = await emitESMImage(
-            id,
-            this.meta.watchMode,
-            id.endsWith(".svg"),
-            emitFile
-          );
+          const fileEmitter = shouldEmitFile ? this.emitFile.bind(this) : void 0;
+          const imageMetadata = await emitImageMetadata(id, fileEmitter);
           if (!imageMetadata) {
             throw new AstroError({
               ...AstroErrorData.ImageNotFound,

package/dist/cli/add/index.js

@@ -24,7 +24,6 @@ import {
 import * as msg from "../../core/messages.js";
 import { printHelp } from "../../core/messages.js";
 import { appendForwardSlash } from "../../core/path.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { ensureProcessNodeEnv, parseNpmName } from "../../core/util.js";
 import { eventCliSession, telemetry } from "../../events/index.js";
 import { exec } from "../exec.js";
@@ -90,7 +89,6 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
 };
 async function add(names, { flags }) {
   ensureProcessNodeEnv("production");
-  applyPolyfill();
   const inlineConfig = flagsToAstroInlineConfig(flags);
   const { userConfig } = await resolveConfig(inlineConfig, "add");
   telemetry.record(eventCliSession("add", userConfig));

package/dist/cli/db/index.js

@@ -1,9 +1,7 @@
 import { resolveConfig } from "../../core/config/config.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { getPackage } from "../install-package.js";
 async function db({ flags }) {
-  applyPolyfill();
   const logger = createLoggerFromFlags(flags);
   const getPackageOpts = {
     skipAsk: !!flags.yes || !!flags.y,

package/dist/cli/info/index.js

@@ -4,7 +4,6 @@ import colors from "picocolors";
 import prompts from "prompts";
 import { resolveConfig } from "../../core/config/index.js";
 import { ASTRO_VERSION } from "../../core/constants.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { flagsToAstroInlineConfig } from "../flags.js";
 async function getInfoOutput({
   userConfig,
@@ -52,7 +51,6 @@ async function getInfoOutput({
   return output.trim();
 }
 async function printInfo({ flags }) {
-  applyPolyfill();
   const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), "info");
   const output = await getInfoOutput({ userConfig, print: true });
   await copyToClipboard(output, flags.copy);

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

@@ -1,5 +1,5 @@
 function createBuildTimeAstroVersionProvider() {
-  const version = "5.15.4";
+  const version = "6.0.0-alpha.0";
   return {
     getVersion() {
       return version;

package/dist/cli/preferences/index.js

@@ -7,7 +7,6 @@ import { resolveConfig } from "../../core/config/config.js";
 import { createSettings } from "../../core/config/settings.js";
 import { collectErrorMetadata } from "../../core/errors/dev/utils.js";
 import * as msg from "../../core/messages.js";
-import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
 import { coerce, isValidKey } from "../../preferences/index.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
@@ -25,7 +24,6 @@ function isValidSubcommand(subcommand) {
   return PREFERENCES_SUBCOMMANDS.includes(subcommand);
 }
 async function preferences(subcommand, key, value, { flags }) {
-  applyPolyfill();
   if (!isValidSubcommand(subcommand) || flags?.help || flags?.h) {
     msg.printHelp({
       commandName: "astro preferences",

package/dist/config/index.js

@@ -7,21 +7,17 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
   return async ({ mode, command }) => {
     const cmd = command === "serve" ? "dev" : "build";
     const [
-      fs,
       { mergeConfig },
       { createNodeLogger },
       { resolveConfig, createSettings },
       { createVite },
-      { runHookConfigSetup, runHookConfigDone },
-      { astroContentListenPlugin }
+      { runHookConfigSetup, runHookConfigDone }
     ] = await Promise.all([
-      import("node:fs"),
       import("vite"),
       import("../core/config/logging.js"),
       import("../core/config/index.js"),
       import("../core/create-vite.js"),
-      import("../integrations/hooks.js"),
-      import("./vite-plugin-content-listen.js")
+      import("../integrations/hooks.js")
     ]);
     const logger = createNodeLogger(inlineAstroConfig);
     const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
@@ -30,12 +26,7 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     const routesList = await createRoutesList({ settings }, logger);
     const manifest = createDevelopmentManifest(settings);
     const viteConfig = await createVite(
-      {
-        plugins: config.legacy.collections ? [
-          // Initialize the content listener
-          astroContentListenPlugin({ settings, logger, fs })
-        ] : []
-      },
+      {},
       { settings, command: cmd, logger, mode, sync: false, manifest, routesList }
     );
     await runHookConfigDone({ settings, logger });

package/dist/container/index.d.ts

@@ -1,4 +1,3 @@
-import './polyfill.js';
 import type { AstroComponentFactory } from '../runtime/server/index.js';
 import type { Props } from '../types/public/common.js';
 import type { AstroUserConfig } from '../types/public/config.js';

package/dist/container/index.js

@@ -1,4 +1,3 @@
-import "./polyfill.js";
 import { posix } from "node:path";
 import { getDefaultClientDirectives } from "../core/client-directive/index.js";
 import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schemas/index.js";

package/dist/content/config.js

@@ -71,20 +71,24 @@ function defineCollection(config) {
       )
     });
   }
-  if ("loader" in config) {
-    if (config.type && config.type !== CONTENT_LAYER_TYPE) {
-      throw new AstroUserError(
-        `Collections that use the Content Layer API must have a \`loader\` defined and no \`type\` set. Check your collection definitions in ${importerFilename ?? "your content config file"}.`
-      );
-    }
-    if (typeof config.loader === "object" && typeof config.loader.load !== "function" && ("loadEntry" in config.loader || "loadCollection" in config.loader)) {
-      throw new AstroUserError(
-        `Live content collections must be defined in "src/live.config.ts" file. Check your collection definitions in "${importerFilename ?? "your content config file"}" to ensure you are not using a live loader.`
-      );
-    }
-    config.type = CONTENT_LAYER_TYPE;
+  if (!("loader" in config)) {
+    throw new AstroError({
+      ...AstroErrorData.ContentCollectionMissingLoader,
+      message: AstroErrorData.ContentCollectionMissingLoader.message(importerFilename)
+    });
+  }
+  if (config.type && config.type !== CONTENT_LAYER_TYPE) {
+    throw new AstroError({
+      ...AstroErrorData.ContentCollectionInvalidType,
+      message: AstroErrorData.ContentCollectionInvalidType.message(config.type, importerFilename)
+    });
+  }
+  if (typeof config.loader === "object" && typeof config.loader.load !== "function" && ("loadEntry" in config.loader || "loadCollection" in config.loader)) {
+    throw new AstroUserError(
+      `Live content collections must be defined in "src/live.config.ts" file. Check your collection definitions in "${importerFilename ?? "your content config file"}" to ensure you are not using a live loader.`
+    );
   }
-  if (!config.type) config.type = "content";
+  config.type = CONTENT_LAYER_TYPE;
   return config;
 }
 export {

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.15.4") {
+    if (previousAstroVersion && previousAstroVersion !== "6.0.0-alpha.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.15.4") {
-      await this.#store.metaStore().set("astro-version", "5.15.4");
+    if ("6.0.0-alpha.0") {
+      await this.#store.metaStore().set("astro-version", "6.0.0-alpha.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -212,9 +212,7 @@ ${contentConfig.error.message}`);
               }
             },
             collectionWithResolvedSchema,
-            false,
-            // FUTURE: Remove in this in v6
-            id.endsWith(".svg")
+            false
           );
           return parsedData;
         };

package/dist/content/data-store.d.ts

@@ -31,8 +31,6 @@ export interface DataEntry<TData extends Record<string, unknown> = Record<string
      */
     deferredRender?: boolean;
     assetImports?: Array<string>;
-    /** @deprecated */
-    legacyId?: string;
 }
 /**
  * A read-only data store for content collections. This is used to retrieve data from the content layer at runtime.

package/dist/content/loaders/glob.d.ts

@@ -23,9 +23,4 @@ interface GlobOptions {
  * @param pattern A glob pattern to match files, relative to the content directory.
  */
 export declare function glob(globOptions: GlobOptions): Loader;
-/** @private */
-export declare function glob(globOptions: GlobOptions & {
-    /** @deprecated */
-    _legacy?: true;
-}): Loader;
 export {};

package/dist/content/loaders/glob.js

@@ -42,8 +42,6 @@ function glob(globOptions) {
     load: async ({ config, logger, watcher, parseData, store, generateDigest, entryTypes }) => {
       const renderFunctionByContentType = /* @__PURE__ */ new WeakMap();
       const untouchedEntries = new Set(store.keys());
-      const isLegacy = globOptions._legacy;
-      const emulateLegacyCollections = !config.legacy.collections;
       async function syncData(entry, base, entryType, oldId) {
         if (!entryType) {
           logger.warn(`No entry type found for ${entry}`);
@@ -66,16 +64,6 @@ function glob(globOptions) {
         if (oldId && oldId !== id) {
           store.delete(oldId);
         }
-        let legacyId;
-        if (isLegacy) {
-          const entryURL = new URL(encodeURI(entry), base);
-          const legacyOptions = getContentEntryIdAndSlug({
-            entry: entryURL,
-            contentDir: base,
-            collection: ""
-          });
-          legacyId = legacyOptions.id;
-        }
         untouchedEntries.delete(id);
         const existingEntry = store.get(id);
         const digest = generateDigest(contents);
@@ -97,11 +85,6 @@ function glob(globOptions) {
           filePath: filePath2
         });
         if (entryType.getRenderFunction) {
-          if (isLegacy && data.layout) {
-            logger.error(
-              `The Markdown "layout" field is not supported in content collections in Astro 5. Ignoring layout for ${JSON.stringify(entry)}. Enable "legacy.collections" if you need to use the layout field.`
-            );
-          }
           let render = renderFunctionByContentType.get(entryType);
           if (!render) {
             render = await entryType.getRenderFunction(config);
@@ -126,8 +109,7 @@ function glob(globOptions) {
             filePath: relativePath2,
             digest,
             rendered,
-            assetImports: rendered?.metadata?.imagePaths,
-            legacyId
+            assetImports: rendered?.metadata?.imagePaths
           });
         } else if ("contentModuleTypes" in entryType) {
           store.set({
@@ -136,11 +118,10 @@ function glob(globOptions) {
             body,
             filePath: relativePath2,
             digest,
-            deferredRender: true,
-            legacyId
+            deferredRender: true
           });
         } else {
-          store.set({ id, data: parsedData, body, filePath: relativePath2, digest, legacyId });
+          store.set({ id, data: parsedData, body, filePath: relativePath2, digest });
         }
         fileToIdMap.set(filePath2, id);
       }
@@ -175,10 +156,6 @@ function glob(globOptions) {
       const limit = pLimit(10);
       const skippedFiles = [];
       const contentDir = new URL("content/", config.srcDir);
-      function isInContentDir(file) {
-        const fileUrl = new URL(file, baseDir);
-        return fileUrl.href.startsWith(contentDir.href);
-      }
       const configFiles = new Set(
         ["config.js", "config.ts", "config.mjs"].map((file) => new URL(file, contentDir).href)
       );
@@ -191,10 +168,6 @@ function glob(globOptions) {
           if (isConfigFile(entry)) {
             return;
           }
-          if (!emulateLegacyCollections && isInContentDir(entry)) {
-            skippedFiles.push(entry);
-            return;
-          }
           return limit(async () => {
             const entryType = configForFile(entry);
             await syncData(entry, baseDir, entryType);