diff --git a/.changeset/shaggy-deers-end.md b/.changeset/shaggy-deers-end.md
new file mode 100644
index 000000000..2c8be9bde
--- /dev/null
+++ b/.changeset/shaggy-deers-end.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/markdoc': patch
+---
+
+Fix missing styles and scripts for components when using `document: { render: null }` in the Markdoc config.
diff --git a/packages/integrations/markdoc/README.md b/packages/integrations/markdoc/README.md
index da5aeb46a..ee110f373 100644
--- a/packages/integrations/markdoc/README.md
+++ b/packages/integrations/markdoc/README.md
@@ -151,9 +151,8 @@ import Heading from './src/components/Heading.astro';
export default defineMarkdocConfig({
nodes: {
heading: {
+ ...nodes.heading, // Preserve default anchor link generation
render: Heading,
- // Preserve default anchor link generation
- ...nodes.heading,
},
},
})
@@ -225,8 +224,8 @@ import { defineMarkdocConfig, nodes } from '@astrojs/markdoc/config';
export default defineMarkdocConfig({
nodes: {
document: {
- render: null, // default 'article'
...nodes.document, // Apply defaults for other options
+ render: null, // default 'article'
},
},
})
@@ -246,9 +245,8 @@ import Quote from './src/components/Quote.astro';
export default defineMarkdocConfig({
nodes: {
blockquote: {
+ ...nodes.blockquote, // Apply Markdoc's defaults for other options
render: Quote,
- // Apply Markdoc's defaults for other options
- ...nodes.blockquote,
},
},
})
diff --git a/packages/integrations/markdoc/components/Renderer.astro b/packages/integrations/markdoc/components/Renderer.astro
index 6571e8c71..4b0dbb3a0 100644
--- a/packages/integrations/markdoc/components/Renderer.astro
+++ b/packages/integrations/markdoc/components/Renderer.astro
@@ -15,4 +15,10 @@ const ast = Markdoc.Ast.fromJSON(stringifiedAst);
const content = Markdoc.transform(ast, config);
---
-
+{
+ Array.isArray(content) ? (
+ content.map(async (c) => )
+ ) : (
+
+ )
+}
diff --git a/packages/integrations/markdoc/components/TreeNode.ts b/packages/integrations/markdoc/components/TreeNode.ts
index 8ad778063..082495a87 100644
--- a/packages/integrations/markdoc/components/TreeNode.ts
+++ b/packages/integrations/markdoc/components/TreeNode.ts
@@ -1,5 +1,4 @@
import type { AstroInstance } from 'astro';
-import { Fragment } from 'astro/jsx-runtime';
import type { RenderableTreeNode } from '@markdoc/markdoc';
import Markdoc from '@markdoc/markdoc';
import {
@@ -106,18 +105,11 @@ export const ComponentNode = createComponent({
propagation: 'self',
});
-export async function createTreeNode(node: RenderableTreeNode | RenderableTreeNode[]): TreeNode {
+export async function createTreeNode(node: RenderableTreeNode): Promise {
if (isHTMLString(node)) {
return { type: 'text', content: node as HTMLString };
} else if (typeof node === 'string' || typeof node === 'number') {
return { type: 'text', content: String(node) };
- } else if (Array.isArray(node)) {
- return {
- type: 'component',
- component: Fragment,
- props: {},
- children: await Promise.all(node.map((child) => createTreeNode(child))),
- };
} else if (node === null || typeof node !== 'object' || !Markdoc.Tag.isTag(node)) {
return { type: 'text', content: '' };
}
@@ -136,7 +128,7 @@ export async function createTreeNode(node: RenderableTreeNode | RenderableTreeNo
};
} else if (isPropagatedAssetsModule(node.name)) {
const { collectedStyles, collectedLinks, collectedScripts } = node.name;
- const component = (await node.name.getMod())?.default ?? Fragment;
+ const component = (await node.name.getMod()).default;
const props = node.attributes;
return {
@@ -160,7 +152,7 @@ export async function createTreeNode(node: RenderableTreeNode | RenderableTreeNo
type PropagatedAssetsModule = {
__astroPropagation: true;
- getMod: () => Promise;
+ getMod: () => Promise;
collectedStyles: string[];
collectedLinks: string[];
collectedScripts: string[];
diff --git a/packages/integrations/markdoc/test/fixtures/render-null/markdoc.config.mjs b/packages/integrations/markdoc/test/fixtures/render-null/markdoc.config.mjs
index 2f87f6de0..01082bfac 100644
--- a/packages/integrations/markdoc/test/fixtures/render-null/markdoc.config.mjs
+++ b/packages/integrations/markdoc/test/fixtures/render-null/markdoc.config.mjs
@@ -1,26 +1,10 @@
-import { defineMarkdocConfig } from '@astrojs/markdoc/config';
+import { defineMarkdocConfig, nodes } from '@astrojs/markdoc/config';
export default defineMarkdocConfig({
nodes: {
document: {
+ ...nodes.document,
render: null,
-
- // Defaults from `Markdoc.nodes.document`
- children: [
- 'heading',
- 'paragraph',
- 'image',
- 'table',
- 'tag',
- 'fence',
- 'blockquote',
- 'comment',
- 'list',
- 'hr',
- ],
- attributes: {
- frontmatter: { render: false },
- },
}
}
})