astro 5.0.0-beta.2 → 5.0.0-beta.4

package/client.d.ts

@@ -19,7 +19,7 @@ interface ImportMeta {
 	 * Astro and Vite expose environment variables through `import.meta.env`. For a complete list of the environment variables available, see the two references below.
 	 *
 	 * - [Astro reference](https://docs.astro.build/en/guides/environment-variables/#default-environment-variables)
-	 * - [Vite reference](https://vitejs.dev/guide/env-and-mode.html#env-variables)
+	 * - [Vite reference](https://vite.dev/guide/env-and-mode.html#env-variables)
 	 */
 	readonly env: ImportMetaEnv;
 }

package/components/viewtransitions.css

@@ -10,12 +10,22 @@
 @keyframes astroFadeIn {
 	from {
 		opacity: 0;
+		mix-blend-mode: plus-lighter;
+	}
+	to {
+		opacity: 1;
+		mix-blend-mode: plus-lighter;
 	}
 }
 
 @keyframes astroFadeOut {
+	from {
+		opacity: 1;
+		mix-blend-mode: plus-lighter;
+	}
 	to {
 		opacity: 0;
+		mix-blend-mode: plus-lighter;
 	}
 }
 

package/dist/actions/consts.d.ts

@@ -1,6 +1,6 @@
 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 ACTIONS_TYPES_FILE = "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 NOOP_ACTIONS = "\0noop-actions";

package/dist/actions/consts.js

@@ -1,6 +1,6 @@
 const VIRTUAL_MODULE_ID = "astro:actions";
 const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
-const ACTIONS_TYPES_FILE = "astro/actions.d.ts";
+const ACTIONS_TYPES_FILE = "actions.d.ts";
 const VIRTUAL_INTERNAL_MODULE_ID = "astro:internal-actions";
 const RESOLVED_VIRTUAL_INTERNAL_MODULE_ID = "\0astro:internal-actions";
 const NOOP_ACTIONS = "\0noop-actions";

package/dist/actions/runtime/virtual/get-action.js

@@ -1,7 +1,7 @@
 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(".");
+  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(

package/dist/assets/utils/transformToPath.js

@@ -6,7 +6,11 @@ import { isESMImportedImage } from "./imageKind.js";
 function propsToFilename(filePath, transform, hash) {
   let filename = decodeURIComponent(removeQueryString(filePath));
   const ext = extname(filename);
-  filename = basename(filename, ext);
+  if (filePath.startsWith("data:")) {
+    filename = shorthash(filePath);
+  } else {
+    filename = basename(filename, ext);
+  }
   const prefixDirname = isESMImportedImage(transform.src) ? dirname(filePath) : "";
   let outputExt = transform.format ? `.${transform.format}` : ext;
   return decodeURIComponent(`${prefixDirname}/${filename}_${hash}${outputExt}`);

package/dist/cli/add/index.js

@@ -6,11 +6,11 @@ import { diffWords } from "diff";
 import { bold, cyan, dim, green, magenta, red, yellow } from "kleur/colors";
 import { builders, generateCode, loadFile } from "magicast";
 import { getDefaultExportOptions } from "magicast/helpers";
-import ora from "ora";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import maxSatisfying from "semver/ranges/max-satisfying.js";
 import { exec } from "tinyexec";
+import yoctoSpinner from "yocto-spinner";
 import {
   loadTSConfig,
   resolveConfig,
@@ -381,9 +381,6 @@ function setAdapter(mod, adapter, exportName) {
       from: exportName
     });
   }
-  if (!config.output) {
-    config.output = "server";
-  }
   switch (adapter.id) {
     case "node":
       config.adapter = builders.functionCall(adapterId, { mode: "standalone" });
@@ -494,7 +491,8 @@ async function resolveRangeToInstallSpecifier(name, range) {
   const versions = await fetchPackageVersions(name);
   if (versions instanceof Error) return name;
   const stableVersions = versions.filter((v) => !v.includes("-"));
-  const maxStable = maxSatisfying(stableVersions.length !== 0 ? stableVersions : versions, range);
+  const maxStable = maxSatisfying(stableVersions, range) ?? maxSatisfying(versions, range);
+  if (!maxStable) return name;
   return `${name}@^${maxStable}`;
 }
 const INHERITED_FLAGS = /* @__PURE__ */ new Set([
@@ -545,7 +543,7 @@ ${boxen(coloredOutput, {
 ${message}`
     );
     if (await askToContinue({ flags })) {
-      const spinner = ora("Installing dependencies...").start();
+      const spinner = yoctoSpinner({ text: "Installing dependencies..." }).start();
       try {
         await exec(
           installCommand.pm,
@@ -563,10 +561,10 @@ ${message}`
             }
           }
         );
-        spinner.succeed();
+        spinner.success();
         return 1 /* updated */;
       } catch (err) {
-        spinner.fail();
+        spinner.error();
         logger.debug("add", "Error installing dependencies", err);
         console.error("\n", err.stdout || err.message, "\n");
         return 3 /* failure */;
@@ -577,7 +575,7 @@ ${message}`
   }
 }
 async function validateIntegrations(integrations) {
-  const spinner = ora("Resolving packages...").start();
+  const spinner = yoctoSpinner({ text: "Resolving packages..." }).start();
   try {
     const integrationEntries = await Promise.all(
       integrations.map(async (integration) => {
@@ -594,9 +592,9 @@ async function validateIntegrations(integrations) {
           const firstPartyPkgCheck = await fetchPackageJson("@astrojs", name, tag);
           if (firstPartyPkgCheck instanceof Error) {
             if (firstPartyPkgCheck.message) {
-              spinner.warn(yellow(firstPartyPkgCheck.message));
+              spinner.warning(yellow(firstPartyPkgCheck.message));
             }
-            spinner.warn(yellow(`${bold(integration)} is not an official Astro package.`));
+            spinner.warning(yellow(`${bold(integration)} is not an official Astro package.`));
             const response = await prompts({
               type: "confirm",
               name: "askToContinue",
@@ -621,7 +619,7 @@ async function validateIntegrations(integrations) {
           const thirdPartyPkgCheck = await fetchPackageJson(scope, name, tag);
           if (thirdPartyPkgCheck instanceof Error) {
             if (thirdPartyPkgCheck.message) {
-              spinner.warn(yellow(thirdPartyPkgCheck.message));
+              spinner.warning(yellow(thirdPartyPkgCheck.message));
             }
             throw new Error(`Unable to fetch ${bold(integration)}. Does the package exist?`);
           } else {
@@ -661,11 +659,11 @@ async function validateIntegrations(integrations) {
         return { id: integration, packageName, dependencies, type: integrationType };
       })
     );
-    spinner.succeed();
+    spinner.success();
     return integrationEntries;
   } catch (e) {
     if (e instanceof Error) {
-      spinner.fail(e.message);
+      spinner.error(e.message);
       process.exit(1);
     } else {
       throw e;

package/dist/cli/install-package.js

@@ -2,11 +2,11 @@ import { createRequire } from "node:module";
 import boxen from "boxen";
 import ci from "ci-info";
 import { bold, cyan, dim, magenta } from "kleur/colors";
-import ora from "ora";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import { exec } from "tinyexec";
 import whichPm from "which-pm";
+import yoctoSpinner from "yocto-spinner";
 const require2 = createRequire(import.meta.url);
 async function getPackage(packageName, logger, options, otherDeps = []) {
   try {
@@ -104,18 +104,18 @@ ${message}`
     })).askToContinue;
   }
   if (Boolean(response)) {
-    const spinner = ora("Installing dependencies...").start();
+    const spinner = yoctoSpinner({ text: "Installing dependencies..." }).start();
     try {
       await exec(
         installCommand.pm,
         [installCommand.command, ...installCommand.flags, ...installCommand.dependencies],
         { nodeOptions: { cwd } }
       );
-      spinner.succeed();
+      spinner.success();
       return true;
     } catch (err) {
       logger.debug("add", "Error installing dependencies", err);
-      spinner.fail();
+      spinner.error();
       return false;
     }
   } else {

package/dist/content/consts.d.ts

@@ -17,8 +17,10 @@ export declare const LINKS_PLACEHOLDER = "@@ASTRO-LINKS@@";
 export declare const STYLES_PLACEHOLDER = "@@ASTRO-STYLES@@";
 export declare const IMAGE_IMPORT_PREFIX = "__ASTRO_IMAGE_";
 export declare const CONTENT_FLAGS: readonly ["astroContentCollectionEntry", "astroRenderContent", "astroDataCollectionEntry", "astroPropagatedAssets", "astroContentImageFlag", "astroContentModuleFlag"];
-export declare const CONTENT_TYPES_FILE = "astro/content.d.ts";
+export declare const CONTENT_TYPES_FILE = "content.d.ts";
 export declare const DATA_STORE_FILE = "data-store.json";
-export declare const ASSET_IMPORTS_FILE = "assets.mjs";
-export declare const MODULES_IMPORTS_FILE = "modules.mjs";
+export declare const ASSET_IMPORTS_FILE = "content-assets.mjs";
+export declare const MODULES_IMPORTS_FILE = "content-modules.mjs";
+export declare const COLLECTIONS_MANIFEST_FILE = "collections/collections.json";
+export declare const COLLECTIONS_DIR = "collections/";
 export declare const CONTENT_LAYER_TYPE = "content_layer";

package/dist/content/consts.js

@@ -24,15 +24,19 @@ const CONTENT_FLAGS = [
   CONTENT_IMAGE_FLAG,
   CONTENT_MODULE_FLAG
 ];
-const CONTENT_TYPES_FILE = "astro/content.d.ts";
+const CONTENT_TYPES_FILE = "content.d.ts";
 const DATA_STORE_FILE = "data-store.json";
-const ASSET_IMPORTS_FILE = "assets.mjs";
-const MODULES_IMPORTS_FILE = "modules.mjs";
+const ASSET_IMPORTS_FILE = "content-assets.mjs";
+const MODULES_IMPORTS_FILE = "content-modules.mjs";
+const COLLECTIONS_MANIFEST_FILE = "collections/collections.json";
+const COLLECTIONS_DIR = "collections/";
 const CONTENT_LAYER_TYPE = "content_layer";
 export {
   ASSET_IMPORTS_FILE,
   ASSET_IMPORTS_RESOLVED_STUB_ID,
   ASSET_IMPORTS_VIRTUAL_ID,
+  COLLECTIONS_DIR,
+  COLLECTIONS_MANIFEST_FILE,
   CONTENT_FLAG,
   CONTENT_FLAGS,
   CONTENT_IMAGE_FLAG,

package/dist/content/content-layer.js

@@ -4,6 +4,7 @@ import xxhash from "xxhash-wasm";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import {
   ASSET_IMPORTS_FILE,
+  COLLECTIONS_MANIFEST_FILE,
   CONTENT_LAYER_TYPE,
   DATA_STORE_FILE,
   MODULES_IMPORTS_FILE
@@ -106,10 +107,25 @@ class ContentLayer {
     logger.info("Syncing content");
     const { digest: currentConfigDigest } = contentConfig.config;
     this.#lastConfigDigest = currentConfigDigest;
+    let shouldClear = false;
     const previousConfigDigest = await this.#store.metaStore().get("config-digest");
+    const previousAstroVersion = await this.#store.metaStore().get("astro-version");
     if (currentConfigDigest && previousConfigDigest !== currentConfigDigest) {
-      logger.info("Content config changed, clearing cache");
+      logger.info("Content config changed");
+      shouldClear = true;
+    }
+    if (previousAstroVersion !== "5.0.0-beta.4") {
+      logger.info("Astro version changed");
+      shouldClear = true;
+    }
+    if (shouldClear) {
+      logger.info("Clearing content store");
       this.#store.clearAll();
+    }
+    if ("5.0.0-beta.4") {
+      await this.#store.metaStore().set("astro-version", "5.0.0-beta.4");
+    }
+    if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);
     }
     await Promise.all(
@@ -159,14 +175,10 @@ class ContentLayer {
         return collection.loader.load(context);
       })
     );
-    if (!existsSync(this.#settings.config.cacheDir)) {
-      await fs.mkdir(this.#settings.config.cacheDir, { recursive: true });
-    }
+    await fs.mkdir(this.#settings.config.cacheDir, { recursive: true });
+    await fs.mkdir(this.#settings.dotAstroDir, { recursive: true });
     const cacheFile = getDataStoreFile(this.#settings);
     await this.#store.writeToDisk(cacheFile);
-    if (!existsSync(this.#settings.dotAstroDir)) {
-      await fs.mkdir(this.#settings.dotAstroDir, { recursive: true });
-    }
     const assetImportsFile = new URL(ASSET_IMPORTS_FILE, this.#settings.dotAstroDir);
     await this.#store.writeAssetImports(assetImportsFile);
     const modulesImportsFile = new URL(MODULES_IMPORTS_FILE, this.#settings.dotAstroDir);
@@ -177,7 +189,7 @@ class ContentLayer {
     }
   }
   async regenerateCollectionFileManifest() {
-    const collectionsManifest = new URL("collections/collections.json", this.#settings.dotAstroDir);
+    const collectionsManifest = new URL(COLLECTIONS_MANIFEST_FILE, this.#settings.dotAstroDir);
     this.#logger.debug("content", "Regenerating collection file manifest");
     if (existsSync(collectionsManifest)) {
       try {

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

@@ -31,6 +31,8 @@ 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/file.d.ts

@@ -1,7 +1,14 @@
 import type { Loader } from './types.js';
+export interface FileOptions {
+    /**
+     * the parsing function to use for this data
+     * @default JSON.parse or yaml.load, depending on the extension of the file
+     * */
+    parser?: (text: string) => Record<string, Record<string, unknown>> | Array<Record<string, unknown>>;
+}
 /**
  * Loads entries from a JSON file. The file must contain an array of objects that contain unique `id` fields, or an object with string keys.
- * @todo Add support for other file types, such as YAML, CSV etc.
  * @param fileName The path to the JSON file to load, relative to the content directory.
+ * @param options Additional options for the file loader
  */
-export declare function file(fileName: string): Loader;
+export declare function file(fileName: string, options?: FileOptions): Loader;

package/dist/content/loaders/file.js

@@ -1,43 +1,59 @@
 import { promises as fs, existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
+import yaml from "js-yaml";
 import { posixRelative } from "../utils.js";
-function file(fileName) {
+function file(fileName, options) {
   if (fileName.includes("*")) {
     throw new Error("Glob patterns are not supported in `file` loader. Use `glob` loader instead.");
   }
+  let parse = null;
+  const ext = fileName.split(".").at(-1);
+  if (ext === "json") {
+    parse = JSON.parse;
+  } else if (ext === "yml" || ext === "yaml") {
+    parse = (text) => yaml.load(text, {
+      filename: fileName
+    });
+  }
+  if (options?.parser) parse = options.parser;
+  if (parse === null) {
+    throw new Error(
+      `No parser found for file '${fileName}'. Try passing a parser to the \`file\` loader.`
+    );
+  }
   async function syncData(filePath, { logger, parseData, store, config }) {
-    let json;
+    let data;
     try {
-      const data = await fs.readFile(filePath, "utf-8");
-      json = JSON.parse(data);
+      const contents = await fs.readFile(filePath, "utf-8");
+      data = parse(contents);
     } catch (error) {
       logger.error(`Error reading data from ${fileName}`);
       logger.debug(error.message);
       return;
     }
     const normalizedFilePath = posixRelative(fileURLToPath(config.root), filePath);
-    if (Array.isArray(json)) {
-      if (json.length === 0) {
+    if (Array.isArray(data)) {
+      if (data.length === 0) {
         logger.warn(`No items found in ${fileName}`);
       }
-      logger.debug(`Found ${json.length} item array in ${fileName}`);
+      logger.debug(`Found ${data.length} item array in ${fileName}`);
       store.clear();
-      for (const rawItem of json) {
+      for (const rawItem of data) {
         const id = (rawItem.id ?? rawItem.slug)?.toString();
         if (!id) {
           logger.error(`Item in ${fileName} is missing an id or slug field.`);
           continue;
         }
-        const data = await parseData({ id, data: rawItem, filePath });
-        store.set({ id, data, filePath: normalizedFilePath });
+        const parsedData = await parseData({ id, data: rawItem, filePath });
+        store.set({ id, data: parsedData, filePath: normalizedFilePath });
       }
-    } else if (typeof json === "object") {
-      const entries = Object.entries(json);
+    } else if (typeof data === "object") {
+      const entries = Object.entries(data);
       logger.debug(`Found object with ${entries.length} entries in ${fileName}`);
       store.clear();
       for (const [id, rawItem] of entries) {
-        const data = await parseData({ id, data: rawItem, filePath });
-        store.set({ id, data, filePath: normalizedFilePath });
+        const parsedData = await parseData({ id, data: rawItem, filePath });
+        store.set({ id, data: parsedData, filePath: normalizedFilePath });
       }
     } else {
       logger.error(`Invalid data in ${fileName}. Must be an array or object.`);

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

@@ -23,3 +23,8 @@ export 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;

package/dist/content/loaders/glob.js

@@ -9,7 +9,7 @@ function generateIdDefault({ entry, base, data }) {
   if (data.slug) {
     return data.slug;
   }
-  const entryURL = new URL(entry, base);
+  const entryURL = new URL(encodeURI(entry), base);
   const { slug } = getContentEntryIdAndSlug({
     entry: entryURL,
     contentDir: base,
@@ -41,17 +41,19 @@ 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) {
         if (!entryType) {
           logger.warn(`No entry type found for ${entry}`);
           return;
         }
-        const fileUrl = new URL(entry, base);
+        const fileUrl = new URL(encodeURI(entry), base);
         const contents = await fs.readFile(fileUrl, "utf-8").catch((err) => {
           logger.error(`Error reading ${entry}: ${err.message}`);
           return;
         });
-        if (!contents) {
+        if (!contents && contents !== "") {
           logger.warn(`No contents found for ${entry}`);
           return;
         }
@@ -60,6 +62,16 @@ function glob(globOptions) {
           fileUrl
         });
         const id = generateId({ entry, base, data });
+        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);
@@ -80,6 +92,11 @@ function glob(globOptions) {
           filePath
         });
         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);
@@ -104,7 +121,8 @@ function glob(globOptions) {
             filePath: relativePath,
             digest,
             rendered,
-            assetImports: rendered?.metadata?.imagePaths
+            assetImports: rendered?.metadata?.imagePaths,
+            legacyId
           });
         } else if ("contentModuleTypes" in entryType) {
           store.set({
@@ -113,10 +131,11 @@ function glob(globOptions) {
             body,
             filePath: relativePath,
             digest,
-            deferredRender: true
+            deferredRender: true,
+            legacyId
           });
         } else {
-          store.set({ id, data: parsedData, body, filePath: relativePath, digest });
+          store.set({ id, data: parsedData, body, filePath: relativePath, digest, legacyId });
         }
         fileToIdMap.set(filePath, id);
       }
@@ -154,7 +173,7 @@ function glob(globOptions) {
           if (isConfigFile(entry)) {
             return;
           }
-          if (isInContentDir(entry)) {
+          if (!emulateLegacyCollections && isInContentDir(entry)) {
             skippedFiles.push(entry);
             return;
           }
@@ -167,7 +186,9 @@ function glob(globOptions) {
       const skipCount = skippedFiles.length;
       if (skipCount > 0) {
         const patternList = Array.isArray(globOptions.pattern) ? globOptions.pattern.join(", ") : globOptions.pattern;
-        logger.warn(`The glob() loader cannot be used for files in ${bold("src/content")}.`);
+        logger.warn(
+          `The glob() loader cannot be used for files in ${bold("src/content")} when legacy mode is enabled.`
+        );
         if (skipCount > 10) {
           logger.warn(
             `Skipped ${green(skippedFiles.length)} files that matched ${green(patternList)}.`

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

@@ -1,5 +1,5 @@
 import { type PathLike } from 'node:fs';
-import { type DataEntry, ImmutableDataStore, type RenderedContent } from './data-store.js';
+import { type DataEntry, ImmutableDataStore } from './data-store.js';
 /**
  * Extends the DataStore with the ability to change entries and write them to disk.
  * This is kept as a separate class to avoid needing node builtins at runtime, when read-only access is all that is needed.
@@ -34,24 +34,7 @@ export declare class MutableDataStore extends ImmutableDataStore {
 export interface DataStore {
     get: <TData extends Record<string, unknown> = Record<string, unknown>>(key: string) => DataEntry<TData> | undefined;
     entries: () => Array<[id: string, DataEntry]>;
-    set: <TData extends Record<string, unknown>>(opts: {
-        /** The ID of the entry. Must be unique per collection. */
-        id: string;
-        /** The data to store. */
-        data: TData;
-        /** The raw body of the content, if applicable. */
-        body?: string;
-        /** The file path of the content, if applicable. Relative to the site root. */
-        filePath?: string;
-        /** A content digest, to check if the content has changed. */
-        digest?: number | string;
-        /** The rendered content, if applicable. */
-        rendered?: RenderedContent;
-        /**
-         * If an entry is a deferred, its rendering phase is delegated to a virtual module during the runtime phase.
-         */
-        deferredRender?: boolean;
-    }) => boolean;
+    set: <TData extends Record<string, unknown>>(opts: DataEntry<TData>) => boolean;
     values: () => Array<DataEntry>;
     keys: () => Array<string>;
     delete: (key: string) => void;

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

@@ -159,7 +159,17 @@ ${lines.join(",\n")}]);
       entries: () => this.entries(collectionName),
       values: () => this.values(collectionName),
       keys: () => this.keys(collectionName),
-      set: ({ id: key, data, body, filePath, deferredRender, digest, rendered, assetImports }) => {
+      set: ({
+        id: key,
+        data,
+        body,
+        filePath,
+        deferredRender,
+        digest,
+        rendered,
+        assetImports,
+        legacyId
+      }) => {
         if (!key) {
           throw new Error(`ID must be a non-empty string`);
         }
@@ -200,6 +210,9 @@ ${lines.join(",\n")}]);
         if (rendered) {
           entry.rendered = rendered;
         }
+        if (legacyId) {
+          entry.legacyId = legacyId;
+        }
         if (deferredRender) {
           entry.deferredRender = deferredRender;
           if (filePath) {

package/dist/content/runtime.d.ts

@@ -18,10 +18,11 @@ export declare function createGetCollection({ contentCollectionToEntryMap, dataC
     getRenderEntryImport: GetEntryImport;
     cacheEntriesByCollection: Map<string, any[]>;
 }): (collection: string, filter?: (entry: any) => unknown) => Promise<any[]>;
-export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, collectionNames, }: {
+export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, collectionNames, getEntry, }: {
     getEntryImport: GetEntryImport;
     getRenderEntryImport: GetEntryImport;
     collectionNames: Set<string>;
+    getEntry: ReturnType<typeof createGetEntry>;
 }): (collection: string, slug: string) => Promise<{
     id: any;
     slug: any;
@@ -30,10 +31,11 @@ export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImp
     data: any;
     render(): Promise<RenderResult>;
 } | undefined>;
-export declare function createGetDataEntryById({ getEntryImport, collectionNames, }: {
+export declare function createGetDataEntryById({ getEntryImport, collectionNames, getEntry, }: {
     getEntryImport: GetEntryImport;
     collectionNames: Set<string>;
-}): (collection: string, id: string) => Promise<{
+    getEntry: ReturnType<typeof createGetEntry>;
+}): (collection: string, id: string) => Promise<ContentEntryResult | {
     id: any;
     collection: any;
     data: any;
@@ -79,7 +81,11 @@ export declare function renderEntry(entry: DataEntry | {
     render: () => Promise<{
         Content: AstroComponentFactory;
     }>;
-}): Promise<{
+} | (DataEntry & {
+    render: () => Promise<{
+        Content: AstroComponentFactory;
+    }>;
+})): Promise<{
     Content: AstroComponentFactory;
 }>;
 export declare function createReference({ lookupMap }: {
@@ -88,20 +94,20 @@ export declare function createReference({ lookupMap }: {
     id: z.ZodString;
     collection: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    id: string;
     collection: string;
-}, {
     id: string;
+}, {
     collection: string;
+    id: string;
 }>, z.ZodObject<{
     slug: z.ZodString;
     collection: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    collection: string;
     slug: string;
-}, {
     collection: string;
+}, {
     slug: string;
+    collection: string;
 }>]>, {
     id: string;
     collection: string;
@@ -109,10 +115,10 @@ export declare function createReference({ lookupMap }: {
     slug: string;
     collection: string;
 } | undefined, string | {
-    id: string;
     collection: string;
+    id: string;
 } | {
-    collection: string;
     slug: string;
+    collection: string;
 }>;
 export {};