@astrojs/markdoc 0.1.3 → 0.2.0

package/README.md

@@ -143,30 +143,29 @@ Use tags like this fancy "aside" to add some *flair* to your docs.
 
 #### Render Markdoc nodes / HTML elements as Astro components
 
-You may also want to map standard HTML elements like headings and paragraphs to components. For this, you can configure a custom [Markdoc node][markdoc-nodes]. This example overrides Markdoc's `heading` node to render a `Heading` component, and passes through [Markdoc's default attributes for headings](https://markdoc.dev/docs/nodes#built-in-nodes).
+You may also want to map standard HTML elements like headings and paragraphs to components. For this, you can configure a custom [Markdoc node][markdoc-nodes]. This example overrides Markdoc's `heading` node to render a `Heading` component, and passes through Astro's default heading properties to define attributes and generate heading ids / slugs:
 
 ```js
 // markdoc.config.mjs
-import { defineMarkdocConfig, Markdoc } from '@astrojs/markdoc/config';
+import { defineMarkdocConfig, nodes } from '@astrojs/markdoc/config';
 import Heading from './src/components/Heading.astro';
 
 export default defineMarkdocConfig({
   nodes: {
     heading: {
       render: Heading,
-      attributes: Markdoc.nodes.heading.attributes,
+      ...nodes.heading,
     },
   },
 })
 ```
 
-Now, all Markdown headings will render with the `Heading.astro` component, and pass these `attributes` as component props. For headings, Markdoc provides a `level` attribute containing the numeric heading level.
+All Markdown headings will render the `Heading.astro` component and pass `attributes` as component props. For headings, Astro provides the following attributes by default:
 
-This example uses a level 3 heading, automatically passing `level: 3` as the component prop:
+- `level: number` The heading level 1 - 6
+- `id: string` An `id` generated from the heading's text contents. This corresponds to the `slug` generated by the [content `render()` function](https://docs.astro.build/en/guides/content-collections/#rendering-content-to-html).
 
-```md
-### I'm a level 3 heading!
-```
+For example, the heading `### Level 3 heading!` will pass `level: 3` and `id: 'level-3-heading'` as component props.
 
 📚 [Find all of Markdoc's built-in nodes and node attributes on their documentation.](https://markdoc.dev/docs/nodes#built-in-nodes)
 

package/dist/config.d.ts

@@ -1,3 +1,40 @@
 import type { ConfigType as MarkdocConfig } from '@markdoc/markdoc';
-export { default as Markdoc } from '@markdoc/markdoc';
+import _Markdoc from '@markdoc/markdoc';
+export declare const Markdoc: typeof _Markdoc;
+export declare const nodes: {
+    heading: import("@markdoc/markdoc").Schema;
+    document: import("@markdoc/markdoc").Schema;
+    paragraph: import("@markdoc/markdoc").Schema;
+    image: import("@markdoc/markdoc").Schema;
+    fence: import("@markdoc/markdoc").Schema;
+    blockquote: import("@markdoc/markdoc").Schema;
+    item: import("@markdoc/markdoc").Schema;
+    list: import("@markdoc/markdoc").Schema;
+    hr: import("@markdoc/markdoc").Schema;
+    table: import("@markdoc/markdoc").Schema;
+    td: import("@markdoc/markdoc").Schema;
+    th: import("@markdoc/markdoc").Schema;
+    tr: import("@markdoc/markdoc").Schema;
+    tbody: import("@markdoc/markdoc").Schema;
+    thead: import("@markdoc/markdoc").Schema;
+    strong: import("@markdoc/markdoc").Schema;
+    em: import("@markdoc/markdoc").Schema;
+    s: import("@markdoc/markdoc").Schema;
+    inline: import("@markdoc/markdoc").Schema;
+    link: import("@markdoc/markdoc").Schema;
+    code: import("@markdoc/markdoc").Schema;
+    text: import("@markdoc/markdoc").Schema;
+    hardbreak: import("@markdoc/markdoc").Schema;
+    softbreak: import("@markdoc/markdoc").Schema;
+    comment: {
+        attributes: {
+            content: {
+                type: StringConstructor;
+                required: boolean;
+            };
+        };
+    };
+    error: {};
+    node: {};
+};
 export declare function defineMarkdocConfig(config: MarkdocConfig): MarkdocConfig;

package/dist/config.js

@@ -1,8 +1,12 @@
-import { default as default2 } from "@markdoc/markdoc";
+import _Markdoc from "@markdoc/markdoc";
+import { nodes as astroNodes } from "./nodes/index.js";
+const Markdoc = _Markdoc;
+const nodes = { ...Markdoc.nodes, ...astroNodes };
 function defineMarkdocConfig(config) {
   return config;
 }
 export {
-  default2 as Markdoc,
-  defineMarkdocConfig
+  Markdoc,
+  defineMarkdocConfig,
+  nodes
 };

package/dist/index.js

@@ -4,8 +4,8 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { isValidUrl, MarkdocError, parseFrontmatter, prependForwardSlash } from "./utils.js";
 import { emitESMImage } from "astro/assets";
 import { bold, red, yellow } from "kleur/colors";
-import { applyDefaultConfig } from "./default-config.js";
 import { loadMarkdocConfig } from "./load-config.js";
+import { applyDefaultConfig } from "./runtime.js";
 function markdocIntegration(legacyConfig) {
   if (legacyConfig) {
     console.log(
@@ -38,7 +38,7 @@ function markdocIntegration(legacyConfig) {
           async getRenderModule({ entry, viteId }) {
             const ast = Markdoc.parse(entry.body);
             const pluginContext = this;
-            const markdocConfig = applyDefaultConfig(userMarkdocConfig, { entry });
+            const markdocConfig = applyDefaultConfig(userMarkdocConfig, entry);
             const validationErrors = Markdoc.validate(ast, markdocConfig).filter((e) => {
               return (
                 // Ignore `variable-undefined` errors.
@@ -69,24 +69,42 @@ function markdocIntegration(legacyConfig) {
                 filePath: entry._internal.filePath
               });
             }
-            return {
-              code: `import { jsx as h } from 'astro/jsx-runtime';
-import { applyDefaultConfig } from '@astrojs/markdoc/default-config';
-import { Renderer } from '@astrojs/markdoc/components';
-import * as entry from ${JSON.stringify(viteId + "?astroContent")};${markdocConfigResult ? `
-import userConfig from ${JSON.stringify(
-                markdocConfigResult.fileUrl.pathname
-              )};` : ""}${astroConfig.experimental.assets ? `
-import { experimentalAssetsConfig } from '@astrojs/markdoc/experimental-assets-config';` : ""}
+            const res = `import { jsx as h } from 'astro/jsx-runtime';
+						import { Renderer } from '@astrojs/markdoc/components';
+						import { collectHeadings, applyDefaultConfig, Markdoc, headingSlugger } from '@astrojs/markdoc/runtime';
+import * as entry from ${JSON.stringify(viteId + "?astroContentCollectionEntry")};
+${markdocConfigResult ? `import _userConfig from ${JSON.stringify(
+              markdocConfigResult.fileUrl.pathname
+            )};
+const userConfig = _userConfig ?? {};` : "const userConfig = {};"}${astroConfig.experimental.assets ? `
+import { experimentalAssetsConfig } from '@astrojs/markdoc/experimental-assets-config';
+userConfig.nodes = { ...experimentalAssetsConfig.nodes, ...userConfig.nodes };` : ""}
 const stringifiedAst = ${JSON.stringify(
-                /* Double stringify to encode *as* stringified JSON */
-                JSON.stringify(ast)
-              )};
+              /* Double stringify to encode *as* stringified JSON */
+              JSON.stringify(ast)
+            )};
+export function getHeadings() {
+	${/* Yes, we are transforming twice (once from `getHeadings()` and again from <Content /> in case of variables).
+            TODO: propose new `render()` API to allow Markdoc variable passing to `render()` itself,
+            instead of the Content component. Would remove double-transform and unlock variable resolution in heading slugs. */
+            ""}
+	headingSlugger.reset();
+	const headingConfig = userConfig.nodes?.heading;
+	const config = applyDefaultConfig(headingConfig ? { nodes: { heading: headingConfig } } : {}, entry);
+	const ast = Markdoc.Ast.fromJSON(stringifiedAst);
+	const content = Markdoc.transform(ast, config);
+	return collectHeadings(Array.isArray(content) ? content : content.children);
+}
 export async function Content (props) {
-	const config = applyDefaultConfig(${markdocConfigResult ? "{ ...userConfig, variables: { ...userConfig.variables, ...props } }" : "{ variables: props }"}, { entry });${astroConfig.experimental.assets ? `
-config.nodes = { ...experimentalAssetsConfig.nodes, ...config.nodes };` : ""}
-	return h(Renderer, { stringifiedAst, config }); };`
-            };
+	headingSlugger.reset();
+	const config = applyDefaultConfig({
+		...userConfig,
+		variables: { ...userConfig.variables, ...props },
+	}, entry);
+
+	return h(Renderer, { config, stringifiedAst });
+}`;
+            return { code: res };
           },
           contentModuleTypes: await fs.promises.readFile(
             new URL("../template/content-module-types.d.ts", import.meta.url),

package/dist/nodes/heading.d.ts

@@ -0,0 +1,4 @@
+import { type Schema } from '@markdoc/markdoc';
+import Slugger from 'github-slugger';
+export declare const headingSlugger: Slugger;
+export declare const heading: Schema;

package/dist/nodes/heading.js

@@ -0,0 +1,39 @@
+import Markdoc from "@markdoc/markdoc";
+import Slugger from "github-slugger";
+import { getTextContent } from "../runtime.js";
+const headingSlugger = new Slugger();
+function getSlug(attributes, children) {
+  if (attributes.id && typeof attributes.id === "string") {
+    return attributes.id;
+  }
+  const textContent = attributes.content ?? getTextContent(children);
+  let slug = headingSlugger.slug(textContent);
+  if (slug.endsWith("-"))
+    slug = slug.slice(0, -1);
+  return slug;
+}
+const heading = {
+  children: ["inline"],
+  attributes: {
+    id: { type: String },
+    level: { type: Number, required: true, default: 1 }
+  },
+  transform(node, config) {
+    var _a, _b;
+    const { level, ...attributes } = node.transformAttributes(config);
+    const children = node.transformChildren(config);
+    const slug = getSlug(attributes, children);
+    const render = ((_b = (_a = config.nodes) == null ? void 0 : _a.heading) == null ? void 0 : _b.render) ?? `h${level}`;
+    const tagProps = (
+      // For components, pass down `level` as a prop,
+      // alongside `__collectHeading` for our `headings` collector.
+      // Avoid accidentally rendering `level` as an HTML attribute otherwise!
+      typeof render === "function" ? { ...attributes, id: slug, __collectHeading: true, level } : { ...attributes, id: slug }
+    );
+    return new Markdoc.Tag(render, tagProps, children);
+  }
+};
+export {
+  heading,
+  headingSlugger
+};

package/dist/nodes/index.d.ts

@@ -0,0 +1,4 @@
+export { headingSlugger } from './heading.js';
+export declare const nodes: {
+    heading: import("@markdoc/markdoc").Schema;
+};

package/dist/nodes/index.js

@@ -0,0 +1,7 @@
+import { heading } from "./heading.js";
+import { headingSlugger } from "./heading.js";
+const nodes = { heading };
+export {
+  headingSlugger,
+  nodes
+};

package/dist/runtime.d.ts

@@ -0,0 +1,16 @@
+import type { MarkdownHeading } from '@astrojs/markdown-remark';
+import { type ConfigType as MarkdocConfig, type RenderableTreeNode } from '@markdoc/markdoc';
+import type { ContentEntryModule } from 'astro';
+/** Used to reset Slugger cache on each build at runtime */
+export { default as Markdoc } from '@markdoc/markdoc';
+export { headingSlugger } from './nodes/index.js';
+export declare function applyDefaultConfig(config: MarkdocConfig, entry: ContentEntryModule): MarkdocConfig;
+/**
+ * Get text content as a string from a Markdoc transform AST
+ */
+export declare function getTextContent(childNodes: RenderableTreeNode[]): string;
+/**
+ * Collect headings from Markdoc transform AST
+ * for `headings` result on `render()` return value
+ */
+export declare function collectHeadings(children: RenderableTreeNode[]): MarkdownHeading[];

package/dist/runtime.js

@@ -0,0 +1,63 @@
+import Markdoc from "@markdoc/markdoc";
+import { nodes as astroNodes } from "./nodes/index.js";
+import { default as default2 } from "@markdoc/markdoc";
+import { headingSlugger } from "./nodes/index.js";
+function applyDefaultConfig(config, entry) {
+  return {
+    ...config,
+    variables: {
+      entry,
+      ...config.variables
+    },
+    nodes: {
+      ...astroNodes,
+      ...config.nodes
+    }
+    // TODO: Syntax highlighting
+  };
+}
+function getTextContent(childNodes) {
+  let text = "";
+  for (const node of childNodes) {
+    if (typeof node === "string" || typeof node === "number") {
+      text += node;
+    } else if (typeof node === "object" && Markdoc.Tag.isTag(node)) {
+      text += getTextContent(node.children);
+    }
+  }
+  return text;
+}
+const headingLevels = [1, 2, 3, 4, 5, 6];
+function collectHeadings(children) {
+  let collectedHeadings = [];
+  for (const node of children) {
+    if (typeof node !== "object" || !Markdoc.Tag.isTag(node))
+      continue;
+    if (node.attributes.__collectHeading === true && typeof node.attributes.level === "number") {
+      collectedHeadings.push({
+        slug: node.attributes.id,
+        depth: node.attributes.level,
+        text: getTextContent(node.children)
+      });
+      continue;
+    }
+    for (const level of headingLevels) {
+      if (node.name === "h" + level) {
+        collectedHeadings.push({
+          slug: node.attributes.id,
+          depth: level,
+          text: getTextContent(node.children)
+        });
+      }
+    }
+    collectedHeadings.concat(collectHeadings(node.children));
+  }
+  return collectedHeadings;
+}
+export {
+  default2 as Markdoc,
+  applyDefaultConfig,
+  collectHeadings,
+  getTextContent,
+  headingSlugger
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc pages in your Astro site",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -21,22 +21,29 @@
   "exports": {
     ".": "./dist/index.js",
     "./components": "./components/index.ts",
-    "./default-config": "./dist/default-config.js",
+    "./runtime": "./dist/runtime.js",
     "./config": "./dist/config.js",
     "./experimental-assets-config": "./dist/experimental-assets-config.js",
     "./package.json": "./package.json"
   },
+  "files": [
+    "components",
+    "dist",
+    "template"
+  ],
   "dependencies": {
     "@markdoc/markdoc": "^0.2.2",
     "esbuild": "^0.17.12",
+    "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "kleur": "^4.1.5",
     "zod": "^3.17.3"
   },
   "peerDependencies": {
-    "astro": "^2.4.4"
+    "astro": "^2.5.0"
   },
   "devDependencies": {
+    "@astrojs/markdown-remark": "^2.2.1",
     "@types/chai": "^4.3.1",
     "@types/html-escaper": "^3.0.0",
     "@types/mocha": "^9.1.1",
@@ -46,7 +53,7 @@
     "mocha": "^9.2.2",
     "rollup": "^3.20.1",
     "vite": "^4.3.1",
-    "astro": "2.4.4",
+    "astro": "2.5.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {

package/template/content-module-types.d.ts

@@ -2,6 +2,7 @@ declare module 'astro:content' {
 	interface Render {
 		'.mdoc': Promise<{
 			Content(props: Record<string, any>): import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
 		}>;
 	}
 }

package/.turbo/turbo-build.log

@@ -1,4 +0,0 @@
-
-> @astrojs/markdoc@0.1.3 build /home/runner/work/astro/astro/packages/integrations/markdoc
-> astro-scripts build "src/**/*.ts" && tsc
-

package/CHANGELOG.md

@@ -1,138 +0,0 @@
-# @astrojs/markdoc
-
-## 0.1.3
-
-### Patch Changes
-
-- [#7045](https://github.com/withastro/astro/pull/7045) [`3a9f72c7f`](https://github.com/withastro/astro/commit/3a9f72c7f30ed173438fd0a222a094e5997b917d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Improve Markdoc validation errors with full message and file preview.
-
-- Updated dependencies [[`48395c815`](https://github.com/withastro/astro/commit/48395c81522f7527126699c4f185f7b4488a4b9a), [`630f8c8ef`](https://github.com/withastro/astro/commit/630f8c8ef68fedfa393899c13a072e50145895e8)]:
-  - astro@2.4.4
-
-## 0.1.2
-
-### Patch Changes
-
-- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `<pre class="astro-code github-dark">`.
-
-- Updated dependencies [[`818252acd`](https://github.com/withastro/astro/commit/818252acda3c00499cea51ffa0f26d4c2ccd3a02), [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
-  - astro@2.4.0
-
-## 0.1.1
-
-### Patch Changes
-
-- [#6723](https://github.com/withastro/astro/pull/6723) [`73fcc7627`](https://github.com/withastro/astro/commit/73fcc7627e27a001d3ed2f4d046999d91f1aef85) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: when using `render: null` in your config, content is now rendered without a wrapper element.
-
-- Updated dependencies [[`489dd8d69`](https://github.com/withastro/astro/commit/489dd8d69cdd9d7c243cf8bec96051a914984b9c), [`a1a4f45b5`](https://github.com/withastro/astro/commit/a1a4f45b51a80215fa7598da83bd0d9c5acd20d2), [`a1108e037`](https://github.com/withastro/astro/commit/a1108e037115cdb67d03505286c7d3a4fc2a1ff5), [`8b88e4cf1`](https://github.com/withastro/astro/commit/8b88e4cf15c8bea7942b3985380164e0edf7250b), [`d54cbe413`](https://github.com/withastro/astro/commit/d54cbe41349e55f8544212ad9320705f07325920), [`4c347ab51`](https://github.com/withastro/astro/commit/4c347ab51e46f2319d614f8577fe502e3dc816e2), [`ff0430786`](https://github.com/withastro/astro/commit/ff043078630e678348ae4f4757b3015b3b862c16), [`2f2e572e9`](https://github.com/withastro/astro/commit/2f2e572e937fd25451bbc78a05d55b7caa1ca3ec), [`7116c021a`](https://github.com/withastro/astro/commit/7116c021a39eac15a6e1264dfbd11bef0f5d618a)]:
-  - astro@2.2.0
-
-## 0.1.0
-
-### Minor Changes
-
-- [#6653](https://github.com/withastro/astro/pull/6653) [`7c439868a`](https://github.com/withastro/astro/commit/7c439868a3bc7d466418da9af669966014f3d9fe) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Simplify Markdoc configuration with a new `markdoc.config.mjs` file. This lets you import Astro components directly to render as Markdoc tags and nodes, without the need for the previous `components` property. This new configuration also unlocks passing variables to your Markdoc from the `Content` component ([see the new docs](https://docs.astro.build/en/guides/integrations-guide/markdoc/#pass-markdoc-variables)).
-
-  ## Migration
-
-  Move any existing Markdoc config from your `astro.config` to a new `markdoc.config.mjs` file at the root of your project. This should be applied as a default export, with the optional `defineMarkdocConfig()` helper for autocomplete in your editor.
-
-  This example configures an `aside` Markdoc tag. Note that components should be imported and applied to the `render` attribute _directly,_ instead of passing the name as a string:
-
-  ```js
-  // markdoc.config.mjs
-  import { defineMarkdocConfig } from '@astrojs/markdoc/config';
-  import Aside from './src/components/Aside.astro';
-
-  export default defineMarkdocConfig({
-    tags: {
-      aside: {
-        render: Aside,
-      },
-    },
-  });
-  ```
-
-  You should also remove the `components` prop from your `Content` components. Since components are imported into your config directly, this is no longer needed.
-
-  ```diff
-  ---
-  - import Aside from '../components/Aside.astro';
-  import { getEntryBySlug } from 'astro:content';
-
-  const entry = await getEntryBySlug('docs', 'why-markdoc');
-  const { Content } = await entry.render();
-  ---
-
-  <Content
-  - components={{ Aside }}
-  />
-  ```
-
-### Patch Changes
-
-- Updated dependencies [[`1f783e320`](https://github.com/withastro/astro/commit/1f783e32075c20b13063599696644f5d47b75d8d), [`2e92e9aa9`](https://github.com/withastro/astro/commit/2e92e9aa976735c3ddb647152bb9c4850136e386), [`adecda7d6`](https://github.com/withastro/astro/commit/adecda7d6009793c5d20519a997e3b7afb08ad57), [`386336441`](https://github.com/withastro/astro/commit/386336441ad70017eea22db0683591126131db21), [`7c439868a`](https://github.com/withastro/astro/commit/7c439868a3bc7d466418da9af669966014f3d9fe), [`25cd3e574`](https://github.com/withastro/astro/commit/25cd3e574999c1c7294a089ad8c39df27ccdbf17), [`4bf87c64f`](https://github.com/withastro/astro/commit/4bf87c64ff7e9ca49e0f5c27e06bd49faaf60542), [`fc0ed9c53`](https://github.com/withastro/astro/commit/fc0ed9c53cd374860bbdb2503318a55ca09a2662)]:
-  - astro@2.1.8
-
-## 0.0.5
-
-### Patch Changes
-
-- [#6630](https://github.com/withastro/astro/pull/6630) [`cfcf2e2ff`](https://github.com/withastro/astro/commit/cfcf2e2ffdaa68ace5c84329c05b83559a29d638) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Support automatic image optimization for Markdoc images when using `experimental.assets`. You can [follow our Assets guide](https://docs.astro.build/en/guides/assets/#enabling-assets-in-your-project) to enable this feature in your project. Then, start using relative or aliased image sources in your Markdoc files for automatic optimization:
-
-  ```md
-  <!--Relative paths-->
-
-  ![The Milky Way Galaxy](../assets/galaxy.jpg)
-
-  <!--Or configured aliases-->
-
-  ![Houston smiling and looking cute](~/assets/houston-smiling.jpg)
-  ```
-
-- Updated dependencies [[`b7194103e`](https://github.com/withastro/astro/commit/b7194103e39267bf59dcd6ba00f522e424219d16), [`cfcf2e2ff`](https://github.com/withastro/astro/commit/cfcf2e2ffdaa68ace5c84329c05b83559a29d638), [`45da39a86`](https://github.com/withastro/astro/commit/45da39a8642d64eb318840b18dfc2b5ccc6561bc), [`7daef9a29`](https://github.com/withastro/astro/commit/7daef9a2993b5d457f3d243a1ebfd1dd383b3327)]:
-  - astro@2.1.7
-
-## 0.0.4
-
-### Patch Changes
-
-- [#6588](https://github.com/withastro/astro/pull/6588) [`f42f47dc6`](https://github.com/withastro/astro/commit/f42f47dc6a91cdb6534dab0ecbf9e8e85f00ba40) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Allow access to content collection entry information (including parsed frontmatter and the entry slug) from your Markdoc using the `$entry` variable:
-
-  ```mdx
-  ---
-  title: Hello Markdoc!
-  ---
-
-  # {% $entry.data.title %}
-  ```
-
-- [#6607](https://github.com/withastro/astro/pull/6607) [`86273b588`](https://github.com/withastro/astro/commit/86273b5881cc61ebee11d40280b4c0aba8f4bb2e) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: Update Markdoc renderer internals to remove unneeded dependencies
-
-- [#6622](https://github.com/withastro/astro/pull/6622) [`b37b86540`](https://github.com/withastro/astro/commit/b37b865400e77e92878d7e150244acce47e933c6) Thanks [@paulrudy](https://github.com/paulrudy)! - Fix README instructions for installing Markdoc manually.
-
-## 0.0.3
-
-### Patch Changes
-
-- [#6552](https://github.com/withastro/astro/pull/6552) [`392ba3e4d`](https://github.com/withastro/astro/commit/392ba3e4d55f73ce9194bd94a2243f1aa62af079) Thanks [@bluwy](https://github.com/bluwy)! - Fix integration return type
-
-## 0.0.2
-
-### Patch Changes
-
-- [#6494](https://github.com/withastro/astro/pull/6494) [`a13e9d7e3`](https://github.com/withastro/astro/commit/a13e9d7e33baccf51e7d4815f99b481ad174bc57) Thanks [@Yan-Thomas](https://github.com/Yan-Thomas)! - Consistency improvements to several package descriptions
-
-## 0.0.1
-
-### Patch Changes
-
-- [#6209](https://github.com/withastro/astro/pull/6209) [`fec583909`](https://github.com/withastro/astro/commit/fec583909ab62829dc0c1600e2387979365f2b94) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Introduce the (experimental) `@astrojs/markdoc` integration. This unlocks Markdoc inside your Content Collections, bringing support for Astro and UI components in your content. This also improves Astro core internals to make Content Collections extensible to more file types in the future.
-
-  You can install this integration using the `astro add` command:
-
-  ```
-  astro add markdoc
-  ```
-
-  [Read the `@astrojs/markdoc` documentation](https://docs.astro.build/en/guides/integrations-guide/markdoc/) for usage instructions, and browse the [new `with-markdoc` starter](https://astro.new/with-markdoc) to try for yourself.

package/dist/default-config.d.ts

@@ -1,5 +0,0 @@
-import type { ConfigType as MarkdocConfig } from '@markdoc/markdoc';
-import type { ContentEntryModule } from 'astro';
-export declare function applyDefaultConfig(config: MarkdocConfig, ctx: {
-    entry: ContentEntryModule;
-}): MarkdocConfig;

package/dist/default-config.js

@@ -1,13 +0,0 @@
-function applyDefaultConfig(config, ctx) {
-  return {
-    ...config,
-    variables: {
-      entry: ctx.entry,
-      ...config.variables
-    }
-    // TODO: heading ID calculation, Shiki syntax highlighting
-  };
-}
-export {
-  applyDefaultConfig
-};

package/src/config.ts

@@ -1,6 +0,0 @@
-import type { ConfigType as MarkdocConfig } from '@markdoc/markdoc';
-export { default as Markdoc } from '@markdoc/markdoc';
-
-export function defineMarkdocConfig(config: MarkdocConfig): MarkdocConfig {
-	return config;
-}

package/src/default-config.ts

@@ -1,18 +0,0 @@
-import type { ConfigType as MarkdocConfig } from '@markdoc/markdoc';
-import type { ContentEntryModule } from 'astro';
-
-export function applyDefaultConfig(
-	config: MarkdocConfig,
-	ctx: {
-		entry: ContentEntryModule;
-	}
-): MarkdocConfig {
-	return {
-		...config,
-		variables: {
-			entry: ctx.entry,
-			...config.variables,
-		},
-		// TODO: heading ID calculation, Shiki syntax highlighting
-	};
-}

package/src/experimental-assets-config.ts

@@ -1,29 +0,0 @@
-import type { Config as MarkdocConfig } from '@markdoc/markdoc';
-import Markdoc from '@markdoc/markdoc';
-//@ts-expect-error Cannot find module 'astro:assets' or its corresponding type declarations.
-import { Image } from 'astro:assets';
-
-// Separate module to only import `astro:assets` when
-// `experimental.assets` flag is set in a project.
-// TODO: merge with `./default-config.ts` when `experimental.assets` is baselined.
-export const experimentalAssetsConfig: MarkdocConfig = {
-	nodes: {
-		image: {
-			attributes: {
-				...Markdoc.nodes.image.attributes,
-				__optimizedSrc: { type: 'Object' },
-			},
-			transform(node, config) {
-				const attributes = node.transformAttributes(config);
-				const children = node.transformChildren(config);
-
-				if (node.type === 'image' && '__optimizedSrc' in node.attributes) {
-					const { __optimizedSrc, ...rest } = node.attributes;
-					return new Markdoc.Tag(Image, { ...rest, src: __optimizedSrc }, children);
-				} else {
-					return new Markdoc.Tag('img', attributes, children);
-				}
-			},
-		},
-	},
-};