fix(gatsby-plugin-mdx): Pass node API helpers from onCreateNode and s…

…ourceNodes to remark plugins (#20879) * [gatsby-plugin-mdx] Pass node API helpers from onCreateNode to remark plugins * Fix sourceNodes too
gatsbyjs · Jan 27, 2020 · cd150b5 · cd150b5
1 parent 3f2ce1e
commit cd150b5
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/packages/gatsby-plugin-mdx/gatsby/on-create-node.js b/packages/gatsby-plugin-mdx/gatsby/on-create-node.js
@@ -21,6 +21,7 @@ module.exports = async (
     reporter,
     cache,
     pathPrefix,
+    ...helpers
   },
   pluginOptions
 ) => {
@@ -64,6 +65,10 @@ module.exports = async (
       cache,
       pathPrefix,
       options,
+      loadNodeContent,
+      actions,
+      createNodeId,
+      ...helpers,
     },
     { forceDisableCache: true }
   )

diff --git a/packages/gatsby-plugin-mdx/gatsby/source-nodes.js b/packages/gatsby-plugin-mdx/gatsby/source-nodes.js
@@ -52,7 +52,17 @@ async function getCounts({ mdast }) {
 }
 
 module.exports = (
-  { store, pathPrefix, getNode, getNodes, cache, reporter, actions, schema },
+  {
+    store,
+    pathPrefix,
+    getNode,
+    getNodes,
+    cache,
+    reporter,
+    actions,
+    schema,
+    ...helpers
+  },
   pluginOptions
 ) => {
   let mdxHTMLLoader
@@ -105,7 +115,19 @@ module.exports = (
   }
 
   const processMDX = ({ node }) =>
-    genMDX({ node, getNode, getNodes, reporter, cache, pathPrefix, options })
+    genMDX({
+      node,
+      options,
+      store,
+      pathPrefix,
+      getNode,
+      getNodes,
+      cache,
+      reporter,
+      actions,
+      schema,
+      ...helpers,
+    })
 
   // New Code // Schema
   const MdxType = schema.buildObjectType({

diff --git a/packages/gatsby-plugin-mdx/utils/gen-mdx.js b/packages/gatsby-plugin-mdx/utils/gen-mdx.js
@@ -40,7 +40,17 @@ const BabelPluginPluckImports = require(`./babel-plugin-pluck-imports`)
  *  */
 
 module.exports = async function genMDX(
-  { isLoader, node, options, getNode, getNodes, reporter, cache, pathPrefix },
+  {
+    isLoader,
+    node,
+    options,
+    getNode,
+    getNodes,
+    reporter,
+    cache,
+    pathPrefix,
+    ...helpers
+  },
   { forceDisableCache = false } = {}
 ) {
   const pathPrefixCacheStr = pathPrefix || ``
@@ -106,6 +116,7 @@ export const _frontmatter = ${JSON.stringify(data)}`
       reporter,
       cache,
       pathPrefix,
+      ...helpers,
     }
   )
 

diff --git a/packages/gatsby-plugin-mdx/utils/get-source-plugins-as-remark-plugins.js b/packages/gatsby-plugin-mdx/utils/get-source-plugins-as-remark-plugins.js
@@ -16,6 +16,7 @@ module.exports = async function getSourcePluginsAsRemarkPlugins({
   reporter,
   cache,
   pathPrefix,
+  ...helpers
 }) {
   debug(`getSourcePluginsAsRemarkPlugins`)
   let pathPlugin = undefined
@@ -63,6 +64,7 @@ module.exports = async function getSourcePluginsAsRemarkPlugins({
               pathPrefix,
               reporter,
               cache,
+              ...helpers,
             },
             plugin.options || {}
           )