fix types?

facebook · Oct 25, 2023 · 31aaa9d · 31aaa9d
1 parent 28c6db9
commit 31aaa9d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
@@ -31,7 +31,7 @@
     "fs-extra": "^11.1.1",
     "hastscript": "^7.1.0",
     "image-size": "^1.0.2",
-    "mdast-util-mdx": "^2.0.0",
+    "mdast-util-mdx": "^3.0.0",
     "mdast-util-to-string": "^3.2.0",
     "rehype-raw": "^6.1.1",
     "remark-directive": "^3.0.0",

diff --git a/packages/docusaurus-mdx-loader/src/remark/headings/index.ts b/packages/docusaurus-mdx-loader/src/remark/headings/index.ts
@@ -20,7 +20,6 @@ export default function plugin(): Transformer {
     const slugs = createSlugger();
     visit(root, 'heading', (headingNode: Heading) => {
       const data = headingNode.data ?? (headingNode.data = {});
-      // @ts-expect-error: TODO how to fix?
       const properties = (data.hProperties || (data.hProperties = {})) as {
         id: string;
       };

diff --git a/packages/docusaurus-mdx-loader/src/remark/mdx1Compat/codeCompatPlugin.ts b/packages/docusaurus-mdx-loader/src/remark/mdx1Compat/codeCompatPlugin.ts
@@ -23,14 +23,11 @@ export default function codeCompatPlugin(this: Processor): Transformer {
     visit(root, 'code', (node: Code) => {
       node.data = node.data || {};
 
-      // @ts-expect-error: TODO how to fix?
       node.data.hProperties = node.data.hProperties || {};
-      // @ts-expect-error: TODO how to fix?
       node.data.hProperties.metastring = node.meta;
 
       // Retrocompatible support for live codeblock metastring
       // Not really the appropriate place to handle that :s
-      // @ts-expect-error: TODO how to fix?
       node.data.hProperties.live = node.meta?.split(' ').includes('live');
     });
   };

diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
@@ -14,6 +14,10 @@ import type {Node, Parent} from 'unist';
 import type {Heading, Literal} from 'mdast';
 // @ts-expect-error: TODO see https://github.com/microsoft/TypeScript/issues/49721
 import type {Transformer} from 'unified';
+import type {
+  MdxjsEsm,
+  // @ts-expect-error: TODO see https://github.com/microsoft/TypeScript/issues/49721
+} from 'mdast-util-mdx';
 
 // TODO as of April 2023, no way to import/re-export this ESM type easily :/
 // TODO upgrade to TS 5.3
@@ -119,7 +123,7 @@ const plugin: Plugin = function plugin(
 
 export default plugin;
 
-async function createExportNode(name: string, object: any) {
+async function createExportNode(name: string, object: any): Promise<MdxjsEsm> {
   const {valueToEstree} = await import('estree-util-value-to-estree');
 
   return {

diff --git a/...saurus-mdx-loader/src/vfile-datamap.d.mts → ...ges/docusaurus-mdx-loader/src/types.d.mts b/...saurus-mdx-loader/src/vfile-datamap.d.mts → ...ges/docusaurus-mdx-loader/src/types.d.mts
@@ -19,3 +19,10 @@ declare module 'vfile' {
     contentTitle?: string;
   }
 }
+
+declare module 'unist' {
+  interface Data {
+    hName?: string;
+    hProperties?: Record<string, unknown>;
+  }
+}