From 59d9ae5df5db4b914e4aa0ff65cd73491859ffb4 Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Mon, 31 Jan 2022 19:16:41 +0100 Subject: [PATCH] Update `mdast-util-mdx` --- lib/plugin/remark-mdx.js | 8 +++++--- package.json | 2 +- test/core.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/plugin/remark-mdx.js b/lib/plugin/remark-mdx.js index d0d3037..2a89e33 100644 --- a/lib/plugin/remark-mdx.js +++ b/lib/plugin/remark-mdx.js @@ -1,6 +1,8 @@ /** * @typedef {import('mdast').Root} Root - * @typedef {import('micromark-extension-mdxjs').Options} Options + * @typedef {import('micromark-extension-mdxjs').Options} MicromarkOptions + * @typedef {import('mdast-util-mdx').ToMarkdownOptions} ToMarkdownOptions + * @typedef {MicromarkOptions & ToMarkdownOptions} Options * * @typedef {import('mdast-util-mdx')} DoNotTouchAsThisImportIncludesMdxInTree */ @@ -17,8 +19,8 @@ export function remarkMdx(options = {}) { const data = this.data() add('micromarkExtensions', mdxjs(options)) - add('fromMarkdownExtensions', mdxFromMarkdown) - add('toMarkdownExtensions', mdxToMarkdown) + add('fromMarkdownExtensions', mdxFromMarkdown()) + add('toMarkdownExtensions', mdxToMarkdown(options)) /** * @param {string} field diff --git a/package.json b/package.json index 92ba899..3b38a16 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "got": "^11.0.0", "hast-util-to-estree": "^2.0.0", "markdown-extensions": "^1.0.0", - "mdast-util-mdx": "^1.0.0", + "mdast-util-mdx": "^2.0.0", "micromark-extension-mdxjs": "^1.0.0", "periscopic": "^3.0.0", "remark-parse": "^10.0.0", diff --git a/test/core.js b/test/core.js index 1b1b730..763d9e6 100644 --- a/test/core.js +++ b/test/core.js @@ -709,13 +709,13 @@ export default function Layout({children}) { remarkPlugins: [ () => (/** @type {Root} */ tree) => { tree.children.unshift({ - // @ts-expect-error MDXHAST. type: 'mdxjsEsm', value: '', data: { estree: { type: 'Program', comments: [], + sourceType: 'module', body: [ { type: 'VariableDeclaration',