2 files changed, 14 insertions, 34 deletions
diff --git a/packages/integrations/markdoc/components/Renderer.astro b/packages/integrations/markdoc/components/Renderer.astro
index 6ae8ee850..5e2b6833a 100644
--- a/packages/integrations/markdoc/components/Renderer.astro
+++ b/packages/integrations/markdoc/components/Renderer.astro
@@ -1,20 +1,17 @@
 ---
-import type { RenderableTreeNode } from '@markdoc/markdoc';
-import type { AstroInstance } from 'astro';
-import { validateComponentsProp } from '../dist/utils.js';
+import type { Config } from '@markdoc/markdoc';
+import Markdoc from '@markdoc/markdoc';
 import { ComponentNode, createTreeNode } from './TreeNode.js';
 
 type Props = {
-	content: RenderableTreeNode;
-	components?: Record<string, AstroInstance['default']>;
+	config: Config;
+	stringifiedAst: string;
 };
 
-const { content, components } = Astro.props as Props;
+const { stringifiedAst, config } = Astro.props as Props;
 
-// Will throw if components is invalid
-if (components) {
-	validateComponentsProp(components);
-}
+const ast = Markdoc.Ast.fromJSON(stringifiedAst);
+const content = Markdoc.transform(ast, config);
 ---
 
-<ComponentNode treeNode={createTreeNode(content, components)} />
+<ComponentNode treeNode={createTreeNode(content)} />
diff --git a/packages/integrations/markdoc/components/TreeNode.ts b/packages/integrations/markdoc/components/TreeNode.ts
index f46355d5c..8a3158589 100644
--- a/packages/integrations/markdoc/components/TreeNode.ts
+++ b/packages/integrations/markdoc/components/TreeNode.ts
@@ -1,10 +1,7 @@
 import type { AstroInstance } from 'astro';
 import type { RenderableTreeNode } from '@markdoc/markdoc';
-import { createComponent, renderComponent, render } from 'astro/runtime/server/index.js';
-// @ts-expect-error Cannot find module 'astro:markdoc-assets' or its corresponding type declarations
-import { Image } from 'astro:markdoc-assets';
 import Markdoc from '@markdoc/markdoc';
-import { MarkdocError, isCapitalized } from '../dist/utils.js';
+import { createComponent, renderComponent, render } from 'astro/runtime/server/index.js';
 
 export type TreeNode =
 	| {
@@ -47,26 +44,17 @@ export const ComponentNode = createComponent({
 	propagation: 'none',
 });
 
-const builtInComponents: Record<string, AstroInstance['default']> = {
-	Image,
-};
-
-export function createTreeNode(
-	node: RenderableTreeNode,
-	userComponents: Record<string, AstroInstance['default']> = {}
-): TreeNode {
-	const components = { ...userComponents, ...builtInComponents };
-
+export function createTreeNode(node: RenderableTreeNode): TreeNode {
 	if (typeof node === 'string' || typeof node === 'number') {
 		return { type: 'text', content: String(node) };
 	} else if (node === null || typeof node !== 'object' || !Markdoc.Tag.isTag(node)) {
 		return { type: 'text', content: '' };
 	}
 
-	if (node.name in components) {
-		const component = components[node.name];
+	if (typeof node.name === 'function') {
+		const component = node.name;
 		const props = node.attributes;
-		const children = node.children.map((child) => createTreeNode(child, components));
+		const children = node.children.map((child) => createTreeNode(child));
 
 		return {
 			type: 'component',
@@ -74,17 +62,12 @@ export function createTreeNode(
 			props,
 			children,
 		};
-	} else if (isCapitalized(node.name)) {
-		throw new MarkdocError({
-			message: `Unable to render ${JSON.stringify(node.name)}.`,
-			hint: 'Did you add this to the "components" prop on your <Content /> component?',
-		});
 	} else {
 		return {
 			type: 'element',
 			tag: node.name,
 			attributes: node.attributes,
-			children: node.children.map((child) => createTreeNode(child, components)),
+			children: node.children.map((child) => createTreeNode(child)),
 		};
 	}
 }