Return html when render markdown content

.changeset/purple-glasses-pretend.md

@@ -0,0 +1,14 @@
+---
+'astro': minor
+---
+
+Return raw `html` when calling `render()` on a markdown content.
+
+```astro
+---
+const entry = await getEntryBySlug('blog', 'my-first-post');
+const { html } = await entry.render();
+---
+
+<div set:html={html}></div>
+```

packages/astro/src/content/internal.ts

@@ -175,9 +175,16 @@ async function render({
 		propagation: 'self',
 	});
 
-	return {
+	// This should match the RenderResult type from template/types.d.ts
+	const renderResult: Record<string, any> = {
 		Content,
 		headings: mod.getHeadings(),
 		remarkPluginFrontmatter: mod.frontmatter,
 	};
+
+	if (!id.endsWith('mdx')) {
+		renderResult.html = mod.compiledContent();
+	}
+
+	return renderResult;
 }

packages/astro/src/content/template/types.d.ts

@@ -1,7 +1,7 @@
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
 	export type CollectionEntry<C extends keyof typeof entryMap> =
-		(typeof entryMap)[C][keyof (typeof entryMap)[C]] & Render;
+		(typeof entryMap)[C][keyof (typeof entryMap)[C]];
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
@@ -57,13 +57,16 @@ declare module 'astro:content' {
 		Required<ContentConfig['collections'][C]>['schema']
 	>;
 
-	type Render = {
-		render(): Promise<{
-			Content: import('astro').MarkdownInstance<{}>['Content'];
-			headings: import('astro').MarkdownHeading[];
-			remarkPluginFrontmatter: Record<string, any>;
-		}>;
+	type RenderResult = {
+		Content: import('astro').MarkdownInstance<{}>['Content'];
+		headings: import('astro').MarkdownHeading[];
+		remarkPluginFrontmatter: Record<string, any>;
 	};
+	type RenderResultWithHtml = RenderResult & {
+		html: string;
+	};
+	type Render = () => Promise<RenderResult>;
+	type RenderWithHtml = () => Promise<RenderResultWithHtml>;
 
 	const entryMap: {
 		// @@ENTRY_MAP@@

packages/astro/src/content/types-generator.ts

@@ -326,7 +326,8 @@ async function writeContentFiles({
 			const entryMetadata = contentTypes[collectionKey][entryKey];
 			const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : 'any';
 			const slugType = JSON.stringify(entryMetadata.slug);
-			contentTypesStr += `${entryKey}: {\n  id: ${entryKey},\n  slug: ${slugType},\n  body: string,\n  collection: ${collectionKey},\n  data: ${dataType}\n},\n`;
+			const renderType = JSON.parse(entryKey).endsWith('.mdx') ? 'Render' : 'RenderWithHtml'; 
+			contentTypesStr += `${entryKey}: {\n  id: ${entryKey},\n  slug: ${slugType},\n  body: string,\n  collection: ${collectionKey},\n  data: ${dataType},\n  render: ${renderType}\n},\n`;
 		}
 		contentTypesStr += `},\n`;
 	}

packages/astro/test/content-collections-render.test.js

@@ -80,6 +80,13 @@ describe('Content Collections - render()', () => {
 			expect(h2).to.have.a.lengthOf(1);
 			expect(h2.attr('data-components-export-applied')).to.equal('true');
 		});
+
+		it('Renders with raw html for markdown content', async () => {
+			const html = await fixture.readFile('/render-with-html/index.html');
+			const $ = cheerio.load(html);
+
+			expect($('p').text()).to.equal('This is a post');
+		});
 	});
 
 	describe('Build - SSR', () => {
@@ -131,6 +138,16 @@ describe('Content Collections - render()', () => {
 			expect(h2).to.have.a.lengthOf(1);
 			expect(h2.attr('data-components-export-applied')).to.equal('true');
 		});
+
+		it('Renders with raw html for markdown content', async () => {
+			const app = await fixture.loadTestAdapterApp();
+			const request = new Request('http://example.com/render-with-html');
+			const response = await app.render(request);
+			const html = await response.text();
+			const $ = cheerio.load(html);
+
+			expect($('p').text()).to.equal('This is a post');
+		});
 	});
 
 	describe('Dev - SSG', () => {
@@ -195,5 +212,15 @@ describe('Content Collections - render()', () => {
 			expect(h2).to.have.a.lengthOf(1);
 			expect(h2.attr('data-components-export-applied')).to.equal('true');
 		});
+
+		it('Renders with raw html for markdown content', async () => {
+			const response = await fixture.fetch('/render-with-html', { method: 'GET' });
+			expect(response.status).to.equal(200);
+
+			const html = await response.text();
+			const $ = cheerio.load(html);
+
+			expect($('p').text()).to.equal('This is a post');
+		});
 	});
 });

packages/astro/test/fixtures/content/src/pages/render-with-html.astro

@@ -0,0 +1,14 @@
+---
+import { getEntryBySlug } from 'astro:content';
+
+const entry = await getEntryBySlug('blog', 'one');
+const { html } = await entry.render();
+---
+<html>
+<head>
+	<title>Launch Week</title>
+</head>
+<body>
+	<main set:html={html} />
+</body>
+</html>