Merge branch 'next' into auto-glob

withastro · Sep 12, 2024 · 305a756 · 305a756
2 parents 1ff97b4 + 60211de
commit 305a756
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/eighty-bags-cross.md b/.changeset/eighty-bags-cross.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Exports the `RenderResult` type
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
@@ -1486,7 +1486,7 @@ export const InvalidContentEntrySlugError = {
 /**
  * @docs
  * @see
- * - [Legacy content collections](https://docs.astro.build/en/guides/content-collections/#collections-using-the-previous-api)
+ * - [Legacy content collections](https://docs.astro.build/en/guides/upgrade-to/v5/#updating-existing-collections)
  * @description
  * A legacy content collection schema should not contain the `slug` field. This is reserved by Astro for generating entry slugs. Remove `slug` from your schema. You can still use custom slugs in your frontmatter.
  */
@@ -1501,7 +1501,7 @@ export const ContentSchemaContainsSlugError = {
 /**
  * @docs
  * @see
- * - [Legacy content collections](https://docs.astro.build/en/guides/content-collections/#collections-using-the-previous-api)
+ * - [Legacy content collections](https://docs.astro.build/en/guides/upgrade-to/v5/#updating-existing-collections)
  * @description
  * A legacy content collection cannot contain a mix of content and data entries. You must store entries in separate collections by type.
  */
@@ -1515,7 +1515,7 @@ export const MixedContentDataCollectionError = {
 /**
  * @docs
  * @see
- * - [Legacy content collections](https://docs.astro.build/en/guides/content-collections/#collections-using-the-previous-api)
+ * - [Legacy content collections](https://docs.astro.build/en/guides/upgrade-to/v5/#updating-existing-collections)
  * @description
  * Legacy content collections must contain entries of the type configured. Collections are `type: 'content'` by default. Try adding `type: 'data'` to your collection config for data collections.
  */

diff --git a/packages/astro/templates/content/types.d.ts b/packages/astro/templates/content/types.d.ts
@@ -1,5 +1,5 @@
 declare module 'astro:content' {
-	interface RenderResult {
+	export interface RenderResult {
 		Content: import('astro/runtime/server/index.js').AstroComponentFactory;
 		headings: import('astro').MarkdownHeading[];
 		remarkPluginFrontmatter: Record<string, any>;