portal: make portal compatible with new gatsby-plugin-mdx

dnbexperience · Aug 6, 2019 · 86b4309 · 86b4309
1 parent c6ecac3
commit 86b4309
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/packages/dnb-design-system-portal/gatsby-config.js b/packages/dnb-design-system-portal/gatsby-config.js
@@ -38,7 +38,7 @@ module.exports = {
     {
       resolve: 'gatsby-plugin-page-creator',
       options: {
-        ignore: ['**/*.md', '**/Examples.js'],
+        ignore: ['**/*.md', '**/Examples.js', '**/*_not_in_use*'],
         path: `${__dirname}/src/docs`, // for .js files
         name: 'docs'
       }
@@ -51,7 +51,7 @@ module.exports = {
       }
     },
     {
-      resolve: 'gatsby-mdx',
+      resolve: 'gatsby-plugin-mdx',
       options: {
         extensions: ['.md'],
         // More info of using plugins: https://github.com/mdx-js/mdx/blob/d4154b8c4a546d0b675826826f85014cc04098c2/docs/plugins.md

diff --git a/packages/dnb-design-system-portal/src/templates/mdx.js b/packages/dnb-design-system-portal/src/templates/mdx.js
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types'
 
 import Head from 'react-helmet'
 import { MDXProvider } from '@mdx-js/react'
-import MDXRenderer from 'gatsby-mdx/mdx-renderer'
+import { MDXRenderer } from 'gatsby-plugin-mdx'
 import { graphql, withPrefix } from 'gatsby'
 
 import Layout from '../shared/parts/Layout'
@@ -19,7 +19,7 @@ export default class MdxTemplate extends PureComponent {
       location,
       data: {
         mdx: {
-          code: { body },
+          body,
           frontmatter: { title, description, fullscreen }
         },
         site: {
@@ -49,15 +49,13 @@ MdxTemplate.propTypes = {
   location: PropTypes.object.isRequired,
   data: PropTypes.shape({
     mdx: PropTypes.shape({
-      code: PropTypes.shape({
-        body: PropTypes.string.isRequired
-      }).isRequired
+      body: PropTypes.string.isRequired
     }).isRequired
   }).isRequired
 }
 
 export const pageQuery = graphql`
-  query($id: String!) {
+  query MDXQuery($id: String!) {
     site {
       siteMetadata {
         description
@@ -69,9 +67,7 @@ export const pageQuery = graphql`
         description
         fullscreen
       }
-      code {
-        body
-      }
+      body
     }
   }
 `