diff --git a/.remarkrc.js b/.remarkrc.js
index 65762bc51..4c28949fd 100644
--- a/.remarkrc.js
+++ b/.remarkrc.js
@@ -1,7 +1,6 @@
 module.exports = {
   plugins: [
     './packages/remark-mdx',
-    './packages/remark-mdxjs',
     'preset-wooorm',
     'preset-prettier',
     ['retext', false],
diff --git a/docs/advanced/typescript.mdx b/docs/advanced/typescript.mdx
index f45cb74f5..1b4acf746 100644
--- a/docs/advanced/typescript.mdx
+++ b/docs/advanced/typescript.mdx
@@ -15,8 +15,6 @@ improve the developer experience for TypeScript users.
 - `@mdx-js/runtime`
 - `@mdx-js/vue`
 - `remark-mdx`
-- `remark-mdx-remove-exports`
-- `remark-mdx-remove-imports`
 
 Include types, no additional setup needed.
 
diff --git a/packages/gatsby-theme-mdx/package.json b/packages/gatsby-theme-mdx/package.json
index 679b8ad8f..308eb5df0 100644
--- a/packages/gatsby-theme-mdx/package.json
+++ b/packages/gatsby-theme-mdx/package.json
@@ -47,10 +47,9 @@
     "react-helmet": "6.1.0",
     "react-live": "2.2.2",
     "remark-emoji": "2.1.0",
-    "remark-mdx-remove-exports": "^2.0.0-next.8",
-    "remark-mdx-remove-imports": "^2.0.0-next.8",
     "remark-slug": "6.0.0",
-    "theme-ui": "0.3.4"
+    "theme-ui": "0.3.4",
+    "unist-util-remove": "^2.0.0"
   },
   "gitHead": "bf7deab69996449cb99c2217dff75e65855eb2c1"
 }
diff --git a/packages/gatsby-theme-mdx/src/components/playground-editor.js b/packages/gatsby-theme-mdx/src/components/playground-editor.js
index c7603ab7d..ecdc48f98 100644
--- a/packages/gatsby-theme-mdx/src/components/playground-editor.js
+++ b/packages/gatsby-theme-mdx/src/components/playground-editor.js
@@ -5,18 +5,19 @@ import {MDXProvider, mdx as createElement} from '@mdx-js/react'
 import * as Rebass from '@rebass/emotion'
 import {ThemeContext} from '@emotion/core'
 import {css} from 'theme-ui'
-import removeImports from 'remark-mdx-remove-imports'
-import removeExports from 'remark-mdx-remove-exports'
+import remove from 'unist-util-remove'
 
 import CodeBlock from './code-block'
 
+const removeEsm = () => tree => remove(tree, 'mdxjsEsm')
+
 const transformCode = src => {
   let transpiledMDX = ''
 
   try {
     transpiledMDX = mdx.sync(src, {
       skipExport: true,
-      remarkPlugins: [removeImports, removeExports]
+      remarkPlugins: [removeEsm]
     })
   } catch (_e) {
     return ''
diff --git a/packages/mdx/index.js b/packages/mdx/index.js
index 1de27f3d6..668c57eaf 100644
--- a/packages/mdx/index.js
+++ b/packages/mdx/index.js
@@ -1,7 +1,6 @@
 const unified = require('unified')
 const remarkParse = require('remark-parse')
 const remarkMdx = require('remark-mdx')
-const remarkMdxJs = require('remark-mdxjs')
 const squeeze = require('remark-squeeze-paragraphs')
 const mdxAstToMdxHast = require('./mdx-ast-to-mdx-hast')
 const mdxHastToJsx = require('./mdx-hast-to-jsx')
@@ -12,7 +11,6 @@ function createMdxAstCompiler(options = {}) {
   return unified()
     .use(remarkParse)
     .use(remarkMdx)
-    .use(remarkMdxJs)
     .use(squeeze)
     .use(options.remarkPlugins)
     .use(mdxAstToMdxHast)
diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js
index 9b7ea9eba..8ee8c7e9a 100644
--- a/packages/mdx/mdx-ast-to-mdx-hast.js
+++ b/packages/mdx/mdx-ast-to-mdx-hast.js
@@ -61,17 +61,20 @@ function mdxAstToMdxHast() {
         export(h, node) {
           return Object.assign({}, node, {type: 'export'})
         },
-        mdxBlockElement(h, node) {
+        mdxjsEsm(h, node) {
+          return Object.assign({}, node, {type: 'mdxjsEsm'})
+        },
+        mdxJsxFlowElement(h, node) {
           return Object.assign({}, node, {children: all(h, node)})
         },
-        mdxSpanElement(h, node) {
+        mdxJsxTextElement(h, node) {
           return Object.assign({}, node, {children: all(h, node)})
         },
-        mdxBlockExpression(h, node) {
-          return Object.assign({}, node, {type: 'mdxBlockExpression'})
+        mdxFlowExpression(h, node) {
+          return Object.assign({}, node, {type: 'mdxFlowExpression'})
         },
-        mdxSpanExpression(h, node) {
-          return Object.assign({}, node, {type: 'mdxSpanExpression'})
+        mdxTextExpression(h, node) {
+          return Object.assign({}, node, {type: 'mdxTextExpression'})
         }
       }
     })
diff --git a/packages/mdx/mdx-hast-to-jsx.js b/packages/mdx/mdx-hast-to-jsx.js
index 22cf664f8..48327af3d 100644
--- a/packages/mdx/mdx-hast-to-jsx.js
+++ b/packages/mdx/mdx-hast-to-jsx.js
@@ -1,12 +1,17 @@
 const {transformSync} = require('@babel/core')
 const uniq = require('lodash.uniq')
-const {serializeTags} = require('remark-mdx/lib/serialize/mdx-element')
-const serializeMdxExpression = require('remark-mdx/lib/serialize/mdx-expression')
+const encode = require('stringify-entities/light')
 const toH = require('hast-to-hyperscript')
+const recast = require('recast')
 const BabelPluginApplyMdxProp = require('babel-plugin-apply-mdx-type-prop')
 const BabelPluginExtractImportNames = require('babel-plugin-extract-import-names')
 const BabelPluginExtractExportNames = require('babel-plugin-extract-export-names')
 
+// To do: `recast` might be heavy (have to check), and `astring` might be a good
+// alternative.
+// However, `astring` doesn’t support JSX.
+// When we start compiling JSX away, `astring` might be a good fit though.
+
 function toJSX(node, parentNode = {}, options = {}) {
   if (node.type === 'root') {
     return serializeRoot(node, options)
@@ -21,18 +26,14 @@ function toJSX(node, parentNode = {}, options = {}) {
     return serializeText(node, options, parentNode)
   }
 
-  if (node.type === 'mdxBlockExpression' || node.type === 'mdxSpanExpression') {
+  if (node.type === 'mdxFlowExpression' || node.type === 'mdxTextExpression') {
     return serializeMdxExpression(node)
   }
 
   // To do: pass `parentName` in?
-  if (node.type === 'mdxBlockElement' || node.type === 'mdxSpanElement') {
+  if (node.type === 'mdxJsxFlowElement' || node.type === 'mdxJsxTextElement') {
     return serializeComponent(node, options, parentNode)
   }
-
-  if (node.type === 'import' || node.type === 'export') {
-    return serializeEsSyntax(node)
-  }
 }
 
 function serializeRoot(node, options) {
@@ -42,31 +43,28 @@ function serializeRoot(node, options) {
     wrapExport
   } = options
 
-  const groups = {import: [], export: [], rest: []}
+  const groups = {mdxjsEsm: [], rest: []}
 
-  for (const child of node.children) {
-    groups[
-      child.type === 'import' || child.type === 'export' ? child.type : 'rest'
-    ].push(child)
-  }
+  node.children.forEach(child => {
+    groups[child.type === 'mdxjsEsm' ? child.type : 'rest'].push(child)
+  })
 
   // Find a default export, assumes there’s zero or one.
-  const defaultExport = groups.export.find(child => child.default)
-
-  const layout = defaultExport
-    ? defaultExport.value
-        .replace(/^export\s+default\s+/, '')
-        .replace(/;\s*$/, '')
-    : null
-
-  const importStatements = groups.import
-    .map(childNode => toJSX(childNode, node))
-    .join('\n')
-
-  const exportStatements = groups.export
-    .filter(child => !child.default)
-    .map(childNode => toJSX(childNode, node))
-    .join('\n')
+  const importStatements = []
+  const exportStatements = []
+  let layout
+
+  groups.mdxjsEsm.forEach(child => {
+    child.data.estree.body.forEach(eschild => {
+      if (eschild.type === 'ImportDeclaration') {
+        importStatements.push(recast.prettyPrint(eschild).code)
+      } else if (eschild.type === 'ExportDefaultDeclaration') {
+        layout = recast.prettyPrint(eschild.declaration).code
+      } else {
+        exportStatements.push(recast.prettyPrint(eschild).code)
+      }
+    })
+  })
 
   const doc = groups.rest
     .map(childNode => toJSX(childNode, node, options))
@@ -85,7 +83,9 @@ MDXContent.isMDXComponent = true`
   // Check JSX nodes against imports
   const babelPluginExtractImportNamesInstance = new BabelPluginExtractImportNames()
   const babelPluginExtractExportNamesInstance = new BabelPluginExtractExportNames()
-  const importsAndExports = [importStatements, exportStatements].join('\n')
+  const importsAndExports = []
+    .concat(importStatements, exportStatements)
+    .join('\n')
 
   transformSync(importsAndExports, {
     configFile: false,
@@ -115,15 +115,18 @@ MDXContent.isMDXComponent = true`
     ]
   }).code
 
-  const exportStatementsPostMdxTypeProps = transformSync(exportStatements, {
-    configFile: false,
-    babelrc: false,
-    plugins: [
-      require('@babel/plugin-syntax-jsx'),
-      require('@babel/plugin-syntax-object-rest-spread'),
-      babelPluginApplyMdxPropToExportsInstance.plugin
-    ]
-  }).code
+  const exportStatementsPostMdxTypeProps = transformSync(
+    exportStatements.join('\n'),
+    {
+      configFile: false,
+      babelrc: false,
+      plugins: [
+        require('@babel/plugin-syntax-jsx'),
+        require('@babel/plugin-syntax-object-rest-spread'),
+        babelPluginApplyMdxPropToExportsInstance.plugin
+      ]
+    }
+  ).code
 
   const allJsxNames = [
     ...babelPluginApplyMdxPropInstance.state.names,
@@ -187,12 +190,10 @@ function serializeElement(node, options, parentNode) {
 }
 
 function serializeComponent(node, options) {
+  const tags = serializeTags(node)
   let content = serializeChildren(node, options)
-  const tags = serializeTags(
-    Object.assign({}, node, {children: content ? ['!'] : []})
-  )
 
-  if (node.type === 'mdxBlockElement' && content) {
+  if (node.type === 'mdxJsxFlowElement' && content) {
     content = '\n' + content + '\n'
   }
 
@@ -212,10 +213,6 @@ function serializeText(node, options, parentNode) {
   return toTemplateLiteral(node.value)
 }
 
-function serializeEsSyntax(node) {
-  return node.value
-}
-
 function serializeChildren(node, options) {
   const children = node.children || []
   const childOptions = Object.assign({}, options, {
@@ -261,3 +258,91 @@ function compile(options = {}) {
 module.exports = compile
 compile.default = compile
 compile.toJSX = toJSX
+
+// To do: this is all extracted (and simplified) from `mdast-util-mdx-jsx` for
+// now.
+// We can remove it when we drop JSX!
+
+const eol = /\r?\n|\r/g
+
+function serializeTags(node) {
+  const selfClosing = node.name && (!node.children || !node.children.length)
+  const attributes = []
+  let index = -1
+  let attribute
+  let result
+
+  // None.
+  if (node.attributes && node.attributes.length) {
+    if (!node.name) {
+      throw new Error('Cannot serialize fragment w/ attributes')
+    }
+
+    while (++index < node.attributes.length) {
+      attribute = node.attributes[index]
+
+      if (attribute.type === 'mdxJsxExpressionAttribute') {
+        result = '{' + (attribute.value || '') + '}'
+      } else {
+        if (!attribute.name) {
+          throw new Error('Cannot serialize attribute w/o name')
+        }
+
+        result =
+          attribute.name +
+          (attribute.value == null
+            ? ''
+            : '=' +
+              (typeof attribute.value === 'object'
+                ? '{' + (attribute.value.value || '') + '}'
+                : '"' + encode(attribute.value, {subset: ['"']}) + '"'))
+      }
+
+      attributes.push(result)
+    }
+  }
+
+  return {
+    open:
+      '<' +
+      (node.name || '') +
+      (node.type === 'mdxJsxFlowElement' && attributes.length > 1
+        ? // Flow w/ multiple attributes.
+          '\n' + indent(attributes.join('\n')) + '\n'
+        : attributes.length // Text or flow w/ a single attribute.
+        ? ' ' + dedentStart(indent(attributes.join(' ')))
+        : '') +
+      (selfClosing ? '/' : '') +
+      '>',
+    close: selfClosing ? '' : '</' + (node.name || '') + '>'
+  }
+}
+
+function serializeMdxExpression(node) {
+  const value = node.value || ''
+  return '{' + (node.type === 'mdxFlowExpression' ? indent(value) : value) + '}'
+}
+
+function dedentStart(value) {
+  return value.replace(/^ +/, '')
+}
+
+function indent(value) {
+  const result = []
+  let start = 0
+  let match
+
+  while ((match = eol.exec(value))) {
+    one(value.slice(start, match.index))
+    result.push(match[0])
+    start = match.index + match[0].length
+  }
+
+  one(value.slice(start))
+
+  return result.join('')
+
+  function one(slice) {
+    result.push((slice ? '  ' : '') + slice)
+  }
+}
diff --git a/packages/mdx/package.json b/packages/mdx/package.json
index afcb01dbc..de527f7c2 100644
--- a/packages/mdx/package.json
+++ b/packages/mdx/package.json
@@ -52,18 +52,20 @@
     "detab": "2.0.3",
     "hast-to-hyperscript": "9.0.0",
     "lodash.uniq": "4.5.0",
-    "mdast-util-to-hast": "9.1.0",
+    "mdast-util-to-hast": "10.0.1",
+    "recast": "^0.20.4",
     "remark-mdx": "^2.0.0-next.8",
-    "remark-mdxjs": "^2.0.0-next.8",
-    "remark-parse": "8.0.2",
+    "remark-parse": "9.0.0",
     "remark-squeeze-paragraphs": "4.0.0",
+    "stringify-entities": "^3.1.0",
     "unified": "9.0.0",
     "unist-builder": "2.0.3"
   },
   "devDependencies": {
-    "remark-footnotes": "1.0.0",
+    "remark-footnotes": "3.0.0",
+    "remark-gfm": "1.0.0",
     "rehype-katex": "^4.0.0",
-    "remark-math": "^3.0.0"
+    "remark-math": "^4.0.0"
   },
   "gitHead": "bf7deab69996449cb99c2217dff75e65855eb2c1"
 }
diff --git a/packages/mdx/test/index.test.js b/packages/mdx/test/index.test.js
index 09f2489c5..3a37c5900 100644
--- a/packages/mdx/test/index.test.js
+++ b/packages/mdx/test/index.test.js
@@ -8,6 +8,7 @@ const mdx = require('..')
 const toMdxHast = require('../mdx-ast-to-mdx-hast')
 const toJsx = require('../mdx-hast-to-jsx')
 const footnotes = require('remark-footnotes')
+const gfm = require('remark-gfm')
 const math = require('remark-math')
 const katex = require('rehype-katex')
 
@@ -257,7 +258,9 @@ describe('@mdx-js/mdx', () => {
   })
 
   it('should support tables in markdown', async () => {
-    const Content = await run('| A | B |\n| :- | -: |\n| a | b |')
+    const Content = await run('| A | B |\n| :- | -: |\n| a | b |', {
+      remarkPlugins: [gfm]
+    })
 
     expect(renderToStaticMarkup(<Content />)).toEqual(
       renderToStaticMarkup(
@@ -305,13 +308,14 @@ describe('@mdx-js/mdx', () => {
     expect.assertions(2)
 
     const plugin = () => tree => {
-      expect(tree.children[0]).toEqual({
-        type: 'import',
+      // Ignore the subtree at `data.estree`.
+      expect(Object.assign({}, tree.children[0], {data: undefined})).toEqual({
+        type: 'mdxjsEsm',
         value: 'import X from "y"',
+        data: undefined,
         position: {
           start: {line: 1, column: 1, offset: 0},
-          end: {line: 1, column: 18, offset: 17},
-          indent: []
+          end: {line: 1, column: 18, offset: 17}
         }
       })
     }
@@ -324,7 +328,9 @@ describe('@mdx-js/mdx', () => {
   it('should crash on incorrect imports', async () => {
     expect(() => {
       mdx.sync('import a')
-    }).toThrow(/unknown: Unexpected token/)
+    }).toThrow(
+      /Could not parse import\/exports with acorn: SyntaxError: Unexpected token/
+    )
   })
 
   it('should support import as a word when it’s not the top level', async () => {
@@ -348,13 +354,14 @@ describe('@mdx-js/mdx', () => {
     expect.assertions(2)
 
     const plugin = () => tree => {
-      expect(tree.children[0]).toEqual({
-        type: 'export',
+      // Ignore the subtree at `data.estree`.
+      expect(Object.assign({}, tree.children[0], {data: undefined})).toEqual({
+        type: 'mdxjsEsm',
         value: 'export const A = () => <b>!</b>',
+        data: undefined,
         position: {
           start: {line: 1, column: 1, offset: 0},
-          end: {line: 1, column: 32, offset: 31},
-          indent: []
+          end: {line: 1, column: 32, offset: 31}
         }
       })
     }
@@ -369,7 +376,9 @@ describe('@mdx-js/mdx', () => {
   it('should crash on incorrect exports', async () => {
     expect(() => {
       mdx.sync('export a')
-    }).toThrow(/unknown: Unexpected token/)
+    }).toThrow(
+      /Could not parse import\/exports with acorn: SyntaxError: Unexpected token/
+    )
   })
 
   it('should support export as a word when it’s not the top level', async () => {
@@ -443,7 +452,7 @@ describe('@mdx-js/mdx', () => {
 
   it('should support semicolons in the default export', async () => {
     const Content = await run(
-      'export default props => <section {...props} />;;\n\nx'
+      'export default props => <section {...props} />;\n\nx'
     )
 
     expect(renderToStaticMarkup(<Content />)).toEqual(
@@ -641,11 +650,8 @@ describe('@mdx-js/mdx', () => {
   it('should support an escaped dollar in text', async () => {
     const Content = await run('\\$')
 
-    // To do: should be `$` according to CM.
-    // Old GFM and the version of remark used in MDX do not support this, but
-    // CommonMark and latest remark do.
     expect(renderToStaticMarkup(<Content />)).toEqual(
-      renderToStaticMarkup(<p>\$</p>)
+      renderToStaticMarkup(<p>$</p>)
     )
   })
 })
@@ -725,7 +731,7 @@ describe('mdx-ast-to-mdx-hast', () => {
       children: [
         {
           type: 'paragraph',
-          children: [{type: 'mdxSpanExpression', value: '1 + 1'}]
+          children: [{type: 'mdxTextExpression', value: '1 + 1'}]
         }
       ]
     }
@@ -739,7 +745,7 @@ describe('mdx-ast-to-mdx-hast', () => {
           type: 'element',
           tagName: 'p',
           properties: {},
-          children: [{type: 'mdxSpanExpression', value: '1 + 1'}]
+          children: [{type: 'mdxTextExpression', value: '1 + 1'}]
         }
       ]
     })
@@ -754,7 +760,7 @@ describe('mdx-hast-to-jsx', () => {
         {
           type: 'element',
           tagName: 'x',
-          children: [{type: 'mdxSpanExpression', value: '1 + 1'}]
+          children: [{type: 'mdxTextExpression', value: '1 + 1'}]
         }
       ]
     }
@@ -769,7 +775,7 @@ describe('mdx-hast-to-jsx', () => {
 describe('mdx-hast-to-jsx.toJSX', () => {
   it('should be a function that serializes mdxhast nodes', () => {
     expect(toJsx.toJSX({type: 'element', tagName: 'x'})).toEqual('<x/>')
-    expect(toJsx.toJSX({type: 'mdxSpanExpression', value: '1 + 1'})).toEqual(
+    expect(toJsx.toJSX({type: 'mdxTextExpression', value: '1 + 1'})).toEqual(
       '{1 + 1}'
     )
   })
diff --git a/packages/mdx/types/mdx-test.ts b/packages/mdx/types/mdx-test.ts
index 92d118398..cb8aded6d 100644
--- a/packages/mdx/types/mdx-test.ts
+++ b/packages/mdx/types/mdx-test.ts
@@ -2,26 +2,20 @@ import * as mdx from '@mdx-js/mdx'
 
 mdx('# title') // $ExpectType Promise<string>
 mdx('# title', {}) // $ExpectType Promise<string>
-mdx('# title', {footnotes: false}) // $ExpectType Promise<string>
 mdx('# title', {skipExport: false}) // $ExpectType Promise<string>
 mdx('# title', {wrapExport: 'React.memo'}) // $ExpectType Promise<string>
 mdx('# title', {rehypePlugins: [() => () => ({type: 'test'})]}) // $ExpectType Promise<string>
 mdx('# title', {remarkPlugins: [() => () => ({type: 'test'})]}) // $ExpectType Promise<string>
-mdx('# title', {compilers: []}) // $ExpectType Promise<string>
 
 mdx.sync('# title') // $ExpectType string
 mdx.sync('# title', {}) // $ExpectType string
-mdx.sync('# title', {footnotes: false}) // $ExpectType string
 mdx.sync('# title', {skipExport: false}) // $ExpectType string
 mdx.sync('# title', {wrapExport: 'React.memo'}) // $ExpectType string
 mdx.sync('# title', {rehypePlugins: [() => () => ({type: 'test'})]}) // $ExpectType string
 mdx.sync('# title', {remarkPlugins: [() => () => ({type: 'test'})]}) // $ExpectType string
-mdx.sync('# title', {compilers: []}) // $ExpectType string
 
 mdx.createMdxAstCompiler() // $ExpectType Processor<Settings>
-mdx.createMdxAstCompiler({footnotes: false}) // $ExpectType Processor<Settings>
 mdx.createMdxAstCompiler({skipExport: false}) // $ExpectType Processor<Settings>
 mdx.createMdxAstCompiler({wrapExport: 'React.memo'}) // $ExpectType Processor<Settings>
 mdx.createMdxAstCompiler({rehypePlugins: [() => () => ({type: 'test'})]}) // $ExpectType Processor<Settings>
 mdx.createMdxAstCompiler({remarkPlugins: [() => () => ({type: 'test'})]}) // $ExpectType Processor<Settings>
-mdx.createMdxAstCompiler({compilers: []}) // $ExpectType Processor<Settings>
diff --git a/packages/remark-mdx-remove-exports/index.js b/packages/remark-mdx-remove-exports/index.js
deleted file mode 100644
index 2381a7bf4..000000000
--- a/packages/remark-mdx-remove-exports/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const remove = require('unist-util-remove')
-
-module.exports = _options => tree => {
-  return remove(tree, 'export')
-}
diff --git a/packages/remark-mdx-remove-exports/package.json b/packages/remark-mdx-remove-exports/package.json
index 39723f790..01ae684d7 100644
--- a/packages/remark-mdx-remove-exports/package.json
+++ b/packages/remark-mdx-remove-exports/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "remark-mdx-remove-exports",
   "version": "2.0.0-next.8",
   "description": "Remove exports from the MDX AST",
@@ -42,8 +43,8 @@
     "unist-util-remove": "2.0.0"
   },
   "devDependencies": {
-    "remark-parse": "^8.0.0",
-    "remark-stringify": "^8.0.0",
+    "remark-parse": "^9.0.0",
+    "remark-stringify": "^9.0.1",
     "unified": "^9.2.0"
   },
   "gitHead": "bf7deab69996449cb99c2217dff75e65855eb2c1"
diff --git a/packages/remark-mdx-remove-exports/readme.md b/packages/remark-mdx-remove-exports/readme.md
index 009821bf3..62551e512 100644
--- a/packages/remark-mdx-remove-exports/readme.md
+++ b/packages/remark-mdx-remove-exports/readme.md
@@ -4,73 +4,15 @@
 [![lerna][lerna-badge]][lerna]
 [![Join the community on Spectrum][spectrum-badge]][spectrum]
 
-Remove export nodes from the [MDXAST][].
-This is useful for scenarios where the exports aren’t needed like an
-MDX playground.
+Deprecated!
 
-## Installation
+Created for but no longer used in [MDX](https://mdxjs.com).
 
-[npm][]:
-
-```shell
-npm install --save remark-mdx-remove-exports
-```
-
-## Usage
-
-Say we have the following MDX file, `example.mdx`:
-
-```markdown
-import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-```
-
-And our script, `example.js`, looks as follows:
-
-```javascript
-const vfile = require('to-vfile')
-const remark = require('remark')
-const mdx = require('remark-mdx')
-const mdxjs = require('remark-mdxjs')
-const removeExports = require('remark-mdx-remove-exports')
-
-remark()
-  .use(mdx)
-  .use(mdxjs)
-  .use(removeExports)
-  .process(vfile.readSync('example.md'), function (err, file) {
-    if (err) throw err
-    console.log(String(file))
-  })
-```
-
-Now, running `node example` yields:
-
-```markdown
-import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-# Hello, world!
-
-This is a paragraph
-```
-
-## Contribute
-
-See the [Support][] and [Contributing][] guidelines on the MDX website for ways
-to (get) help.
-
-This project has a [Code of Conduct][coc].
-By interacting with this repository, organisation, or community you agree to
-abide by its terms.
+Used to removes MDX@1 `export` nodes.
+MDX@2 includes `mdxjsEsm` nodes for both import/exports.
+Those can be removed with
+[`unist-util-remove`](https://github.com/syntax-tree/unist-util-remove)
+used as `remove(tree, 'mdxjsEsm')`.
 
 ## License
 
diff --git a/packages/remark-mdx-remove-exports/test/__snapshots__/test.js.snap b/packages/remark-mdx-remove-exports/test/__snapshots__/test.js.snap
deleted file mode 100644
index 50d7447bc..000000000
--- a/packages/remark-mdx-remove-exports/test/__snapshots__/test.js.snap
+++ /dev/null
@@ -1,16 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`removes exports 1`] = `
-"import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-# Hello, world!
-
-This is a paragraph
-
-\`\`\`js
-const foo = 'bar'
-\`\`\`
-"
-`;
diff --git a/packages/remark-mdx-remove-exports/test/fixture.md b/packages/remark-mdx-remove-exports/test/fixture.md
deleted file mode 100644
index 6777a2c4e..000000000
--- a/packages/remark-mdx-remove-exports/test/fixture.md
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-export const author = 'Fred'
-
-export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-
-```js
-const foo = 'bar'
-```
diff --git a/packages/remark-mdx-remove-exports/test/test.js b/packages/remark-mdx-remove-exports/test/test.js
deleted file mode 100644
index 00c6c9ea1..000000000
--- a/packages/remark-mdx-remove-exports/test/test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const unified = require('unified')
-const parse = require('remark-parse')
-const stringify = require('remark-stringify')
-const mdx = require('../../remark-mdx')
-const mdxjs = require('../../remark-mdxjs')
-
-const removeExports = require('..')
-
-const fixture = fs.readFileSync(path.join(__dirname, './fixture.md'), 'utf8')
-
-const serialize = doc => {
-  const result = unified()
-    .use(parse)
-    .use(stringify)
-    .use(mdx)
-    .use(mdxjs)
-    .use(removeExports)
-    .processSync(doc)
-
-  return result.contents
-}
-
-it('removes exports', () => {
-  const result = serialize(fixture)
-
-  expect(result).toMatchSnapshot()
-})
diff --git a/packages/remark-mdx-remove-exports/types/index.d.ts b/packages/remark-mdx-remove-exports/types/index.d.ts
deleted file mode 100644
index 6985171f1..000000000
--- a/packages/remark-mdx-remove-exports/types/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// TypeScript Version: 3.4
-
-import {Plugin} from 'unified'
-
-/**
- * Remove export nodes from the MDXAST.
- */
-declare const remarkMdxRemoveExports: Plugin<[]>
-
-export = remarkMdxRemoveExports
diff --git a/packages/remark-mdx-remove-exports/types/remark-mdx-remove-exports-test.ts b/packages/remark-mdx-remove-exports/types/remark-mdx-remove-exports-test.ts
deleted file mode 100644
index d11b0531e..000000000
--- a/packages/remark-mdx-remove-exports/types/remark-mdx-remove-exports-test.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as unified from 'unified'
-import * as mdxRemoveExports from 'remark-mdx-remove-exports'
-
-unified().use(mdxRemoveExports)
diff --git a/packages/remark-mdx-remove-exports/types/tsconfig.json b/packages/remark-mdx-remove-exports/types/tsconfig.json
deleted file mode 100644
index 27ab51358..000000000
--- a/packages/remark-mdx-remove-exports/types/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["dom", "es6"],
-    "strict": true,
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "jsx": "react",
-    "paths": {
-      "remark-mdx-remove-exports": ["index.d.ts"]
-    }
-  }
-}
diff --git a/packages/remark-mdx-remove-exports/types/tslint.json b/packages/remark-mdx-remove-exports/types/tslint.json
deleted file mode 100644
index 697838623..000000000
--- a/packages/remark-mdx-remove-exports/types/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "dtslint/dtslint.json",
-  "rules": {
-    "whitespace": false,
-    "semicolon": false
-  }
-}
diff --git a/packages/remark-mdx-remove-imports/index.js b/packages/remark-mdx-remove-imports/index.js
deleted file mode 100644
index 0e009879b..000000000
--- a/packages/remark-mdx-remove-imports/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const remove = require('unist-util-remove')
-
-module.exports = _options => tree => {
-  return remove(tree, 'import')
-}
diff --git a/packages/remark-mdx-remove-imports/package.json b/packages/remark-mdx-remove-imports/package.json
index 7a75b2072..fd663d4bd 100644
--- a/packages/remark-mdx-remove-imports/package.json
+++ b/packages/remark-mdx-remove-imports/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "remark-mdx-remove-imports",
   "version": "2.0.0-next.8",
   "description": "Remove imports from the MDX AST",
@@ -42,8 +43,8 @@
     "unist-util-remove": "2.0.0"
   },
   "devDependencies": {
-    "remark-parse": "^8.0.0",
-    "remark-stringify": "^8.0.0",
+    "remark-parse": "^9.0.0",
+    "remark-stringify": "^9.0.1",
     "unified": "^9.2.0"
   },
   "gitHead": "bf7deab69996449cb99c2217dff75e65855eb2c1"
diff --git a/packages/remark-mdx-remove-imports/readme.md b/packages/remark-mdx-remove-imports/readme.md
index fd5c74bb3..705608021 100644
--- a/packages/remark-mdx-remove-imports/readme.md
+++ b/packages/remark-mdx-remove-imports/readme.md
@@ -4,70 +4,15 @@
 [![lerna][lerna-badge]][lerna]
 [![Join the community on Spectrum][spectrum-badge]][spectrum]
 
-Remove import nodes from the [MDXAST][].
-This is useful for scenarios where the imports aren’t needed, like an MDX playground.
+Deprecated!
 
-## Installation
+Created for but no longer used in [MDX](https://mdxjs.com).
 
-[npm][]:
-
-```shell
-npm install --save remark-mdx-remove-imports
-```
-
-## Usage
-
-Say we have the following MDX file, `example.mdx`:
-
-```markdown
-import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-```
-
-And our script, `example.js`, looks as follows:
-
-```javascript
-const vfile = require('to-vfile')
-const remark = require('remark')
-const mdx = require('remark-mdx')
-const mdxjs = require('remark-mdxjs')
-const removeImports = require('remark-mdx-remove-imports')
-
-remark()
-  .use(mdx)
-  .use(mdxjs)
-  .use(removeImports)
-  .process(vfile.readSync('example.md'), function (err, file) {
-    if (err) throw err
-    console.log(String(file))
-  })
-```
-
-Now, running `node example` yields:
-
-```markdown
-export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-```
-
-## Contribute
-
-See the [Support][] and [Contributing][] guidelines on the MDX website for ways
-to (get) help.
-
-This project has a [Code of Conduct][coc].
-By interacting with this repository, organisation, or community you agree to
-abide by its terms.
+Used to removes MDX@1 `import` nodes.
+MDX@2 includes `mdxjsEsm` nodes for both import/exports.
+Those can be removed with
+[`unist-util-remove`](https://github.com/syntax-tree/unist-util-remove)
+used as `remove(tree, 'mdxjsEsm')`.
 
 ## License
 
diff --git a/packages/remark-mdx-remove-imports/test/__snapshots__/test.js.snap b/packages/remark-mdx-remove-imports/test/__snapshots__/test.js.snap
deleted file mode 100644
index 41c0d1d91..000000000
--- a/packages/remark-mdx-remove-imports/test/__snapshots__/test.js.snap
+++ /dev/null
@@ -1,14 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`removes imports 1`] = `
-"export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-
-\`\`\`js
-const foo = 'bar'
-\`\`\`
-"
-`;
diff --git a/packages/remark-mdx-remove-imports/test/fixture.md b/packages/remark-mdx-remove-imports/test/fixture.md
deleted file mode 100644
index 39e1c4d5f..000000000
--- a/packages/remark-mdx-remove-imports/test/fixture.md
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Donut } from 'rebass'
-
-import OtherThing from 'other-place'
-
-export default props => <div {...props} />
-
-# Hello, world!
-
-This is a paragraph
-
-```js
-const foo = 'bar'
-```
diff --git a/packages/remark-mdx-remove-imports/test/test.js b/packages/remark-mdx-remove-imports/test/test.js
deleted file mode 100644
index 5c857402a..000000000
--- a/packages/remark-mdx-remove-imports/test/test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const unified = require('unified')
-const parse = require('remark-parse')
-const stringify = require('remark-stringify')
-const mdx = require('../../remark-mdx')
-const mdxjs = require('../../remark-mdxjs')
-
-const removeImports = require('..')
-
-const fixture = fs.readFileSync(path.join(__dirname, './fixture.md'), 'utf8')
-
-const serialize = doc => {
-  const result = unified()
-    .use(parse)
-    .use(stringify)
-    .use(mdx)
-    .use(mdxjs)
-    .use(removeImports)
-    .processSync(doc)
-
-  return result.contents
-}
-
-it('removes imports', () => {
-  const result = serialize(fixture)
-
-  expect(result).toMatchSnapshot()
-})
diff --git a/packages/remark-mdx-remove-imports/types/index.d.ts b/packages/remark-mdx-remove-imports/types/index.d.ts
deleted file mode 100644
index 15077aba9..000000000
--- a/packages/remark-mdx-remove-imports/types/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// TypeScript Version: 3.4
-
-import {Plugin} from 'unified'
-
-/**
- * Remove import nodes from the MDXAST.
- */
-declare const remarkMdxRemoveImports: Plugin<[]>
-
-export = remarkMdxRemoveImports
diff --git a/packages/remark-mdx-remove-imports/types/remark-mdx-remove-imports-test.ts b/packages/remark-mdx-remove-imports/types/remark-mdx-remove-imports-test.ts
deleted file mode 100644
index dc2db0946..000000000
--- a/packages/remark-mdx-remove-imports/types/remark-mdx-remove-imports-test.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as unified from 'unified'
-import * as mdxRemoveImports from 'remark-mdx-remove-imports'
-
-unified().use(mdxRemoveImports)
diff --git a/packages/remark-mdx-remove-imports/types/tsconfig.json b/packages/remark-mdx-remove-imports/types/tsconfig.json
deleted file mode 100644
index cd14c1113..000000000
--- a/packages/remark-mdx-remove-imports/types/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["dom", "es6"],
-    "strict": true,
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "jsx": "react",
-    "paths": {
-      "remark-mdx-remove-imports": ["index.d.ts"]
-    }
-  }
-}
diff --git a/packages/remark-mdx-remove-imports/types/tslint.json b/packages/remark-mdx-remove-imports/types/tslint.json
deleted file mode 100644
index 697838623..000000000
--- a/packages/remark-mdx-remove-imports/types/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "dtslint/dtslint.json",
-  "rules": {
-    "whitespace": false,
-    "semicolon": false
-  }
-}
diff --git a/packages/remark-mdx/index.js b/packages/remark-mdx/index.js
index f78c0a53a..9722f51ae 100644
--- a/packages/remark-mdx/index.js
+++ b/packages/remark-mdx/index.js
@@ -1,30 +1,42 @@
 'use strict'
 
-var parse = require('./lib/parse')
-var serialize = require('./lib/serialize')
+var syntaxMdx = require('micromark-extension-mdx')
+var syntaxMdxjs = require('micromark-extension-mdxjs')
+var fromMarkdown = require('mdast-util-mdx/from-markdown')
+var toMarkdown = require('mdast-util-mdx/to-markdown')
 
-module.exports = mdx
-
-// I think this is needed for webpack? 😔
-mdx.default = mdx
+var warningIssued
 
-function mdx() {
-  var parser = this.Parser
-  var compiler = this.Compiler
-
-  if (isRemarkParser(parser)) {
-    parse(parser)
-  }
+module.exports = mdx
 
-  if (isRemarkCompiler(compiler)) {
-    serialize(compiler)
+function mdx(options) {
+  var settings = options || {}
+  var syntax = settings.js === false ? syntaxMdx : syntaxMdxjs
+  var data = this.data()
+
+  /* istanbul ignore next - old remark. */
+  if (
+    !warningIssued &&
+    ((this.Parser &&
+      this.Parser.prototype &&
+      this.Parser.prototype.blockTokenizers) ||
+      (this.Compiler &&
+        this.Compiler.prototype &&
+        this.Compiler.prototype.visitors))
+  ) {
+    warningIssued = true
+    console.warn(
+      '[remark-mdx] Warning: please upgrade to remark 13 to use this plugin'
+    )
   }
-}
 
-function isRemarkParser(parser) {
-  return Boolean(parser && parser.prototype && parser.prototype.blockTokenizers)
-}
+  add('micromarkExtensions', syntax(options))
+  add('fromMarkdownExtensions', fromMarkdown)
+  add('toMarkdownExtensions', toMarkdown)
 
-function isRemarkCompiler(compiler) {
-  return Boolean(compiler && compiler.prototype && compiler.prototype.visitors)
+  function add(field, value) {
+    /* istanbul ignore if - other extensions. */
+    if (data[field]) data[field].push(value)
+    else data[field] = [value]
+  }
 }
diff --git a/packages/remark-mdx/lib/parse/index.js b/packages/remark-mdx/lib/parse/index.js
deleted file mode 100644
index 4afbf2a98..000000000
--- a/packages/remark-mdx/lib/parse/index.js
+++ /dev/null
@@ -1,1521 +0,0 @@
-'use strict'
-
-var stringifyPosition = require('unist-util-stringify-position')
-var parseEntities = require('parse-entities')
-var serializeCharCode = require('../util/serialize-char-code')
-var serializeFormattedCode = require('../util/serialize-formatted-code')
-var serializeAbbreviatedTag = require('../util/serialize-abbreviated-tag')
-var removePositions = require('../util/remove-positions')
-var esIdentifier = require('../util/es-identifier')
-var whitespace = require('../util/es-whitespace')
-var dedentExpression = require('../util/dedent-expression')
-
-module.exports = parse
-
-var own = {}.hasOwnProperty
-
-var identifierStart = esIdentifier.identifierStart
-var identifier = esIdentifier.identifier
-
-var tab = 9 // '\t'
-var lineFeed = 10 // '\n'
-var space = 32 // ' '
-var quotationMark = 34 // '"'
-var apostrophe = 39 // "'"
-var dash = 45 // '-'
-var dot = 46 // '.'
-var slash = 47 // '/'
-var colon = 58 // ':'
-var lessThan = 60 // '<'
-var equalsTo = 61 // '='
-var greaterThan = 62 // '>'
-var graveAccent = 96 // '`'
-var leftCurlyBrace = 123 // '{'
-var rightCurlyBrace = 125 // '}'
-var tilde = 126 // '~'
-
-var suggestionIdentifierStart = 'a letter, `$`, or `_`'
-var suggestionIdentifier = 'letters, digits, `$`, or `_`'
-var suggestionBeforeAttribute = 'whitespace before attributes'
-var suggestionBeforeInitializer = '`=` to initialize a value'
-var suggestionValueStart = '`"`, `\'`, or `{`'
-var suggestionEnd = 'the end of the tag'
-var suggestionTagEnd = '`>` to end the tag'
-
-var parseEntitiesOptions = {nonTerminated: false}
-
-function parse(parser) {
-  var proto = parser.prototype
-  var spans = proto.inlineTokenizers
-  var blocks = proto.blockTokenizers
-  var inlineMethods = proto.inlineMethods
-  var blockMethods = proto.blockMethods
-
-  // Replace HTML in order with MDX.
-  inlineMethods.splice(inlineMethods.indexOf('html'), 1, 'mdx')
-  blockMethods.splice(blockMethods.indexOf('html'), 1, 'mdx')
-  // Remove indented code and autolinks.
-  blockMethods.splice(blockMethods.indexOf('indentedCode'), 1)
-  inlineMethods.splice(inlineMethods.indexOf('autoLink'), 1)
-
-  // Replace tokenizers.
-  spans.autoLink = undefined
-  spans.html = undefined
-  spans.mdx = createParser(false)
-  blocks.html = undefined
-  blocks.indentedCode = undefined
-  blocks.mdx = createParser(true)
-
-  // Overwrite paragraph to ignore whitespace around line feeds.
-  blocks.paragraph = createParagraphParser(blocks.paragraph)
-
-  // Find tokens fast.
-  spans.mdx.locator = locateMdx
-
-  Object.keys(proto).forEach(interrupt)
-
-  function createParser(block) {
-    parse.displayName = 'mdx' + (block ? 'Block' : 'Span')
-    return parse
-    function parse(eat, value, silent) {
-      return mdxParser.call(this, eat, value, silent, block)
-    }
-  }
-
-  function createParagraphParser(oParagraph) {
-    return parseParagraph
-    function parseParagraph(eat, value, silent) {
-      return paragraph.call(this, eat, value, silent, oParagraph)
-    }
-  }
-
-  function interrupt(key) {
-    var prefix = 'interrupt'
-
-    if (key.slice(0, prefix.length) === prefix) {
-      proto[key] = proto[key].filter(notHtmlOrIndentedCode)
-    }
-
-    function notHtmlOrIndentedCode(tuple) {
-      var name = tuple[0]
-      return name !== 'html' && name !== 'indentedCode'
-    }
-  }
-}
-
-function mdxParser(eat, value, silent, block) {
-  var self = this
-  var clean = self.options.position ? noop : removePositions
-  var file = self.file
-  var index = 0
-  var place = Object.assign(eat.now(), {index: index})
-  var contentTokenizer = 'tokenize' + (block ? 'Block' : 'Inline')
-  var node
-  var content
-
-  // Parser state.
-  var state = block ? beforeMdxBlock : beforeMdxSpan
-  var elementStack = [] // Current open elements.
-  var stack = [] // Current open tokens.
-  var settled = false
-  var crashed = false
-
-  // Shared space.
-  var size
-  var sizeOpen
-  var currentTag
-
-  // Enter adapters.
-  var onenter = {
-    tag: onentertag,
-    closingSlash: onenterclosingslash,
-    attributeExpression: onenteranyattribute,
-    attributeName: onenteranyattribute,
-    selfClosingSlash: onenterselfclosingslash
-  }
-
-  // Exit adapters.
-  var onexit = {
-    closingSlash: onclosingslash,
-    primaryName: onprimaryname,
-    memberName: onmembername,
-    localName: onlocalname,
-    name: onname,
-    attributeName: onattributename,
-    attributeLocalName: onattributelocalname,
-    attributeValue: onattributevalue,
-    attributeValueExpression: onattributevalueexpression,
-    attributeExpression: onattributeexpression,
-    selfClosingSlash: onselfclosingslash,
-    tag: ontag,
-    expression: onexpression
-  }
-
-  // Run the state machine.
-  main()
-
-  /* istanbul ignore if - used by interruptors, which we’re not using. */
-  if (silent) {
-    return !crashed
-  }
-
-  if (crashed) {
-    return
-  }
-
-  // Elements have nodes in them.
-  // Potentially recursive MDX.
-  if (node.type === 'mdxBlockElement' || node.type === 'mdxSpanElement') {
-    node.children =
-      content.end === undefined
-        ? []
-        : self[contentTokenizer](slice(content), content.start)
-  }
-  // Expressions are literal.
-  else {
-    node.value = dedentExpression(slice(content, 1, 1))
-  }
-
-  return eat(value.slice(0, index))(node)
-
-  //
-  // State management.
-  //
-
-  // Main loop (note that `index` is modified by `consume`).
-  function main() {
-    /* eslint-disable-next-line no-unmodified-loop-condition */
-    while (!settled) {
-      state(value.charCodeAt(index))
-    }
-  }
-
-  // Get the current point.
-  function now() {
-    return Object.assign({}, place)
-  }
-
-  // Clone the current point: note that tokens also have an `index` in their
-  // points, refererring to the place in the input string, which we don’t want
-  // in the tree.
-  function point(source) {
-    return {line: source.line, column: source.column, offset: source.offset}
-  }
-
-  // Clone the position of a token.
-  function position(token) {
-    return {start: point(token.start), end: point(token.end)}
-  }
-
-  // Move a character forward.
-  function consume() {
-    // Line ending; assumes CR is not used (remark removes those).
-    if (value.charCodeAt(index) === lineFeed) {
-      place.line++
-      place.column = 1
-    }
-    // Anything else.
-    else {
-      place.column++
-    }
-
-    index++
-
-    place.offset++
-    place.index = index
-  }
-
-  // Start a token.
-  function enter(type) {
-    var token = {type: type, start: now()}
-
-    emit(onenter, token)
-
-    stack.push(token)
-  }
-
-  // Stop a token.
-  function exit() {
-    var token = stack.pop()
-
-    token.end = now()
-
-    emit(onexit, token)
-  }
-
-  // Switch to the given state.
-  function then(next) {
-    state = next
-  }
-
-  // Emit a token.
-  function emit(adapters, token) {
-    if (own.call(adapters, token.type)) {
-      adapters[token.type](token)
-    }
-  }
-
-  // Crash at a nonconforming character.
-  function crash(at, expect) {
-    var code = value.charCodeAt(index)
-    var label
-    var base
-    var message
-
-    // Non-EOF.
-    if (code === code) {
-      label = 'character'
-      base =
-        'Unexpected character ' +
-        serializeFormattedCode(code) +
-        ' (' +
-        serializeCharCode(code) +
-        ')'
-    }
-    // EOF.
-    else {
-      label = 'eof'
-      base = 'Unexpected end of file'
-    }
-
-    message = base + ' ' + at + ', expected ' + expect
-
-    fail(message, now(), 'unexpected-' + label)
-  }
-
-  function fail(reason, point, label) {
-    crashed = true
-    settled = true
-
-    /* istanbul ignore else - could be used by plugins. */
-    if (!silent) {
-      file.fail(reason, point, 'remark-mdx:' + label)
-    }
-  }
-
-  function slice(token, more, less) {
-    return value.slice(
-      token.start.index + (more || 0),
-      token.end.index - (less || 0)
-    )
-  }
-
-  //
-  // Adapters.
-  //
-
-  // Define a new tag node.
-  function onentertag() {
-    currentTag = {
-      type: 'mdxTag',
-      name: null,
-      close: false,
-      selfClosing: false,
-      attributes: []
-    }
-  }
-
-  // Crash if we find an closing tag if there are no elements open.
-  function onenterclosingslash() {
-    if (elementStack.length === 0) {
-      crash('before name', 'an opening tag first as there are no open elements')
-    }
-  }
-
-  // Crash if we find an attribute on a closing tag.
-  function onenteranyattribute() {
-    if (currentTag.close) {
-      crash(
-        'on closing tag after name',
-        suggestionEnd + ' instead of attributes on a closing tag'
-      )
-    }
-  }
-
-  // Crash if we find a self-closing closing tag (`</a/>`)
-  function onenterselfclosingslash() {
-    if (currentTag.close) {
-      crash('on closing tag before tag end', suggestionEnd)
-    }
-  }
-
-  function onclosingslash() {
-    currentTag.close = true
-  }
-
-  function onprimaryname(token) {
-    currentTag.name = slice(token)
-  }
-
-  function onmembername(token) {
-    currentTag.name += '.' + slice(token)
-  }
-
-  function onlocalname(token) {
-    currentTag.name += ':' + slice(token)
-  }
-
-  // Crash if we find a closing tag that doesn’t match the currently open
-  // element.
-  function onname() {
-    var currentElement = elementStack[elementStack.length - 1]
-
-    // A different element is open.
-    if (currentTag.close && currentElement.name !== currentTag.name) {
-      fail(
-        'Unexpected closing tag `' +
-          serializeAbbreviatedTag(currentTag) +
-          '`, expected corresponding MDX closing tag for `' +
-          serializeAbbreviatedTag(currentElement) +
-          '` (' +
-          stringifyPosition(currentElement) +
-          ')',
-        now(),
-        'end-tag-mismatch'
-      )
-    }
-  }
-
-  // Add the attribute to the tag.
-  function onattributename(token) {
-    currentTag.attributes.push({
-      type: 'mdxAttribute',
-      name: slice(token),
-      value: null,
-      position: position(token)
-    })
-  }
-
-  // Change the attribute’s name to include the local name.
-  function onattributelocalname(token) {
-    var attributes = currentTag.attributes
-    var attribute = attributes[attributes.length - 1]
-
-    attribute.name += ':' + slice(token)
-    attribute.position.end = point(token.end)
-  }
-
-  // Add the attribute value to the attribute.
-  function onattributevalue(token) {
-    var attributes = currentTag.attributes
-    var attribute = attributes[attributes.length - 1]
-
-    attribute.value = parseEntities(slice(token, 1, 1), parseEntitiesOptions)
-    attribute.position.end = point(token.end)
-  }
-
-  // Add the attribute value to the attribute.
-  function onattributevalueexpression(token) {
-    var attributes = currentTag.attributes
-    var attribute = attributes[attributes.length - 1]
-
-    attribute.value = {
-      type: 'mdxValueExpression',
-      value: dedentExpression(slice(token, 1, 1)),
-      position: position(token)
-    }
-
-    attribute.position.end = point(token.end)
-  }
-
-  // Add the attribute to the tag.
-  function onattributeexpression(token) {
-    currentTag.attributes.push({
-      type: 'mdxAttributeExpression',
-      value: dedentExpression(slice(token, 1, 1)),
-      position: position(token)
-    })
-  }
-
-  // Mark the node as self-closing.
-  function onselfclosingslash() {
-    currentTag.selfClosing = true
-  }
-
-  // Handle the tag.
-  function ontag(token) {
-    currentTag.position = position(token)
-
-    if (elementStack.length === 0) {
-      node = {
-        type: 'mdx' + (block ? 'Block' : 'Span') + 'Element',
-        name: currentTag.name,
-        attributes: currentTag.attributes
-      }
-
-      content = {type: 'content', start: token.end}
-    }
-
-    // Closing tag (`</x>`).
-    if (currentTag.close) {
-      clean(elementStack.pop())
-
-      if (elementStack.length === 0) {
-        content.end = token.start
-      }
-    }
-    // Self-closing tag (`<x/>`).
-    else if (currentTag.selfClosing) {
-      clean(currentTag)
-    }
-    // Opening tag (`<x>`).
-    else {
-      elementStack.push(currentTag)
-    }
-
-    if (elementStack.length === 0) {
-      then(block ? afterMdxBlock : afterMdxSpan)
-    }
-  }
-
-  // Handle the expression.
-  function onexpression(token) {
-    if (elementStack.length === 0) {
-      node = {type: 'mdx' + (block ? 'Block' : 'Span') + 'Expression'}
-      content = {type: 'content', start: token.start, end: token.end}
-      then(block ? afterMdxBlock : afterMdxSpan)
-    }
-  }
-
-  //
-  // State machine.
-  //
-
-  function beforeMdxBlock(code) {
-    // In-line Markdown whitespace.
-    if (code === tab || code === space) {
-      consume()
-    }
-    // Something else.
-    else {
-      then(beforeMdxSpan)
-    }
-  }
-
-  // Start of an expression or element span.
-  function beforeMdxSpan(code) {
-    // Found our start
-    if (code === leftCurlyBrace || code === lessThan) {
-      // Reconsume.
-      then(data)
-    }
-    // Something else.
-    else {
-      crashed = true
-      settled = true
-    }
-  }
-
-  // End of a span.
-  function afterMdxSpan() {
-    settled = true
-  }
-
-  // End of an MDX block.
-  function afterMdxBlock(code) {
-    // In-line Markdown whitespace.
-    if (code === tab || code === space) {
-      consume()
-    }
-    // Found our end!
-    else if (code === lineFeed || code !== code) {
-      settled = true
-    }
-    // Something else, not a block.
-    else {
-      crashed = true
-      settled = true
-    }
-  }
-
-  // Children.
-  function data(code) {
-    // Start a new tag.
-    if (code === lessThan) {
-      then(beforeName)
-      enter('tag')
-      consume()
-    }
-    // Start a new expression.
-    else if (code === leftCurlyBrace) {
-      then(expression)
-      enter('expression')
-      size = 1
-      consume()
-    }
-    // Text.
-    else {
-      // Reconsume.
-      then(text)
-      enter('text')
-    }
-  }
-
-  // Right after `<`, before an optional name.
-  function beforeName(code) {
-    // Closing tag.
-    if (code === slash) {
-      then(beforeClosingTagName)
-      enter('closingSlash')
-      consume()
-      exit()
-    }
-    // Fragment opening tag.
-    else if (code === greaterThan) {
-      then(data)
-      enter('name')
-      exit()
-      consume()
-      exit()
-    }
-    // Whitespace, remain.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Start of a name.
-    else if (identifierStart(code)) {
-      then(primaryName)
-      enter('name')
-      enter('primaryName')
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before name',
-        'a character that can start a name, such as ' +
-          suggestionIdentifierStart
-      )
-    }
-  }
-
-  // We’re at the start of a closing tag, right after `</`.
-  function beforeClosingTagName(code) {
-    // Fragment closing tag.
-    if (code === greaterThan) {
-      then(data)
-      enter('name')
-      exit()
-      consume()
-      exit()
-    }
-    // Whitespace before name: stay in state.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Start of a closing tag name.
-    else if (identifierStart(code)) {
-      then(primaryName)
-      enter('name')
-      enter('primaryName')
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before name',
-        'a character that can start a name, such as ' +
-          suggestionIdentifierStart
-      )
-    }
-  }
-
-  // We’re inside the primary name.
-  function primaryName(code) {
-    // Continuation of name: remain.
-    if (code === dash || identifier(code)) {
-      consume()
-    }
-    // End of name.
-    else if (
-      code === dot ||
-      code === slash ||
-      code === colon ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      whitespace(code)
-    ) {
-      then(afterPrimaryName)
-      exit()
-      // Reconsume.
-    }
-    // Exception.
-    else {
-      crash(
-        'in name',
-        'a name character such as ' +
-          suggestionIdentifier +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after a name.
-  function afterPrimaryName(code) {
-    // Start of a member name.
-    if (code === dot) {
-      then(beforeMemberName)
-      consume()
-    }
-    // Start of a local name.
-    else if (code === colon) {
-      then(beforeLocalName)
-      consume()
-    }
-    // End of name.
-    else if (
-      code === slash ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      identifierStart(code)
-    ) {
-      then(beforeAttribute)
-      exit()
-      // Reconsume.
-    }
-    // Remain.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'after name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’ve seen a `.` and are expecting a member name.
-  function beforeMemberName(code) {
-    // Start of a member name.
-    if (identifierStart(code)) {
-      then(memberName)
-      enter('memberName')
-      consume()
-    }
-    // Whitespace before member name: stay in state.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before member name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re inside the member name.
-  function memberName(code) {
-    // Continuation of member name: stay in state
-    if (code === dash || identifier(code)) {
-      consume()
-    }
-    // End of member name (note that namespaces and members can’t be combined).
-    else if (
-      whitespace(code) ||
-      code === dot ||
-      code === greaterThan ||
-      code === slash ||
-      code === leftCurlyBrace
-    ) {
-      then(afterMemberName)
-      exit()
-      // Reconsume.
-    }
-    // Exception.
-    else {
-      crash(
-        'in member name',
-        'a name character such as ' +
-          suggestionIdentifier +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after a member name: this is the same as `afterPrimaryName` but we
-  // don’t expect colons.
-  function afterMemberName(code) {
-    // Start another member name.
-    if (code === dot) {
-      then(beforeMemberName)
-      consume()
-    }
-    // End of name.
-    else if (
-      code === greaterThan ||
-      code === slash ||
-      code === leftCurlyBrace ||
-      identifierStart(code)
-    ) {
-      then(beforeAttribute)
-      exit()
-      // Reconsume.
-    }
-    // Continue.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'after member name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’ve seen a `:`, and are expecting a local name.
-  function beforeLocalName(code) {
-    // Whitespace, stay in state.
-    if (whitespace(code)) {
-      consume()
-    }
-    // Start of a local name.
-    else if (identifierStart(code)) {
-      then(localName)
-      enter('localName')
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before local name',
-        'a character that can start a name, such as ' +
-          suggestionIdentifierStart
-      )
-    }
-  }
-
-  // We’re inside the local name.
-  function localName(code) {
-    // Continuation of local name: stay in state
-    if (code === dash || identifier(code)) {
-      consume()
-    }
-    // End of local name (note that we don’t expect another colon, or a member).
-    else if (
-      code === slash ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      whitespace(code)
-    ) {
-      then(afterLocalName)
-      exit()
-      exit()
-      // Reconsume.
-    }
-    // Exception.
-    else {
-      crash(
-        'in local name',
-        'a name character such as ' +
-          suggestionIdentifier +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after a local name: this is the same as `afterPrimaryName` but we
-  // don’t expect colons or periods.
-  function afterLocalName(code) {
-    // End of name.
-    if (
-      code === slash ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      identifierStart(code)
-    ) {
-      then(beforeAttribute)
-      // Reconsume.
-    }
-    // Continue.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'after local name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  function beforeAttribute(code) {
-    // Mark as self-closing.
-    if (code === slash) {
-      then(selfClosing)
-      enter('selfClosingSlash')
-      consume()
-      exit()
-    }
-    // End of tag.
-    else if (code === greaterThan) {
-      then(data)
-      consume()
-      exit()
-    }
-    // Attribute expression.
-    else if (code === leftCurlyBrace) {
-      then(attributeExpression)
-      enter('attributeExpression')
-      size = 1
-      consume()
-    }
-    // Whitespace: remain.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Start of an attribute name.
-    else if (identifierStart(code)) {
-      then(attributeName)
-      enter('attributeName')
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before attribute name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re in an attribute expression.
-  function attributeExpression(code) {
-    // Another opening brace.
-    if (code === leftCurlyBrace) {
-      size++
-      consume()
-    }
-    // A closing brace.
-    else if (code === rightCurlyBrace) {
-      // Done.
-      if (size === 1) {
-        then(beforeAttribute)
-        size = undefined
-        consume()
-        exit()
-      }
-      // Continue.
-      else {
-        size--
-        consume()
-      }
-    }
-    // Continuation.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      crash('in attribute expression', 'a corresponding closing brace for `{`')
-    }
-  }
-
-  // We’re right after the first character of an attribute.
-  function attributeName(code) {
-    // Continuation of the attribute name.
-    if (code === dash || identifier(code)) {
-      consume()
-    }
-    // End of attribute name or tag.
-    else if (
-      code === colon ||
-      code === equalsTo ||
-      code === greaterThan ||
-      code === slash ||
-      code === leftCurlyBrace ||
-      whitespace(code)
-    ) {
-      // Reconsume.
-      then(afterAttributeName)
-      exit()
-    }
-    // Exception.
-    else {
-      crash(
-        'in attribute name',
-        'an attribute name character such as ' +
-          suggestionIdentifier +
-          '; ' +
-          suggestionBeforeInitializer +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after an attribute name, probably finding an equals.
-  function afterAttributeName(code) {
-    // Start of a local name.
-    if (code === colon) {
-      then(beforeAttributeLocalName)
-      consume()
-    }
-    // Start of an attribute value.
-    else if (code === equalsTo) {
-      then(beforeAttributeValue)
-      consume()
-    }
-    // End of tag / new attribute.
-    else if (
-      code === greaterThan ||
-      code === slash ||
-      code === leftCurlyBrace ||
-      identifierStart(code)
-    ) {
-      // Reconsume.
-      then(beforeAttribute)
-    }
-    // Continuation.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'after attribute name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeInitializer +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’ve seen a `:`, and are expecting a local name.
-  function beforeAttributeLocalName(code) {
-    // Start of a local name.
-    if (identifierStart(code)) {
-      then(attributeLocalName)
-      enter('attributeLocalName')
-      consume()
-    }
-    // Whitespace, stay in state.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before local attribute name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeInitializer +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re right after the first character of a local attribute name.
-  function attributeLocalName(code) {
-    // Continuation of the local attribute name.
-    if (code === dash || identifier(code)) {
-      consume()
-    }
-    // End of tag / attribute name.
-    else if (
-      code === slash ||
-      code === equalsTo ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      whitespace(code)
-    ) {
-      // Reconsume.
-      then(afterAttributeLocalName)
-      exit()
-    }
-    // Exception.
-    else {
-      crash(
-        'in local attribute name',
-        'an attribute name character such as ' +
-          suggestionIdentifier +
-          '; ' +
-          suggestionBeforeInitializer +
-          '; ' +
-          suggestionBeforeAttribute +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after a local attribute name, expecting an equals.
-  function afterAttributeLocalName(code) {
-    // Start of an attribute value.
-    if (code === equalsTo) {
-      then(beforeAttributeValue)
-      consume()
-    }
-    // End of tag / new attribute.
-    else if (
-      code === slash ||
-      code === greaterThan ||
-      code === leftCurlyBrace ||
-      identifierStart(code)
-    ) {
-      // Reconsume.
-      then(beforeAttribute)
-    }
-    // Continuation.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'after local attribute name',
-        'a character that can start an attribute name, such as ' +
-          suggestionIdentifierStart +
-          '; ' +
-          suggestionBeforeInitializer +
-          '; or ' +
-          suggestionEnd
-      )
-    }
-  }
-
-  // We’re after an attribute value, expecting quotes and such.
-  function beforeAttributeValue(code) {
-    // Start of double quoted value.
-    if (code === quotationMark) {
-      then(attributeValueDoubleQuoted)
-      enter('attributeValue')
-      consume()
-    }
-    // Start of quoted value.
-    else if (code === apostrophe) {
-      then(attributeValueSingleQuoted)
-      enter('attributeValue')
-      consume()
-    }
-    // Start of an assignment expression.
-    else if (code === leftCurlyBrace) {
-      then(attributeValueExpression)
-      enter('attributeValueExpression')
-      size = 1
-      consume()
-    }
-    // Continuation.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash(
-        'before attribute value',
-        'a character that can start an attribute value, such as ' +
-          suggestionValueStart
-      )
-    }
-  }
-
-  // We’re in a double quoted attribute value.
-  function attributeValueDoubleQuoted(code) {
-    // Done.
-    if (code === quotationMark) {
-      then(beforeAttribute)
-      consume()
-      exit()
-    }
-    // Continuation.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      crash('in attribute value', 'a corresponding closing quote `"`')
-    }
-  }
-
-  // We’re in a single quoted attribute value.
-  function attributeValueSingleQuoted(code) {
-    // Done.
-    if (code === apostrophe) {
-      then(beforeAttribute)
-      consume()
-      exit()
-    }
-    // Continuation.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      crash('in attribute value', "a corresponding closing quote `'`")
-    }
-  }
-
-  // We’re in a attribute value assignment expression.
-  function attributeValueExpression(code) {
-    // Another opening brance.
-    if (code === leftCurlyBrace) {
-      size++
-      consume()
-    }
-    // A closing brace.
-    else if (code === rightCurlyBrace) {
-      // Done.
-      if (size === 1) {
-        size = undefined
-        then(beforeAttribute)
-        consume()
-        exit()
-      }
-      // Continue.
-      else {
-        size--
-        consume()
-      }
-    }
-    // Continuation.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      crash(
-        'in attribute value expression',
-        'a corresponding closing brace for `{`'
-      )
-    }
-  }
-
-  // Right after the slash on a name, e.g., `<asd /`.
-  function selfClosing(code) {
-    // End of tag.
-    if (code === greaterThan) {
-      then(data)
-      consume()
-      exit()
-    }
-    // Whitespace.
-    else if (whitespace(code)) {
-      consume()
-    }
-    // Exception.
-    else {
-      crash('after self-closing slash', suggestionTagEnd)
-    }
-  }
-
-  // Nested expression.
-  function expression(code) {
-    // Another opening brace.
-    if (code === leftCurlyBrace) {
-      size++
-      consume()
-    }
-    // A closing brace.
-    else if (code === rightCurlyBrace) {
-      // Done.
-      if (size === 1) {
-        then(data)
-        size = undefined
-        consume()
-        exit()
-      }
-      // Continue.
-      else {
-        size--
-        consume()
-      }
-    }
-    // Continuation.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      crash('in expression', 'a corresponding closing brace for `{`')
-    }
-  }
-
-  // Text.
-  function text(code) {
-    var currentElement
-
-    // Note: the JSX spec defines `> and `}` on their own in text as incorrect.
-    // Acorn does conform but Babel doesn’t.
-    // We don’t conform either, as Markdown uses `>` is for block quotes, and
-    // it would prevent their use in JSX.
-
-    // Data.
-    if (code === lessThan || code === leftCurlyBrace) {
-      // Reconsume.
-      then(data)
-      exit()
-    }
-    // Skip code spans and fenced code block.
-    else if (code === graveAccent) {
-      then(accentQuotedOpen)
-      sizeOpen = 1
-      consume()
-    }
-    // Skip code spans and fenced code block.
-    else if (code === tilde) {
-      then(tildeQuotedOpen)
-      sizeOpen = 1
-      consume()
-    }
-    // Text.
-    else if (code === code) {
-      consume()
-    }
-    // Exception (EOF).
-    else {
-      currentElement = elementStack[elementStack.length - 1]
-      crash(
-        'in element',
-        'a corresponding MDX closing tag for `' +
-          serializeAbbreviatedTag(currentElement) +
-          '` (' +
-          stringifyPosition(currentElement) +
-          ')'
-      )
-    }
-  }
-
-  // Inside ticks.
-  function accentQuotedOpen(code) {
-    // More.
-    if (code === graveAccent) {
-      sizeOpen++
-      consume()
-    }
-    // Character.
-    else if (code === code) {
-      then(accentQuoted)
-      consume()
-    }
-    // EOF.
-    else {
-      crash('in code', 'a corresponding fence for `` ` ``')
-    }
-  }
-
-  // In tick quoted value.
-  function accentQuoted(code) {
-    // Closing fence?
-    if (code === graveAccent) {
-      then(accentQuotedClose)
-      size = 1
-      consume()
-    }
-    // Character.
-    else if (code === code) {
-      consume()
-    }
-    // EOF.
-    else {
-      crash('in code', 'a corresponding fence for `` ` ``')
-    }
-  }
-
-  // Closing fence?
-  function accentQuotedClose(code) {
-    // More.
-    if (code === graveAccent) {
-      size++
-      consume()
-    }
-    // Anything else.
-    else {
-      // Done!
-      if (size === sizeOpen) {
-        then(text)
-        sizeOpen = undefined
-        size = undefined
-        // Reconsume
-      }
-      // Nope.
-      else {
-        then(accentQuoted)
-        size = undefined
-        // Reconsume
-      }
-    }
-  }
-
-  // Inside tildes.
-  function tildeQuotedOpen(code) {
-    // More.
-    if (code === tilde) {
-      consume()
-      sizeOpen++
-    }
-    // Non-EOF.
-    else if (code === code) {
-      then(tildeQuoted)
-      consume()
-    }
-    // EOF.
-    else {
-      crash('in code', 'a corresponding fence for `~`')
-    }
-  }
-
-  // In tick quoted value.
-  function tildeQuoted(code) {
-    // Closing?
-    if (code === tilde) {
-      then(tildeQuotedClose)
-      consume()
-      size = 1
-    }
-    // Non-EOF.
-    else if (code === code) {
-      consume()
-    }
-    // EOF.
-    else {
-      crash('in code', 'a corresponding fence for `~`')
-    }
-  }
-
-  // Closing?
-  function tildeQuotedClose(code) {
-    // More.
-    if (code === tilde) {
-      consume()
-      size++
-    }
-    // Anything else.
-    else {
-      // Done!
-      if (size === sizeOpen) {
-        then(text)
-        sizeOpen = undefined
-        size = undefined
-        // Reconsume
-      }
-      // Nope.
-      else {
-        then(tildeQuoted)
-        size = undefined
-        // Reconsume
-      }
-    }
-  }
-}
-
-function paragraph(eat, value, silent, oParagraph) {
-  var start = /^[ \t\n]+/
-  var end = /[ \t\n]+$/
-  var between = /[ \t]*\n[ \t]*/g
-  var result = oParagraph.call(this, eat, value, silent)
-
-  /* istanbul ignore else - paragraph is currently last, so essentially always
-   * matches. */
-  if (result && result.type) {
-    cleanWhitespace(result, true, true)
-  }
-
-  return result
-
-  function cleanWhitespace(node, atStart, atEnd) {
-    if (node.type === 'text') {
-      return cleanText(node, atStart, atEnd)
-    }
-
-    if (node.children) {
-      return cleanAll(node, atStart, atEnd)
-    }
-
-    return false
-  }
-
-  function cleanAll(node, atStart, atEnd) {
-    var children = node.children
-    var length = children.length
-    var index = -1
-    var start = atStart
-    var child
-
-    while (++index < length) {
-      child = children[index]
-
-      start = cleanWhitespace(
-        child,
-        start,
-        index === length - 1 ? atEnd : false
-      )
-
-      if (child.type === 'text' && child.value.length === 0) {
-        children.splice(index, 1)
-        index--
-        length--
-      }
-    }
-
-    // Types of `paragraph` and its children (phrasing content) that *do not*
-    // have markers at their end.
-    // If we do have markers, it doesn’t matter whether we ended in a newline.
-    return node.type === 'paragraph' || node.type === 'text' ? start : false
-  }
-
-  function cleanText(node, atStart, atEnd) {
-    var value = node.value.replace(between, '\n')
-
-    if (atStart) value = value.replace(start, '')
-    if (atEnd) value = value.replace(end, '')
-
-    node.value = value
-
-    return value ? value.charCodeAt(value.length - 1) === lineFeed : atStart
-  }
-}
-
-function locateMdx(value, from) {
-  var brace = value.indexOf('{', from)
-  var angle = value.indexOf('<', from)
-  return angle === -1 ? brace : brace === -1 ? angle : Math.min(brace, angle)
-}
-
-function noop() {}
diff --git a/packages/remark-mdx/lib/serialize/index.js b/packages/remark-mdx/lib/serialize/index.js
deleted file mode 100644
index ac19dcc42..000000000
--- a/packages/remark-mdx/lib/serialize/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict'
-
-var mdxExpression = require('./mdx-expression')
-var mdxElement = require('./mdx-element')
-var link = require('./link')
-var text = require('./text')
-
-module.exports = serialize
-
-function serialize(compiler) {
-  var proto = compiler.prototype
-  var visitors = proto.visitors
-
-  // Serialize code blocks with fences.
-  proto.options.fences = true
-
-  // Add serializers.
-  visitors.mdxSpanExpression = mdxExpression
-  visitors.mdxBlockExpression = mdxExpression
-  visitors.mdxSpanElement = mdxElement
-  visitors.mdxBlockElement = mdxElement
-  visitors.link = link
-  visitors.text = text
-}
diff --git a/packages/remark-mdx/lib/serialize/link.js b/packages/remark-mdx/lib/serialize/link.js
deleted file mode 100644
index 349cca42b..000000000
--- a/packages/remark-mdx/lib/serialize/link.js
+++ /dev/null
@@ -1,61 +0,0 @@
-'use strict'
-
-// Copied and modified from remark-stringify
-// Original source: https://github.com/remarkjs/remark/blob/19a27c30b13baa3a9e864e528c6a0b901a5fc918/packages/remark-stringify/lib/visitors/link.js
-// License (MIT): https://github.com/remarkjs/remark/blob/main/license
-
-var uri = require('remark-stringify/lib/util/enclose-uri')
-var title = require('remark-stringify/lib/util/enclose-title')
-
-module.exports = link
-
-var space = ' '
-var leftSquareBracket = '['
-var rightSquareBracket = ']'
-var leftParenthesis = '('
-var rightParenthesis = ')'
-
-// Stringify a link.
-//
-// With MDX we don't support <https://mdxjs.com> style links, which is the default
-// for remark-stringify (understandably). So, we check for the case where the url
-// and its text are equal. If it is, we serialize/stringify link syntax with the
-// url as the title rather than wrapping it in angle brackets (<>).
-//
-// ```markdown
-// [http://example.com](http://example.com)
-// ```
-//
-// Otherwise, is smart about enclosing `url` (see `encloseURI()`) and `title`
-// (see `encloseTitle()`).
-// ```
-//
-// ```markdown
-// [foo](<foo at bar dot com> 'An "example" e-mail')
-// ```
-//
-// Supports named entities in the `url` and `title` when in `settings.encode`
-// mode.
-function link(node) {
-  var self = this
-  var content = self.encode(node.url || '', node)
-  var exit = self.enterLink()
-  var value = self.all(node).join('')
-
-  exit()
-
-  content = uri(content)
-
-  if (node.title) {
-    content += space + title(self.encode(self.escape(node.title, node), node))
-  }
-
-  return (
-    leftSquareBracket +
-    value +
-    rightSquareBracket +
-    leftParenthesis +
-    content +
-    rightParenthesis
-  )
-}
diff --git a/packages/remark-mdx/lib/serialize/mdx-element.js b/packages/remark-mdx/lib/serialize/mdx-element.js
deleted file mode 100644
index 35aa0810c..000000000
--- a/packages/remark-mdx/lib/serialize/mdx-element.js
+++ /dev/null
@@ -1,111 +0,0 @@
-'use strict'
-
-var stringifyEntities = require('stringify-entities')
-var mdxExpression = require('./mdx-expression')
-var indent = require('../util/indent')
-
-module.exports = mdxElement
-
-// Expose helper to create tags.
-mdxElement.serializeTags = serializeTags
-
-var lineFeed = '\n'
-var space = ' '
-var slash = '/'
-var quotationMark = '"'
-var lessThan = '<'
-var equalsTo = '='
-var greaterThan = '>'
-
-var valueCharacterReferenceOptions = {
-  useNamedReferences: true,
-  subset: [quotationMark]
-}
-
-function mdxElement(node) {
-  var tags = serializeTags(node)
-  var block = node.type === 'mdxBlockElement'
-  var content = this.all(node).join(block ? lineFeed + lineFeed : '')
-
-  if (block && content) {
-    content = lineFeed + indent(content) + lineFeed
-  }
-
-  return tags.open + content + (tags.close || '')
-}
-
-function serializeTags(node) {
-  var block = node.type === 'mdxBlockElement'
-  var name = String(node.name || '')
-  var attributes = serializeAttributes(node.attributes || [], block)
-  var selfClosing = name && node.children.length === 0
-
-  if (name === '' && attributes !== '') {
-    throw new Error('Cannot serialize fragment with attributes')
-  }
-
-  return {
-    open:
-      lessThan + name + attributes + (selfClosing ? slash : '') + greaterThan,
-    close: selfClosing ? null : lessThan + slash + name + greaterThan
-  }
-}
-
-function serializeAttributes(nodes, block) {
-  var length = nodes.length
-  var index = -1
-  var result = []
-
-  while (++index < length) {
-    result.push(serializeAttribute(nodes[index]))
-  }
-
-  // None.
-  if (result.length === 0) {
-    return ''
-  }
-
-  // A block with multiple attributes
-  if (block && result.length !== 1) {
-    return lineFeed + indent(result.join(lineFeed)) + lineFeed
-  }
-
-  // A span, or a block with a single attribute.
-  return space + dedentStart(indent(result.join(space)))
-}
-
-function serializeAttribute(node) {
-  var fn = node.type === 'mdxAttributeExpression' ? mdxExpression : mdxAttribute
-  return fn(node)
-}
-
-function serializeValue(value) {
-  if (typeof value === 'object') {
-    return mdxExpression(value)
-  }
-
-  return (
-    quotationMark +
-    stringifyEntities(value, valueCharacterReferenceOptions) +
-    quotationMark
-  )
-}
-
-function mdxAttribute(node) {
-  var name = String(node.name || '')
-  var value = node.value
-
-  if (name === '') {
-    throw new Error('Cannot serialize attribute without name')
-  }
-
-  if (value === null || value === undefined) {
-    return name
-  }
-
-  return name + equalsTo + serializeValue(value)
-}
-
-function dedentStart(value) {
-  return value.replace(/ +/, '')
-}
diff --git a/packages/remark-mdx/lib/serialize/mdx-expression.js b/packages/remark-mdx/lib/serialize/mdx-expression.js
deleted file mode 100644
index 23ba91b8a..000000000
--- a/packages/remark-mdx/lib/serialize/mdx-expression.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict'
-
-var indent = require('../util/indent')
-
-module.exports = mdxExpression
-
-var leftCurlyBrace = '{'
-var rightCurlyBrace = '}'
-
-function mdxExpression(node) {
-  var value = node.value || ''
-  var block = node.type === 'mdxBlockExpression'
-  var around = block ? '\n' : ''
-  var content = block ? indent(value) : value
-  return leftCurlyBrace + around + content + around + rightCurlyBrace
-}
diff --git a/packages/remark-mdx/lib/serialize/text.js b/packages/remark-mdx/lib/serialize/text.js
deleted file mode 100644
index d03fdd0a7..000000000
--- a/packages/remark-mdx/lib/serialize/text.js
+++ /dev/null
@@ -1,19 +0,0 @@
-'use strict'
-
-var stringifyEntities = require('stringify-entities')
-
-module.exports = text
-
-var expressionCharacterReferenceOptions = {
-  useNamedReferences: true,
-  // Note: we don’t encode `>` or `}`, as we don’t crash on parsing them
-  // either.
-  subset: ['<', '{']
-}
-
-function text(node, parent) {
-  return stringifyEntities(
-    this.escape(node.value, node, parent),
-    expressionCharacterReferenceOptions
-  )
-}
diff --git a/packages/remark-mdx/lib/util/dedent-expression.js b/packages/remark-mdx/lib/util/dedent-expression.js
deleted file mode 100644
index da9704ce5..000000000
--- a/packages/remark-mdx/lib/util/dedent-expression.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict'
-
-var stripIndent = require('strip-indent')
-
-module.exports = dedentExpression
-
-var lineFeed = '\n'
-
-function dedentExpression(value) {
-  var lines = value.trim().split(lineFeed)
-  var head = lines.shift()
-  var rest = stripIndent(lines.join(lineFeed))
-  return head + (rest ? lineFeed + rest : '')
-}
diff --git a/packages/remark-mdx/lib/util/es-identifier.js b/packages/remark-mdx/lib/util/es-identifier.js
deleted file mode 100644
index 4060c07fa..000000000
--- a/packages/remark-mdx/lib/util/es-identifier.js
+++ /dev/null
@@ -1,63 +0,0 @@
-'use strict'
-
-exports.identifierStart = identifierStart
-exports.identifier = identifier
-
-var fromCharCode = String.fromCharCode
-
-var dollarSign = 36 // '$'
-var digit0 = 48 // '0'
-var digit9 = 57 // '9'
-var uppercaseA = 65 // 'A'
-var uppercaseZ = 90 // 'Z'
-var underscore = 95 // '_'
-var lowercaseA = 97 // 'a'
-var lowercaseZ = 122 // 'z'
-
-var nonAsciiIdentifierStartChars =
-  '\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08c7\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\u9ffc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7ca\ua7f5-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc'
-
-var nonAsciiIdentifierChars =
-  '\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf\u1ac0\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f'
-
-var nonAsciiIdentifierStartRe = new RegExp(
-  '[' + nonAsciiIdentifierStartChars + ']'
-)
-
-var nonAsciiIdentifierRe = new RegExp(
-  '[' + nonAsciiIdentifierStartChars + nonAsciiIdentifierChars + ']'
-)
-
-nonAsciiIdentifierStartChars = null
-nonAsciiIdentifierChars = null
-
-// To do: support astrals.
-function identifierStart(code) {
-  return code < 160 ? asciiIdentifierStart(code) : nonAsciiIdentifierStart(code)
-}
-
-// To do: support astrals.
-function identifier(code) {
-  return code < 160 ? asciiIdentifier(code) : nonAsciiIdentifier(code)
-}
-
-function asciiIdentifierStart(code) {
-  return (
-    code === dollarSign ||
-    (code >= uppercaseA && code <= uppercaseZ) ||
-    code === underscore ||
-    (code >= lowercaseA && code <= lowercaseZ)
-  )
-}
-
-function asciiIdentifier(code) {
-  return asciiIdentifierStart(code) || (code >= digit0 && code <= digit9)
-}
-
-function nonAsciiIdentifierStart(code) {
-  return nonAsciiIdentifierStartRe.test(fromCharCode(code))
-}
-
-function nonAsciiIdentifier(code) {
-  return nonAsciiIdentifierRe.test(fromCharCode(code))
-}
diff --git a/packages/remark-mdx/lib/util/es-whitespace.js b/packages/remark-mdx/lib/util/es-whitespace.js
deleted file mode 100644
index 3164c7084..000000000
--- a/packages/remark-mdx/lib/util/es-whitespace.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict'
-
-module.exports = whitespace
-
-var fromCharCode = String.fromCharCode
-var ws = /\s/
-
-function whitespace(code) {
-  return ws.test(fromCharCode(code))
-}
diff --git a/packages/remark-mdx/lib/util/indent.js b/packages/remark-mdx/lib/util/indent.js
deleted file mode 100644
index ed7341b3d..000000000
--- a/packages/remark-mdx/lib/util/indent.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict'
-
-module.exports = indent
-
-var lineFeed = '\n'
-var before = '  '
-var content = /\S/
-
-function indent(value) {
-  var lines = value.split(lineFeed)
-  var length = lines.length
-  var index = -1
-  var line
-
-  while (++index < length) {
-    line = lines[index]
-    lines[index] = content.test(line) ? before + line : line
-  }
-
-  return lines.join(lineFeed)
-}
diff --git a/packages/remark-mdx/lib/util/remove-positions.js b/packages/remark-mdx/lib/util/remove-positions.js
deleted file mode 100644
index da86e08cb..000000000
--- a/packages/remark-mdx/lib/util/remove-positions.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict'
-
-module.exports = remove
-
-function remove(node) {
-  if ('length' in node) {
-    node.forEach(remove)
-  } else {
-    delete node.position
-
-    if (node.type === 'mdxTag') {
-      remove(node.attributes)
-    } else if (
-      node.type === 'mdxAttribute' &&
-      node.value &&
-      typeof node.value === 'object'
-    ) {
-      remove(node.value)
-    }
-  }
-}
diff --git a/packages/remark-mdx/lib/util/serialize-abbreviated-tag.js b/packages/remark-mdx/lib/util/serialize-abbreviated-tag.js
deleted file mode 100644
index ff331ea84..000000000
--- a/packages/remark-mdx/lib/util/serialize-abbreviated-tag.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict'
-
-module.exports = serializeAbbreviatedTag
-
-// Serialize a tag, excluding attributes.
-function serializeAbbreviatedTag(node) {
-  return (
-    '<' +
-    (node.close ? '/' : '') +
-    (node.name || '') +
-    /* istanbul ignore next - currently not used on self-closing tags */
-    (node.selfClosing ? '/' : '') +
-    '>'
-  )
-}
diff --git a/packages/remark-mdx/lib/util/serialize-char-code.js b/packages/remark-mdx/lib/util/serialize-char-code.js
deleted file mode 100644
index fab4b11e8..000000000
--- a/packages/remark-mdx/lib/util/serialize-char-code.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-module.exports = serializeCharCode
-
-function serializeCharCode(code) {
-  return 'U+' + code.toString(16).toUpperCase().padStart(4, '0')
-}
diff --git a/packages/remark-mdx/lib/util/serialize-formatted-code.js b/packages/remark-mdx/lib/util/serialize-formatted-code.js
deleted file mode 100644
index 5fbb187e1..000000000
--- a/packages/remark-mdx/lib/util/serialize-formatted-code.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict'
-
-module.exports = serializeFormattedCode
-
-var fromCharCode = String.fromCharCode
-
-var graveAccent = 96 // '`'
-
-function serializeFormattedCode(code) {
-  return '`' + (code === graveAccent ? '` ` `' : fromCharCode(code)) + '`'
-}
diff --git a/packages/remark-mdx/package.json b/packages/remark-mdx/package.json
index 50ea9dc4b..0656cb681 100644
--- a/packages/remark-mdx/package.json
+++ b/packages/remark-mdx/package.json
@@ -17,7 +17,6 @@
   "types": "types/index.d.ts",
   "files": [
     "index.js",
-    "lib/",
     "types/index.d.ts"
   ],
   "keywords": [
@@ -40,22 +39,22 @@
     "test": "yarn format && yarn test-coverage && yarn test-types"
   },
   "dependencies": {
-    "parse-entities": "^2.0.0",
-    "remark-stringify": "^8.1.0",
-    "stringify-entities": "^3.0.1",
-    "strip-indent": "^3.0.0",
-    "unist-util-stringify-position": "^2.0.3"
+    "mdast-util-mdx": "^0.1.1",
+    "micromark-extension-mdx": "^0.1.0",
+    "micromark-extension-mdxjs": "^0.1.0"
   },
   "devDependencies": {
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
-    "remark-cli": "^8.0.0",
-    "remark-parse": "^8.0.2",
-    "remark-preset-wooorm": "^7.0.0",
+    "remark-cli": "^9.0.0",
+    "remark-parse": "^9.0.0",
+    "remark-stringify": "^9.0.1",
+    "remark-preset-wooorm": "^8.0.0",
     "tape": "^5.0.1",
     "to-vfile": "^6.1.0",
     "unified": "^9.0.0",
     "unist-builder": "^2.0.3",
+    "unist-util-remove-position": "^3.0.0",
     "xo": "^0.32.1"
   },
   "nyc": {
diff --git a/packages/remark-mdx/readme.md b/packages/remark-mdx/readme.md
index f14d05e78..d16963ccd 100644
--- a/packages/remark-mdx/readme.md
+++ b/packages/remark-mdx/readme.md
@@ -72,20 +72,20 @@ Now, running `node example` yields:
       depth: 1,
       children: [
         {type: 'text', value: 'Hello, '},
-        {type: 'mdxSpanExpression', value: 'data.to'}
+        {type: 'mdxTextExpression', value: 'data.to'}
       ]
     },
     {
-      type: 'mdxBlockElement',
+      type: 'mdxJsxFlowElement',
       name: 'Body',
       attributes: [],
-      children: [{type: 'mdxBlockExpression', value: 'message'}]
+      children: [{type: 'mdxFlowExpression', value: 'message'}]
     },
     {
       type: 'paragraph',
       children: [
         {type: 'text', value: 'Best, '},
-        {type: 'mdxSpanExpression', value: 'data.from'}
+        {type: 'mdxTextExpression', value: 'data.from'}
       ]
     }
   ]
diff --git a/packages/remark-mdx/test/fixtures/block-parsing.json b/packages/remark-mdx/test/fixtures/block-parsing.json
index 0b899203e..08814f41a 100644
--- a/packages/remark-mdx/test/fixtures/block-parsing.json
+++ b/packages/remark-mdx/test/fixtures/block-parsing.json
@@ -23,8 +23,7 @@
                   "line": 1,
                   "column": 17,
                   "offset": 16
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -38,8 +37,7 @@
               "line": 1,
               "column": 60,
               "offset": 59
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -53,8 +51,7 @@
           "line": 1,
           "column": 60,
           "offset": 59
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -73,8 +70,7 @@
               "line": 3,
               "column": 6,
               "offset": 66
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -95,8 +91,7 @@
                   "line": 3,
                   "column": 13,
                   "offset": 73
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -110,8 +105,7 @@
               "line": 3,
               "column": 79,
               "offset": 139
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -127,8 +121,7 @@
               "line": 3,
               "column": 80,
               "offset": 140
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -142,17 +135,16 @@
           "line": 3,
           "column": 80,
           "offset": 140
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Row",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "Col",
           "attributes": [],
           "children": [
@@ -183,8 +175,7 @@
                               "line": 7,
                               "column": 12,
                               "offset": 167
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -198,23 +189,21 @@
                           "line": 7,
                           "column": 12,
                           "offset": 167
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 7,
-                      "column": 1,
-                      "offset": 156
+                      "column": 3,
+                      "offset": 158
                     },
                     "end": {
                       "line": 7,
                       "column": 12,
                       "offset": 167
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -238,8 +227,7 @@
                               "line": 8,
                               "column": 8,
                               "offset": 175
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -253,23 +241,21 @@
                           "line": 8,
                           "column": 8,
                           "offset": 175
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 8,
-                      "column": 1,
-                      "offset": 168
+                      "column": 3,
+                      "offset": 170
                     },
                     "end": {
                       "line": 8,
                       "column": 8,
                       "offset": 175
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -293,8 +279,7 @@
                               "line": 9,
                               "column": 8,
                               "offset": 183
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -308,68 +293,53 @@
                           "line": 9,
                           "column": 8,
                           "offset": 183
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 9,
-                      "column": 1,
-                      "offset": 176
-                    },
-                    "end": {
-                      "line": 10,
                       "column": 3,
-                      "offset": 186
+                      "offset": 178
                     },
-                    "indent": [
-                      1
-                    ]
+                    "end": {
+                      "line": 9,
+                      "column": 8,
+                      "offset": 183
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 7,
-                  "column": 1,
-                  "offset": 156
-                },
-                "end": {
-                  "line": 10,
                   "column": 3,
-                  "offset": 186
+                  "offset": 158
                 },
-                "indent": [
-                  1,
-                  1,
-                  1
-                ]
+                "end": {
+                  "line": 9,
+                  "column": 8,
+                  "offset": 183
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 6,
-              "column": 1,
-              "offset": 148
+              "column": 3,
+              "offset": 150
             },
             "end": {
               "line": 10,
-              "column": 11,
-              "offset": 194
-            },
-            "indent": [
-              5,
-              5,
-              5,
-              3
-            ]
+              "column": 9,
+              "offset": 192
+            }
           }
         },
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "Col",
           "attributes": [],
           "children": [
@@ -392,8 +362,7 @@
                           "line": 12,
                           "column": 12,
                           "offset": 212
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -407,43 +376,35 @@
                       "line": 12,
                       "column": 14,
                       "offset": 214
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 12,
-                  "column": 1,
-                  "offset": 201
-                },
-                "end": {
-                  "line": 13,
                   "column": 3,
-                  "offset": 217
+                  "offset": 203
                 },
-                "indent": [
-                  1
-                ]
+                "end": {
+                  "line": 12,
+                  "column": 14,
+                  "offset": 214
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 11,
-              "column": 1,
-              "offset": 193
+              "column": 3,
+              "offset": 195
             },
             "end": {
               "line": 13,
               "column": 9,
               "offset": 223
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -457,18 +418,7 @@
           "line": 14,
           "column": 7,
           "offset": 230
-        },
-        "indent": [
-          1,
-          5,
-          5,
-          5,
-          3,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -487,8 +437,7 @@
               "line": 16,
               "column": 6,
               "offset": 237
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -509,8 +458,7 @@
                   "line": 16,
                   "column": 13,
                   "offset": 244
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -524,8 +472,7 @@
               "line": 16,
               "column": 79,
               "offset": 310
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -539,12 +486,11 @@
           "line": 16,
           "column": 79,
           "offset": 310
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Col",
       "attributes": [],
       "children": [
@@ -575,8 +521,7 @@
                           "line": 20,
                           "column": 6,
                           "offset": 324
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -590,8 +535,7 @@
                       "line": 20,
                       "column": 6,
                       "offset": 324
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -605,8 +549,7 @@
                   "line": 20,
                   "column": 6,
                   "offset": 324
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -618,25 +561,13 @@
                   "type": "paragraph",
                   "children": [
                     {
-                      "type": "mdxSpanElement",
+                      "type": "mdxJsxTextElement",
                       "name": "Icon",
                       "attributes": [
                         {
-                          "type": "mdxAttribute",
+                          "type": "mdxJsxAttribute",
                           "name": "name",
-                          "value": "hero",
-                          "position": {
-                            "start": {
-                              "line": 21,
-                              "column": 9,
-                              "offset": 333
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 20,
-                              "offset": 344
-                            }
-                          }
+                          "value": "hero"
                         }
                       ],
                       "children": [],
@@ -650,8 +581,7 @@
                           "line": 21,
                           "column": 23,
                           "offset": 347
-                        },
-                        "indent": []
+                        }
                       }
                     },
                     {
@@ -667,8 +597,7 @@
                           "line": 21,
                           "column": 24,
                           "offset": 348
-                        },
-                        "indent": []
+                        }
                       }
                     },
                     {
@@ -687,8 +616,7 @@
                               "line": 21,
                               "column": 57,
                               "offset": 381
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -702,8 +630,7 @@
                           "line": 21,
                           "column": 59,
                           "offset": 383
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -717,8 +644,7 @@
                       "line": 21,
                       "column": 59,
                       "offset": 383
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -732,8 +658,7 @@
                   "line": 21,
                   "column": 59,
                   "offset": 383
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -760,8 +685,7 @@
                               "line": 22,
                               "column": 12,
                               "offset": 395
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -775,8 +699,7 @@
                           "line": 22,
                           "column": 14,
                           "offset": 397
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -790,8 +713,7 @@
                       "line": 22,
                       "column": 14,
                       "offset": 397
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -805,8 +727,7 @@
                   "line": 22,
                   "column": 14,
                   "offset": 397
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -820,11 +741,7 @@
               "line": 22,
               "column": 14,
               "offset": 397
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -838,15 +755,7 @@
           "line": 24,
           "column": 7,
           "offset": 405
-        },
-        "indent": [
-          1,
-          3,
-          3,
-          3,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -865,8 +774,7 @@
               "line": 26,
               "column": 15,
               "offset": 421
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -887,8 +795,7 @@
                   "line": 26,
                   "column": 20,
                   "offset": 426
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -902,8 +809,7 @@
               "line": 26,
               "column": 86,
               "offset": 492
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -919,8 +825,7 @@
               "line": 26,
               "column": 87,
               "offset": 493
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -934,8 +839,7 @@
           "line": 26,
           "column": 87,
           "offset": 493
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -955,8 +859,7 @@
               "line": 28,
               "column": 16,
               "offset": 510
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -970,44 +873,59 @@
           "line": 28,
           "column": 16,
           "offset": 510
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Foo",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "stuff",
           "value": {
-            "type": "mdxValueExpression",
-            "value": "`\nHere is a template literal\n\nwith an empty line\n  `",
-            "position": {
-              "start": {
-                "line": 31,
-                "column": 9,
-                "offset": 525
-              },
-              "end": {
-                "line": 35,
-                "column": 5,
-                "offset": 579
+            "type": "mdxJsxAttributeValueExpression",
+            "value": "`\nHere is a template literal\n\nwith an empty line\n`",
+            "data": {
+              "estree": {
+                "type": "TemplateLiteral",
+                "start": 0,
+                "end": 52,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 3
+                  }
+                },
+                "expressions": [],
+                "quasis": [
+                  {
+                    "type": "TemplateElement",
+                    "start": 1,
+                    "end": 51,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 2
+                      }
+                    },
+                    "value": {
+                      "raw": "\nHere is a template literal\n\nwith an empty line\n  ",
+                      "cooked": "\nHere is a template literal\n\nwith an empty line\n  "
+                    },
+                    "tail": true
+                  }
+                ]
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 31,
-              "column": 3,
-              "offset": 519
-            },
-            "end": {
-              "line": 35,
-              "column": 5,
-              "offset": 579
-            }
           }
         }
       ],
@@ -1022,15 +940,7 @@
           "line": 36,
           "column": 3,
           "offset": 582
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -1050,17 +960,16 @@
               "line": 38,
               "column": 10,
               "offset": 593
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.name",
               "position": {
                 "start": {
@@ -1072,8 +981,58 @@
                   "line": 38,
                   "column": 24,
                   "offset": 607
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "name"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
@@ -1087,8 +1046,7 @@
               "line": 38,
               "column": 27,
               "offset": 610
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1102,8 +1060,7 @@
           "line": 38,
           "column": 27,
           "offset": 610
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1122,8 +1079,7 @@
               "line": 40,
               "column": 9,
               "offset": 620
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1137,8 +1093,7 @@
           "line": 40,
           "column": 9,
           "offset": 620
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1158,8 +1113,7 @@
               "line": 42,
               "column": 16,
               "offset": 637
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1173,35 +1127,176 @@
           "line": 42,
           "column": 16,
           "offset": 637
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Foo",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "const num = 1+1\n\nreturn <h2>{num}</h2>",
+          "type": "mdxFlowExpression",
+          "value": "\n<h2>{1+1}</h2>\n",
           "position": {
             "start": {
-              "line": 44,
-              "column": 6,
-              "offset": 644
+              "line": 45,
+              "column": 3,
+              "offset": 647
             },
             "end": {
-              "line": 48,
-              "column": 2,
-              "offset": 690
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1
-            ]
+              "line": 47,
+              "column": 4,
+              "offset": 671
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "JSXElement",
+              "start": 5,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 18
+                }
+              },
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start": 5,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 8
+                  }
+                },
+                "attributes": [],
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 6,
+                  "end": 8,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    }
+                  },
+                  "name": "h2"
+                },
+                "selfClosing": false
+              },
+              "closingElement": {
+                "type": "JSXClosingElement",
+                "start": 14,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 18
+                  }
+                },
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 16,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    }
+                  },
+                  "name": "h2"
+                }
+              },
+              "children": [
+                {
+                  "type": "JSXExpressionContainer",
+                  "start": 9,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 13
+                    }
+                  },
+                  "expression": {
+                    "type": "BinaryExpression",
+                    "start": 10,
+                    "end": 13,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 12
+                      }
+                    },
+                    "left": {
+                      "type": "Literal",
+                      "start": 10,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 10
+                        }
+                      },
+                      "value": 1,
+                      "raw": "1"
+                    },
+                    "operator": "+",
+                    "right": {
+                      "type": "Literal",
+                      "start": 12,
+                      "end": 13,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 12
+                        }
+                      },
+                      "value": 1,
+                      "raw": "1"
+                    }
+                  }
+                }
+              ]
+            }
           }
         }
       ],
@@ -1213,15 +1308,9 @@
         },
         "end": {
           "line": 48,
-          "column": 8,
-          "offset": 696
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+          "column": 7,
+          "offset": 678
+        }
       }
     }
   ],
@@ -1234,7 +1323,7 @@
     "end": {
       "line": 49,
       "column": 1,
-      "offset": 697
+      "offset": 679
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/block-parsing.md b/packages/remark-mdx/test/fixtures/block-parsing.md
index 76db56323..5329e6a42 100644
--- a/packages/remark-mdx/test/fixtures/block-parsing.md
+++ b/packages/remark-mdx/test/fixtures/block-parsing.md
@@ -41,8 +41,8 @@ Weeeeee!
 
 # Hello, world!
 
-<Foo>{
-  const num = 1+1
-
-  return <h2>{num}</h2>
-}</Foo>
+<Foo>
+  {
+    <h2>{1+1}</h2>
+  }
+</Foo>
diff --git a/packages/remark-mdx/test/fixtures/block-parsing.out b/packages/remark-mdx/test/fixtures/block-parsing.out
index 32c6a2861..c255b1472 100644
--- a/packages/remark-mdx/test/fixtures/block-parsing.out
+++ b/packages/remark-mdx/test/fixtures/block-parsing.out
@@ -4,9 +4,9 @@ From [GitHub](https://github.com/mdx-js/mdx/issues/195#issuecomment-506745859).
 
 <Row>
   <Col>
-    -   some md
-    -   asd
-    -   asd
+    *   some md
+    *   asd
+    *   asd
   </Col>
 
   <Col>
@@ -17,9 +17,9 @@ From [GitHub](https://github.com/mdx-js/mdx/issues/195#issuecomment-506745859).
 From [GitHub](https://github.com/mdx-js/mdx/issues/195#issuecomment-507167800)
 
 <Col>
-  -   osm
-  -   <Icon name="hero"/> **This will be plain text, not MD**
-  -   **some md**
+  *   osm
+  *   <Icon name="hero"/> **This will be plain text, not MD**
+  *   **some md**
 </Col>
 
 A couple from [John](https://github.com/mdx-js/mdx/issues/195#issuecomment-613509708):
@@ -30,7 +30,7 @@ A couple from [John](https://github.com/mdx-js/mdx/issues/195#issuecomment-61350
   Here is a template literal
 
   with an empty line
-    `}/>
+  `}/>
 
 # Hello, <>{props.name}</>
 
@@ -40,8 +40,6 @@ Weeeeee!
 
 <Foo>
   {
-    const num = 1+1
-
-    return <h2>{num}</h2>
+    <h2>{1+1}</h2>
   }
 </Foo>
diff --git a/packages/remark-mdx/test/fixtures/block-vs-inline.json b/packages/remark-mdx/test/fixtures/block-vs-inline.json
index 5ea4fae14..26073526b 100644
--- a/packages/remark-mdx/test/fixtures/block-vs-inline.json
+++ b/packages/remark-mdx/test/fixtures/block-vs-inline.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 19,
               "offset": 18
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 19,
           "offset": 18
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,10 +51,7 @@
               "line": 4,
               "column": 69,
               "offset": 163
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
@@ -70,10 +65,7 @@
           "line": 4,
           "column": 69,
           "offset": 163
-        },
-        "indent": [
-          1
-        ]
+        }
       }
     },
     {
@@ -92,13 +84,12 @@
               "line": 6,
               "column": 43,
               "offset": 207
-            },
-            "indent": []
+            }
           }
         },
         {
           "type": "inlineCode",
-          "value": "</x>",
+          "value": "<x>",
           "position": {
             "start": {
               "line": 6,
@@ -107,10 +98,9 @@
             },
             "end": {
               "line": 6,
-              "column": 49,
-              "offset": 213
-            },
-            "indent": []
+              "column": 48,
+              "offset": 212
+            }
           }
         },
         {
@@ -119,32 +109,30 @@
           "position": {
             "start": {
               "line": 6,
-              "column": 49,
-              "offset": 213
+              "column": 48,
+              "offset": 212
             },
             "end": {
               "line": 6,
-              "column": 65,
-              "offset": 229
-            },
-            "indent": []
+              "column": 64,
+              "offset": 228
+            }
           }
         },
         {
           "type": "inlineCode",
-          "value": ".",
+          "value": "_",
           "position": {
             "start": {
               "line": 6,
-              "column": 65,
-              "offset": 229
+              "column": 64,
+              "offset": 228
             },
             "end": {
               "line": 6,
-              "column": 68,
-              "offset": 232
-            },
-            "indent": []
+              "column": 67,
+              "offset": 231
+            }
           }
         },
         {
@@ -153,15 +141,14 @@
           "position": {
             "start": {
               "line": 6,
-              "column": 68,
-              "offset": 232
+              "column": 67,
+              "offset": 231
             },
             "end": {
               "line": 6,
-              "column": 69,
-              "offset": 233
-            },
-            "indent": []
+              "column": 68,
+              "offset": 232
+            }
           }
         }
       ],
@@ -173,17 +160,16 @@
         },
         "end": {
           "line": 6,
-          "column": 69,
-          "offset": 233
-        },
-        "indent": []
+          "column": 68,
+          "offset": 232
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "x",
           "attributes": [],
           "children": [
@@ -197,18 +183,17 @@
                     "start": {
                       "line": 8,
                       "column": 5,
-                      "offset": 239
+                      "offset": 238
                     },
                     "end": {
                       "line": 8,
                       "column": 10,
-                      "offset": 244
-                    },
-                    "indent": []
+                      "offset": 243
+                    }
                   }
                 },
                 {
-                  "type": "mdxSpanElement",
+                  "type": "mdxJsxTextElement",
                   "name": "y",
                   "attributes": [],
                   "children": [],
@@ -216,14 +201,13 @@
                     "start": {
                       "line": 8,
                       "column": 10,
-                      "offset": 244
+                      "offset": 243
                     },
                     "end": {
                       "line": 8,
                       "column": 14,
-                      "offset": 248
-                    },
-                    "indent": []
+                      "offset": 247
+                    }
                   }
                 }
               ],
@@ -231,14 +215,13 @@
                 "start": {
                   "line": 8,
                   "column": 4,
-                  "offset": 238
+                  "offset": 237
                 },
                 "end": {
                   "line": 8,
                   "column": 15,
-                  "offset": 249
-                },
-                "indent": []
+                  "offset": 248
+                }
               }
             }
           ],
@@ -246,31 +229,13 @@
             "start": {
               "line": 8,
               "column": 1,
-              "offset": 235
+              "offset": 234
             },
             "end": {
               "line": 8,
               "column": 19,
-              "offset": 253
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": ".",
-          "position": {
-            "start": {
-              "line": 8,
-              "column": 19,
-              "offset": 253
-            },
-            "end": {
-              "line": 8,
-              "column": 20,
-              "offset": 254
-            },
-            "indent": []
+              "offset": 252
+            }
           }
         }
       ],
@@ -278,14 +243,13 @@
         "start": {
           "line": 8,
           "column": 1,
-          "offset": 235
+          "offset": 234
         },
         "end": {
           "line": 8,
-          "column": 20,
-          "offset": 254
-        },
-        "indent": []
+          "column": 19,
+          "offset": 252
+        }
       }
     },
     {
@@ -293,21 +257,18 @@
       "children": [
         {
           "type": "text",
-          "value": "This is a block, thus its contents is also a block, resulting in a heading: it\ndoesn’t matter that there are no enters.",
+          "value": "This is inline too, not a heading:",
           "position": {
             "start": {
               "line": 10,
               "column": 1,
-              "offset": 256
+              "offset": 254
             },
             "end": {
-              "line": 11,
-              "column": 41,
-              "offset": 375
-            },
-            "indent": [
-              1
-            ]
+              "line": 10,
+              "column": 35,
+              "offset": 288
+            }
           }
         }
       ],
@@ -315,72 +276,65 @@
         "start": {
           "line": 10,
           "column": 1,
-          "offset": 256
+          "offset": 254
         },
         "end": {
-          "line": 11,
-          "column": 41,
-          "offset": 375
-        },
-        "indent": [
-          1
-        ]
+          "line": 10,
+          "column": 35,
+          "offset": 288
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "X",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "heading",
-          "depth": 1,
+          "type": "mdxJsxTextElement",
+          "name": "x",
+          "attributes": [],
           "children": [
             {
               "type": "text",
-              "value": "heading",
+              "value": "# hea\nding",
               "position": {
                 "start": {
-                  "line": 13,
-                  "column": 6,
-                  "offset": 382
+                  "line": 12,
+                  "column": 4,
+                  "offset": 293
                 },
                 "end": {
                   "line": 13,
-                  "column": 13,
-                  "offset": 389
-                },
-                "indent": []
+                  "column": 5,
+                  "offset": 303
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 13,
-              "column": 4,
-              "offset": 380
+              "line": 12,
+              "column": 1,
+              "offset": 290
             },
             "end": {
               "line": 13,
-              "column": 13,
-              "offset": 389
-            },
-            "indent": []
+              "column": 9,
+              "offset": 307
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 13,
+          "line": 12,
           "column": 1,
-          "offset": 377
+          "offset": 290
         },
         "end": {
           "line": 13,
-          "column": 17,
-          "offset": 393
-        },
-        "indent": []
+          "column": 9,
+          "offset": 307
+        }
       }
     },
     {
@@ -388,21 +342,18 @@
       "children": [
         {
           "type": "text",
-          "value": "Here we also have a block.\nAnd an inline.",
+          "value": "This is a block: there is nothing before or after the tags.",
           "position": {
             "start": {
               "line": 15,
               "column": 1,
-              "offset": 395
+              "offset": 309
             },
             "end": {
-              "line": 16,
-              "column": 15,
-              "offset": 436
-            },
-            "indent": [
-              1
-            ]
+              "line": 15,
+              "column": 60,
+              "offset": 368
+            }
           }
         }
       ],
@@ -410,184 +361,51 @@
         "start": {
           "line": 15,
           "column": 1,
-          "offset": 395
+          "offset": 309
         },
         "end": {
-          "line": 16,
-          "column": 15,
-          "offset": 436
-        },
-        "indent": [
-          1
-        ]
+          "line": 15,
+          "column": 60,
+          "offset": 368
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
         {
-          "type": "heading",
-          "depth": 1,
+          "type": "paragraph",
           "children": [
             {
               "type": "text",
-              "value": "heading ",
+              "value": "One paragraph.",
               "position": {
                 "start": {
                   "line": 18,
-                  "column": 6,
-                  "offset": 443
+                  "column": 3,
+                  "offset": 376
                 },
                 "end": {
                   "line": 18,
-                  "column": 14,
-                  "offset": 451
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "mdxSpanElement",
-              "name": "y",
-              "attributes": [],
-              "children": [
-                {
-                  "type": "text",
-                  "value": "inline",
-                  "position": {
-                    "start": {
-                      "line": 18,
-                      "column": 17,
-                      "offset": 454
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 23,
-                      "offset": 460
-                    },
-                    "indent": []
-                  }
+                  "column": 17,
+                  "offset": 390
                 }
-              ],
-              "position": {
-                "start": {
-                  "line": 18,
-                  "column": 14,
-                  "offset": 451
-                },
-                "end": {
-                  "line": 18,
-                  "column": 27,
-                  "offset": 464
-                },
-                "indent": []
               }
             }
           ],
           "position": {
             "start": {
               "line": 18,
-              "column": 4,
-              "offset": 441
+              "column": 3,
+              "offset": 376
             },
             "end": {
               "line": 18,
-              "column": 27,
-              "offset": 464
-            },
-            "indent": []
-          }
-        }
-      ],
-      "position": {
-        "start": {
-          "line": 18,
-          "column": 1,
-          "offset": 438
-        },
-        "end": {
-          "line": 18,
-          "column": 31,
-          "offset": 468
-        },
-        "indent": []
-      }
-    },
-    {
-      "type": "paragraph",
-      "children": [
-        {
-          "type": "text",
-          "value": "This isn’t very readable, but it is a block, with two paragraphs:",
-          "position": {
-            "start": {
-              "line": 20,
-              "column": 1,
-              "offset": 470
-            },
-            "end": {
-              "line": 20,
-              "column": 66,
-              "offset": 535
-            },
-            "indent": []
-          }
-        }
-      ],
-      "position": {
-        "start": {
-          "line": 20,
-          "column": 1,
-          "offset": 470
-        },
-        "end": {
-          "line": 20,
-          "column": 66,
-          "offset": 535
-        },
-        "indent": []
-      }
-    },
-    {
-      "type": "mdxBlockElement",
-      "name": "X",
-      "attributes": [],
-      "children": [
-        {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "text",
-              "value": "One paragraph.",
-              "position": {
-                "start": {
-                  "line": 22,
-                  "column": 4,
-                  "offset": 540
-                },
-                "end": {
-                  "line": 22,
-                  "column": 18,
-                  "offset": 554
-                },
-                "indent": []
-              }
+              "column": 17,
+              "offset": 390
             }
-          ],
-          "position": {
-            "start": {
-              "line": 22,
-              "column": 4,
-              "offset": 540
-            },
-            "end": {
-              "line": 22,
-              "column": 18,
-              "offset": 554
-            },
-            "indent": []
           }
         },
         {
@@ -598,49 +416,43 @@
               "value": "Two paragraph.",
               "position": {
                 "start": {
-                  "line": 24,
-                  "column": 1,
-                  "offset": 556
+                  "line": 20,
+                  "column": 3,
+                  "offset": 394
                 },
                 "end": {
-                  "line": 24,
-                  "column": 15,
-                  "offset": 570
-                },
-                "indent": []
+                  "line": 20,
+                  "column": 17,
+                  "offset": 408
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 24,
-              "column": 1,
-              "offset": 556
+              "line": 20,
+              "column": 3,
+              "offset": 394
             },
             "end": {
-              "line": 24,
-              "column": 15,
-              "offset": 570
-            },
-            "indent": []
+              "line": 20,
+              "column": 17,
+              "offset": 408
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 22,
+          "line": 17,
           "column": 1,
-          "offset": 537
+          "offset": 370
         },
         "end": {
-          "line": 24,
-          "column": 19,
-          "offset": 574
-        },
-        "indent": [
-          1,
-          1
-        ]
+          "line": 21,
+          "column": 5,
+          "offset": 413
+        }
       }
     },
     {
@@ -651,50 +463,47 @@
           "value": "Blocks can be self-closing:",
           "position": {
             "start": {
-              "line": 26,
+              "line": 23,
               "column": 1,
-              "offset": 576
+              "offset": 415
             },
             "end": {
-              "line": 26,
+              "line": 23,
               "column": 28,
-              "offset": 603
-            },
-            "indent": []
+              "offset": 442
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 26,
+          "line": 23,
           "column": 1,
-          "offset": 576
+          "offset": 415
         },
         "end": {
-          "line": 26,
+          "line": 23,
           "column": 28,
-          "offset": 603
-        },
-        "indent": []
+          "offset": 442
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [],
       "position": {
         "start": {
-          "line": 28,
+          "line": 25,
           "column": 1,
-          "offset": 605
+          "offset": 444
         },
         "end": {
-          "line": 28,
+          "line": 25,
           "column": 5,
-          "offset": 609
-        },
-        "indent": []
+          "offset": 448
+        }
       }
     }
   ],
@@ -705,9 +514,9 @@
       "offset": 0
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 1,
-      "offset": 610
+      "offset": 449
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/block-vs-inline.md b/packages/remark-mdx/test/fixtures/block-vs-inline.md
index 70566c4b5..a80858865 100644
--- a/packages/remark-mdx/test/fixtures/block-vs-inline.md
+++ b/packages/remark-mdx/test/fixtures/block-vs-inline.md
@@ -3,25 +3,22 @@
 To make this example more readable, uppercase letters are used when JSX is
 parsed as a block, wheres lowercase letters are used for inline JSX.
 
-This is inline, it’s a paragraph, because `</x>` is followed by `.`.
+This is inline, it’s a paragraph, because `<x>` is followed by `_`.
 
-<x>_alpha<y/>_</x>.
+<x>_alpha<y/>_</x>
 
-This is a block, thus its contents is also a block, resulting in a heading: it
-doesn’t matter that there are no enters.
+This is inline too, not a heading:
 
-<X># heading</X>
+<x># hea
+ding</x>
 
-Here we also have a block.
-And an inline.
+This is a block: there is nothing before or after the tags.
 
-<X># heading <y>inline</y></X>
+<X>
+  One paragraph.
 
-This isn’t very readable, but it is a block, with two paragraphs:
-
-<X>One paragraph.
-
-Two paragraph.</X>
+  Two paragraph.
+</X>
 
 Blocks can be self-closing:
 
diff --git a/packages/remark-mdx/test/fixtures/block-vs-inline.out b/packages/remark-mdx/test/fixtures/block-vs-inline.out
index 8aae82ecb..45195eae0 100644
--- a/packages/remark-mdx/test/fixtures/block-vs-inline.out
+++ b/packages/remark-mdx/test/fixtures/block-vs-inline.out
@@ -3,25 +3,16 @@
 To make this example more readable, uppercase letters are used when JSX is
 parsed as a block, wheres lowercase letters are used for inline JSX.
 
-This is inline, it’s a paragraph, because `</x>` is followed by `.`.
+This is inline, it’s a paragraph, because `<x>` is followed by `_`.
 
-<x>_alpha<y/>_</x>.
+<x>*alpha<y/>*</x>
 
-This is a block, thus its contents is also a block, resulting in a heading: it
-doesn’t matter that there are no enters.
+This is inline too, not a heading:
 
-<X>
-  # heading
-</X>
-
-Here we also have a block.
-And an inline.
-
-<X>
-  # heading <y>inline</y>
-</X>
+<x># hea
+ding</x>
 
-This isn’t very readable, but it is a block, with two paragraphs:
+This is a block: there is nothing before or after the tags.
 
 <X>
   One paragraph.
diff --git a/packages/remark-mdx/test/fixtures/character-reference.json b/packages/remark-mdx/test/fixtures/character-reference.json
index acacd82e8..c312bfac5 100644
--- a/packages/remark-mdx/test/fixtures/character-reference.json
+++ b/packages/remark-mdx/test/fixtures/character-reference.json
@@ -17,8 +17,7 @@
               "line": 1,
               "column": 16,
               "offset": 15
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -34,8 +33,7 @@
               "line": 1,
               "column": 19,
               "offset": 18
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -51,8 +49,7 @@
               "line": 1,
               "column": 24,
               "offset": 23
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -68,8 +65,7 @@
               "line": 1,
               "column": 27,
               "offset": 26
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -85,8 +81,7 @@
               "line": 1,
               "column": 71,
               "offset": 70
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -100,8 +95,7 @@
           "line": 1,
           "column": 71,
           "offset": 70
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -123,8 +117,7 @@
                   "line": 3,
                   "column": 12,
                   "offset": 83
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -140,8 +133,7 @@
                   "line": 3,
                   "column": 15,
                   "offset": 86
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -157,8 +149,7 @@
                   "line": 3,
                   "column": 40,
                   "offset": 111
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -172,8 +163,7 @@
               "line": 3,
               "column": 40,
               "offset": 111
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -187,8 +177,7 @@
           "line": 3,
           "column": 40,
           "offset": 111
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -207,12 +196,11 @@
               "line": 5,
               "column": 49,
               "offset": 161
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -229,8 +217,7 @@
                   "line": 5,
                   "column": 58,
                   "offset": 170
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -244,8 +231,7 @@
               "line": 5,
               "column": 61,
               "offset": 173
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -261,8 +247,7 @@
               "line": 5,
               "column": 62,
               "offset": 174
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -276,12 +261,11 @@
           "line": 5,
           "column": 62,
           "offset": 174
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockExpression",
+      "type": "mdxFlowExpression",
       "value": "/* starts an expression, it must be closed: */",
       "position": {
         "start": {
@@ -293,8 +277,7 @@
           "line": 7,
           "column": 49,
           "offset": 224
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -302,53 +285,18 @@
       "children": [
         {
           "type": "text",
-          "value": "If you don’t want an expression, encode it, like so: ",
+          "value": "If you don’t want an expression, encode it, like so: {.",
           "position": {
             "start": {
               "line": 9,
               "column": 1,
               "offset": 226
             },
-            "end": {
-              "line": 9,
-              "column": 54,
-              "offset": 279
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": "{",
-          "position": {
-            "start": {
-              "line": 9,
-              "column": 54,
-              "offset": 279
-            },
-            "end": {
-              "line": 9,
-              "column": 60,
-              "offset": 285
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": ".",
-          "position": {
-            "start": {
-              "line": 9,
-              "column": 60,
-              "offset": 285
-            },
             "end": {
               "line": 9,
               "column": 61,
               "offset": 286
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -362,30 +310,17 @@
           "line": 9,
           "column": 61,
           "offset": 286
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "starts",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "a",
-          "value": "tag, which must be properly closed: ",
-          "position": {
-            "start": {
-              "line": 11,
-              "column": 9,
-              "offset": 296
-            },
-            "end": {
-              "line": 11,
-              "column": 49,
-              "offset": 336
-            }
-          }
+          "value": "tag, which must be properly closed: "
         }
       ],
       "children": [],
@@ -399,8 +334,7 @@
           "line": 11,
           "column": 51,
           "offset": 338
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -408,53 +342,18 @@
       "children": [
         {
           "type": "text",
-          "value": "If you don’t want a tag, encode it, like so: ",
+          "value": "If you don’t want a tag, encode it, like so: <.",
           "position": {
             "start": {
               "line": 13,
               "column": 1,
               "offset": 340
             },
-            "end": {
-              "line": 13,
-              "column": 46,
-              "offset": 385
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": "<",
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 46,
-              "offset": 385
-            },
-            "end": {
-              "line": 13,
-              "column": 50,
-              "offset": 389
-            },
-            "indent": []
-          }
-        },
-        {
-          "type": "text",
-          "value": ".",
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 50,
-              "offset": 389
-            },
             "end": {
               "line": 13,
               "column": 51,
               "offset": 390
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -468,8 +367,7 @@
           "line": 13,
           "column": 51,
           "offset": 390
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -488,8 +386,7 @@
               "line": 15,
               "column": 36,
               "offset": 427
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -505,8 +402,7 @@
               "line": 15,
               "column": 45,
               "offset": 436
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -522,14 +418,11 @@
               "line": 16,
               "column": 45,
               "offset": 482
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -546,8 +439,7 @@
                   "line": 16,
                   "column": 56,
                   "offset": 493
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -561,8 +453,7 @@
               "line": 16,
               "column": 59,
               "offset": 496
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -578,10 +469,7 @@
               "line": 17,
               "column": 17,
               "offset": 514
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
@@ -595,15 +483,11 @@
           "line": 17,
           "column": 17,
           "offset": 514
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "B",
       "attributes": [],
       "children": [
@@ -615,18 +499,14 @@
           "position": {
             "start": {
               "line": 20,
-              "column": 1,
-              "offset": 520
+              "column": 3,
+              "offset": 522
             },
             "end": {
               "line": 22,
               "column": 6,
               "offset": 541
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         },
         {
@@ -637,18 +517,14 @@
           "position": {
             "start": {
               "line": 24,
-              "column": 1,
-              "offset": 543
+              "column": 3,
+              "offset": 545
             },
             "end": {
               "line": 26,
               "column": 6,
               "offset": 570
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         },
         {
@@ -660,15 +536,14 @@
               "position": {
                 "start": {
                   "line": 28,
-                  "column": 1,
-                  "offset": 572
+                  "column": 3,
+                  "offset": 574
                 },
                 "end": {
                   "line": 28,
                   "column": 10,
                   "offset": 581
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -684,8 +559,7 @@
                   "line": 28,
                   "column": 25,
                   "offset": 596
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -701,23 +575,21 @@
                   "line": 28,
                   "column": 26,
                   "offset": 597
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 28,
-              "column": 1,
-              "offset": 572
+              "column": 3,
+              "offset": 574
             },
             "end": {
               "line": 28,
               "column": 26,
               "offset": 597
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -731,19 +603,7 @@
           "line": 29,
           "column": 5,
           "offset": 602
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/character-reference.out b/packages/remark-mdx/test/fixtures/character-reference.out
index 96c34e51a..de9daeb76 100644
--- a/packages/remark-mdx/test/fixtures/character-reference.out
+++ b/packages/remark-mdx/test/fixtures/character-reference.out
@@ -4,15 +4,13 @@ The characters `>` and `}` don’t need to be handled differently: >, }.
 
 Those characters are also fine in JSX elements: <>> and }</>.
 
-{
-  /* starts an expression, it must be closed: */
-}
+{/* starts an expression, it must be closed: */}
 
-If you don’t want an expression, encode it, like so: &#x7B;.
+If you don’t want an expression, encode it, like so: \{.
 
 <starts a="tag, which must be properly closed: "/>
 
-If you don’t want a tag, encode it, like so: &lt;.
+If you don’t want a tag, encode it, like so: \<.
 
 Those characters are fine in code: `< and {`.
 They’re fine in JSX elements, in code, too: <>`< and {`</>.
diff --git a/packages/remark-mdx/test/fixtures/code.json b/packages/remark-mdx/test/fixtures/code.json
index 35ababcf4..6fd6a7db3 100644
--- a/packages/remark-mdx/test/fixtures/code.json
+++ b/packages/remark-mdx/test/fixtures/code.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 26,
               "offset": 25
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 26,
           "offset": 25
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -54,8 +52,7 @@
               "line": 3,
               "column": 9,
               "offset": 35
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -69,8 +66,7 @@
           "line": 3,
           "column": 9,
           "offset": 35
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -90,8 +86,7 @@
               "line": 5,
               "column": 16,
               "offset": 52
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -105,8 +100,7 @@
           "line": 5,
           "column": 16,
           "offset": 52
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -125,8 +119,7 @@
               "line": 7,
               "column": 34,
               "offset": 87
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -140,8 +133,7 @@
           "line": 7,
           "column": 34,
           "offset": 87
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -159,11 +151,7 @@
           "line": 11,
           "column": 4,
           "offset": 104
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -182,10 +170,7 @@
               "line": 14,
               "column": 81,
               "offset": 224
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
@@ -199,14 +184,11 @@
           "line": 14,
           "column": 81,
           "offset": 224
-        },
-        "indent": [
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
@@ -225,11 +207,7 @@
               "line": 19,
               "column": 4,
               "offset": 245
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -243,13 +221,7 @@
           "line": 20,
           "column": 5,
           "offset": 250
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -268,8 +240,7 @@
               "line": 22,
               "column": 4,
               "offset": 255
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -283,12 +254,11 @@
           "line": 22,
           "column": 4,
           "offset": 255
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
@@ -299,19 +269,15 @@
           "value": "<//>",
           "position": {
             "start": {
-              "line": 24,
-              "column": 4,
-              "offset": 260
+              "line": 25,
+              "column": 3,
+              "offset": 263
             },
             "end": {
-              "line": 26,
-              "column": 4,
-              "offset": 275
-            },
-            "indent": [
-              1,
-              1
-            ]
+              "line": 27,
+              "column": 6,
+              "offset": 282
+            }
           }
         }
       ],
@@ -322,14 +288,10 @@
           "offset": 257
         },
         "end": {
-          "line": 26,
-          "column": 8,
-          "offset": 279
-        },
-        "indent": [
-          1,
-          1
-        ]
+          "line": 28,
+          "column": 5,
+          "offset": 287
+        }
       }
     },
     {
@@ -340,35 +302,33 @@
           "value": "Or:",
           "position": {
             "start": {
-              "line": 28,
+              "line": 30,
               "column": 1,
-              "offset": 281
+              "offset": 289
             },
             "end": {
-              "line": 28,
+              "line": 30,
               "column": 4,
-              "offset": 284
-            },
-            "indent": []
+              "offset": 292
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 28,
+          "line": 30,
           "column": 1,
-          "offset": 281
+          "offset": 289
         },
         "end": {
-          "line": 28,
+          "line": 30,
           "column": 4,
-          "offset": 284
-        },
-        "indent": []
+          "offset": 292
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
@@ -379,38 +339,29 @@
           "value": "<//>",
           "position": {
             "start": {
-              "line": 31,
+              "line": 33,
               "column": 1,
-              "offset": 290
+              "offset": 298
             },
             "end": {
-              "line": 33,
+              "line": 35,
               "column": 6,
-              "offset": 306
-            },
-            "indent": [
-              1,
-              1
-            ]
+              "offset": 314
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 30,
+          "line": 32,
           "column": 1,
-          "offset": 286
+          "offset": 294
         },
         "end": {
-          "line": 33,
-          "column": 10,
-          "offset": 310
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+          "line": 36,
+          "column": 5,
+          "offset": 319
+        }
       }
     },
     {
@@ -422,31 +373,29 @@
           "value": "Indented code",
           "position": {
             "start": {
-              "line": 35,
+              "line": 38,
               "column": 5,
-              "offset": 316
+              "offset": 325
             },
             "end": {
-              "line": 35,
+              "line": 38,
               "column": 18,
-              "offset": 329
-            },
-            "indent": []
+              "offset": 338
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 35,
+          "line": 38,
           "column": 1,
-          "offset": 312
+          "offset": 321
         },
         "end": {
-          "line": 35,
+          "line": 38,
           "column": 18,
-          "offset": 329
-        },
-        "indent": []
+          "offset": 338
+        }
       }
     },
     {
@@ -457,40 +406,38 @@
           "value": "Not code!",
           "position": {
             "start": {
-              "line": 37,
-              "column": 1,
-              "offset": 331
+              "line": 40,
+              "column": 5,
+              "offset": 344
             },
             "end": {
-              "line": 37,
+              "line": 40,
               "column": 14,
-              "offset": 344
-            },
-            "indent": []
+              "offset": 353
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 37,
-          "column": 1,
-          "offset": 331
+          "line": 40,
+          "column": 5,
+          "offset": 344
         },
         "end": {
-          "line": 37,
+          "line": 40,
           "column": 14,
-          "offset": 344
-        },
-        "indent": []
+          "offset": 353
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "A",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "B",
           "attributes": [],
           "children": [
@@ -502,87 +449,71 @@
                   "value": "Nor this!",
                   "position": {
                     "start": {
-                      "line": 41,
-                      "column": 1,
-                      "offset": 356
+                      "line": 44,
+                      "column": 5,
+                      "offset": 369
                     },
                     "end": {
-                      "line": 42,
-                      "column": 3,
-                      "offset": 372
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "line": 44,
+                      "column": 14,
+                      "offset": 378
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 41,
-                  "column": 1,
-                  "offset": 356
+                  "line": 44,
+                  "column": 5,
+                  "offset": 369
                 },
                 "end": {
-                  "line": 42,
-                  "column": 3,
-                  "offset": 372
-                },
-                "indent": [
-                  1
-                ]
+                  "line": 44,
+                  "column": 14,
+                  "offset": 378
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 40,
-              "column": 1,
-              "offset": 350
+              "line": 43,
+              "column": 3,
+              "offset": 361
             },
             "end": {
-              "line": 42,
+              "line": 45,
               "column": 7,
-              "offset": 376
-            },
-            "indent": [
-              1,
-              1
-            ]
+              "offset": 385
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 39,
+          "line": 42,
           "column": 1,
-          "offset": 346
+          "offset": 355
         },
         "end": {
-          "line": 43,
+          "line": 46,
           "column": 5,
-          "offset": 381
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+          "offset": 390
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "A",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "B",
           "attributes": [],
           "children": [
             {
-              "type": "mdxBlockElement",
+              "type": "mdxJsxFlowElement",
               "name": "C",
               "attributes": [],
               "children": [
@@ -594,95 +525,71 @@
                       "value": "Nor this, these are all paragraphs.",
                       "position": {
                         "start": {
-                          "line": 48,
-                          "column": 1,
-                          "offset": 401
+                          "line": 51,
+                          "column": 7,
+                          "offset": 416
                         },
                         "end": {
-                          "line": 49,
-                          "column": 5,
-                          "offset": 447
-                        },
-                        "indent": [
-                          1
-                        ]
+                          "line": 51,
+                          "column": 42,
+                          "offset": 451
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
-                      "line": 48,
-                      "column": 1,
-                      "offset": 401
+                      "line": 51,
+                      "column": 7,
+                      "offset": 416
                     },
                     "end": {
-                      "line": 49,
-                      "column": 5,
-                      "offset": 447
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "line": 51,
+                      "column": 42,
+                      "offset": 451
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 47,
-                  "column": 1,
-                  "offset": 393
+                  "line": 50,
+                  "column": 5,
+                  "offset": 406
                 },
                 "end": {
-                  "line": 49,
+                  "line": 52,
                   "column": 9,
-                  "offset": 451
-                },
-                "indent": [
-                  1,
-                  1
-                ]
+                  "offset": 460
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 46,
-              "column": 1,
-              "offset": 387
+              "line": 49,
+              "column": 3,
+              "offset": 398
             },
             "end": {
-              "line": 50,
+              "line": 53,
               "column": 7,
-              "offset": 458
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1
-            ]
+              "offset": 467
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 45,
+          "line": 48,
           "column": 1,
-          "offset": 383
+          "offset": 392
         },
         "end": {
-          "line": 51,
+          "line": 54,
           "column": 5,
-          "offset": 463
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+          "offset": 472
+        }
       }
     },
     {
@@ -694,31 +601,29 @@
           "value": "Span",
           "position": {
             "start": {
-              "line": 53,
+              "line": 56,
               "column": 4,
-              "offset": 468
+              "offset": 477
             },
             "end": {
-              "line": 53,
+              "line": 56,
               "column": 8,
-              "offset": 472
-            },
-            "indent": []
+              "offset": 481
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 53,
+          "line": 56,
           "column": 1,
-          "offset": 465
+          "offset": 474
         },
         "end": {
-          "line": 53,
+          "line": 56,
           "column": 8,
-          "offset": 472
-        },
-        "indent": []
+          "offset": 481
+        }
       }
     },
     {
@@ -730,31 +635,29 @@
           "value": "Code span",
           "position": {
             "start": {
-              "line": 55,
+              "line": 58,
               "column": 5,
-              "offset": 478
+              "offset": 487
             },
             "end": {
-              "line": 55,
+              "line": 58,
               "column": 14,
-              "offset": 487
-            },
-            "indent": []
+              "offset": 496
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 55,
+          "line": 58,
           "column": 1,
-          "offset": 474
+          "offset": 483
         },
         "end": {
-          "line": 55,
+          "line": 58,
           "column": 14,
-          "offset": 487
-        },
-        "indent": []
+          "offset": 496
+        }
       }
     },
     {
@@ -765,16 +668,15 @@
           "value": "Here is an example of broken JSX: ",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 1,
-              "offset": 489
+              "offset": 498
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 35,
-              "offset": 523
-            },
-            "indent": []
+              "offset": 532
+            }
           }
         },
         {
@@ -782,16 +684,15 @@
           "value": "<//>",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 35,
-              "offset": 523
+              "offset": 532
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 45,
-              "offset": 533
-            },
-            "indent": []
+              "offset": 542
+            }
           }
         },
         {
@@ -799,16 +700,15 @@
           "value": ", or here: ",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 45,
-              "offset": 533
+              "offset": 542
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 56,
-              "offset": 544
-            },
-            "indent": []
+              "offset": 553
+            }
           }
         },
         {
@@ -816,16 +716,15 @@
           "value": "{",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 56,
-              "offset": 544
+              "offset": 553
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 59,
-              "offset": 547
-            },
-            "indent": []
+              "offset": 556
+            }
           }
         },
         {
@@ -833,16 +732,15 @@
           "value": ", and this: ",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 59,
-              "offset": 547
+              "offset": 556
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 71,
-              "offset": 559
-            },
-            "indent": []
+              "offset": 568
+            }
           }
         },
         {
@@ -850,16 +748,15 @@
           "value": "<",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 71,
-              "offset": 559
+              "offset": 568
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 78,
-              "offset": 566
-            },
-            "indent": []
+              "offset": 575
+            }
           }
         },
         {
@@ -867,31 +764,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 57,
+              "line": 60,
               "column": 78,
-              "offset": 566
+              "offset": 575
             },
             "end": {
-              "line": 57,
+              "line": 60,
               "column": 79,
-              "offset": 567
-            },
-            "indent": []
+              "offset": 576
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 57,
+          "line": 60,
           "column": 1,
-          "offset": 489
+          "offset": 498
         },
         "end": {
-          "line": 57,
+          "line": 60,
           "column": 79,
-          "offset": 567
-        },
-        "indent": []
+          "offset": 576
+        }
       }
     },
     {
@@ -902,20 +797,19 @@
           "value": "And inside JSX: ",
           "position": {
             "start": {
-              "line": 59,
+              "line": 62,
               "column": 1,
-              "offset": 569
+              "offset": 578
             },
             "end": {
-              "line": 59,
+              "line": 62,
               "column": 17,
-              "offset": 585
-            },
-            "indent": []
+              "offset": 594
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -924,31 +818,29 @@
               "value": "<//>",
               "position": {
                 "start": {
-                  "line": 59,
+                  "line": 62,
                   "column": 19,
-                  "offset": 587
+                  "offset": 596
                 },
                 "end": {
-                  "line": 59,
+                  "line": 62,
                   "column": 25,
-                  "offset": 593
-                },
-                "indent": []
+                  "offset": 602
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 59,
+              "line": 62,
               "column": 17,
-              "offset": 585
+              "offset": 594
             },
             "end": {
-              "line": 59,
+              "line": 62,
               "column": 28,
-              "offset": 596
-            },
-            "indent": []
+              "offset": 605
+            }
           }
         },
         {
@@ -956,20 +848,19 @@
           "value": ", or like so: ",
           "position": {
             "start": {
-              "line": 59,
+              "line": 62,
               "column": 28,
-              "offset": 596
+              "offset": 605
             },
             "end": {
-              "line": 59,
+              "line": 62,
               "column": 42,
-              "offset": 610
-            },
-            "indent": []
+              "offset": 619
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "x",
           "attributes": [],
           "children": [
@@ -978,31 +869,29 @@
               "value": "< and {",
               "position": {
                 "start": {
-                  "line": 59,
+                  "line": 62,
                   "column": 45,
-                  "offset": 613
+                  "offset": 622
                 },
                 "end": {
-                  "line": 59,
+                  "line": 62,
                   "column": 54,
-                  "offset": 622
-                },
-                "indent": []
+                  "offset": 631
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 59,
+              "line": 62,
               "column": 42,
-              "offset": 610
+              "offset": 619
             },
             "end": {
-              "line": 59,
+              "line": 62,
               "column": 58,
-              "offset": 626
-            },
-            "indent": []
+              "offset": 635
+            }
           }
         },
         {
@@ -1010,31 +899,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 59,
+              "line": 62,
               "column": 58,
-              "offset": 626
+              "offset": 635
             },
             "end": {
-              "line": 59,
+              "line": 62,
               "column": 59,
-              "offset": 627
-            },
-            "indent": []
+              "offset": 636
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 59,
+          "line": 62,
           "column": 1,
-          "offset": 569
+          "offset": 578
         },
         "end": {
-          "line": 59,
+          "line": 62,
           "column": 59,
-          "offset": 627
-        },
-        "indent": []
+          "offset": 636
+        }
       }
     }
   ],
@@ -1045,9 +932,9 @@
       "offset": 0
     },
     "end": {
-      "line": 60,
+      "line": 63,
       "column": 1,
-      "offset": 628
+      "offset": 637
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/code.md b/packages/remark-mdx/test/fixtures/code.md
index 36ee895b2..81f74db1a 100644
--- a/packages/remark-mdx/test/fixtures/code.md
+++ b/packages/remark-mdx/test/fixtures/code.md
@@ -21,16 +21,19 @@ We can’t use character references, because those don’t work in markdown code
 
 Or:
 
-<X>```jsx
-<//>
-```</X>
+<X>
+  ```jsx
+  <//>
+  ```
+</X>
 
 Or:
 
 <X>
 ~~~~~
 <//>
-~~~~~</X>
+~~~~~
+</X>
 
 ### Indented code
 
diff --git a/packages/remark-mdx/test/fixtures/examples-from-jsx.json b/packages/remark-mdx/test/fixtures/examples-from-jsx.json
index 1f31eb54a..9fcc35e0d 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-jsx.json
+++ b/packages/remark-mdx/test/fixtures/examples-from-jsx.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 20,
               "offset": 19
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 20,
           "offset": 19
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,8 +51,7 @@
               "line": 3,
               "column": 6,
               "offset": 26
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -75,8 +72,7 @@
                   "line": 3,
                   "column": 10,
                   "offset": 30
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -90,8 +86,7 @@
               "line": 3,
               "column": 44,
               "offset": 64
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -107,8 +102,7 @@
               "line": 3,
               "column": 45,
               "offset": 65
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -122,12 +116,11 @@
           "line": 3,
           "column": 45,
           "offset": 65
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Dropdown",
       "attributes": [],
       "children": [
@@ -136,30 +129,44 @@
           "children": [
             {
               "type": "text",
-              "value": "A dropdown list\n",
+              "value": "A dropdown list",
               "position": {
                 "start": {
                   "line": 6,
-                  "column": 1,
-                  "offset": 78
-                },
-                "end": {
-                  "line": 7,
                   "column": 3,
-                  "offset": 98
+                  "offset": 80
                 },
-                "indent": [
-                  1
-                ]
+                "end": {
+                  "line": 6,
+                  "column": 18,
+                  "offset": 95
+                }
               }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 6,
+              "column": 3,
+              "offset": 80
             },
+            "end": {
+              "line": 6,
+              "column": 18,
+              "offset": 95
+            }
+          }
+        },
+        {
+          "type": "mdxJsxFlowElement",
+          "name": "Menu",
+          "attributes": [],
+          "children": [
             {
-              "type": "mdxSpanElement",
-              "name": "Menu",
-              "attributes": [],
+              "type": "paragraph",
               "children": [
                 {
-                  "type": "mdxSpanElement",
+                  "type": "mdxJsxTextElement",
                   "name": "MenuItem",
                   "attributes": [],
                   "children": [
@@ -176,8 +183,7 @@
                           "line": 8,
                           "column": 27,
                           "offset": 131
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -191,8 +197,7 @@
                       "line": 8,
                       "column": 38,
                       "offset": 142
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -206,16 +211,13 @@
                     },
                     "end": {
                       "line": 9,
-                      "column": 5,
-                      "offset": 147
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "column": 1,
+                      "offset": 143
+                    }
                   }
                 },
                 {
-                  "type": "mdxSpanElement",
+                  "type": "mdxJsxTextElement",
                   "name": "MenuItem",
                   "attributes": [],
                   "children": [
@@ -232,8 +234,7 @@
                           "line": 9,
                           "column": 32,
                           "offset": 174
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -247,8 +248,7 @@
                       "line": 9,
                       "column": 43,
                       "offset": 185
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -262,16 +262,13 @@
                     },
                     "end": {
                       "line": 10,
-                      "column": 5,
-                      "offset": 190
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "column": 1,
+                      "offset": 186
+                    }
                   }
                 },
                 {
-                  "type": "mdxSpanElement",
+                  "type": "mdxJsxTextElement",
                   "name": "MenuItem",
                   "attributes": [],
                   "children": [
@@ -288,8 +285,7 @@
                           "line": 10,
                           "column": 32,
                           "offset": 217
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -303,49 +299,35 @@
                       "line": 10,
                       "column": 43,
                       "offset": 228
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 7,
-                  "column": 3,
-                  "offset": 98
+                  "line": 8,
+                  "column": 5,
+                  "offset": 109
                 },
                 "end": {
-                  "line": 11,
-                  "column": 10,
-                  "offset": 238
-                },
-                "indent": [
-                  1,
-                  1,
-                  1,
-                  1
-                ]
+                  "line": 10,
+                  "column": 43,
+                  "offset": 228
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 6,
-              "column": 1,
-              "offset": 78
+              "line": 7,
+              "column": 3,
+              "offset": 98
             },
             "end": {
               "line": 11,
               "column": 10,
               "offset": 238
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -359,45 +341,417 @@
           "line": 12,
           "column": 12,
           "offset": 250
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Box",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "shouldShowAnswer(user) ?\n<Answer value={false}>no</Answer> :\n<Box.Comment>\n   Text Content\n</Box.Comment>",
+          "type": "mdxFlowExpression",
+          "value": "\nshouldShowAnswer(user) ?\n<Answer value={false}>no</Answer> :\n<Box.Comment>\nText Content\n</Box.Comment>\n",
           "position": {
             "start": {
               "line": 15,
-              "column": 1,
-              "offset": 258
+              "column": 3,
+              "offset": 260
             },
             "end": {
               "line": 21,
               "column": 4,
               "offset": 391
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1,
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "ConditionalExpression",
+              "start": 5,
+              "end": 126,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 6,
+                  "column": 18
+                }
+              },
+              "test": {
+                "type": "CallExpression",
+                "start": 5,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 26
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 5,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 20
+                    }
+                  },
+                  "name": "shouldShowAnswer"
+                },
+                "arguments": [
+                  {
+                    "type": "Identifier",
+                    "start": 22,
+                    "end": 26,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 21
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 25
+                      }
+                    },
+                    "name": "user"
+                  }
+                ],
+                "optional": false
+              },
+              "consequent": {
+                "type": "JSXElement",
+                "start": 34,
+                "end": 67,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 37
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 34,
+                  "end": 56,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 26
+                    }
+                  },
+                  "attributes": [
+                    {
+                      "type": "JSXAttribute",
+                      "start": 42,
+                      "end": 55,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 25
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 42,
+                        "end": 47,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 12
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 17
+                          }
+                        },
+                        "name": "value"
+                      },
+                      "value": {
+                        "type": "JSXExpressionContainer",
+                        "start": 48,
+                        "end": 55,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 25
+                          }
+                        },
+                        "expression": {
+                          "type": "Literal",
+                          "start": 49,
+                          "end": 54,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 19
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 24
+                            }
+                          },
+                          "value": false,
+                          "raw": "false"
+                        }
+                      }
+                    }
+                  ],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 35,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 11
+                      }
+                    },
+                    "name": "Answer"
+                  },
+                  "selfClosing": false
+                },
+                "closingElement": {
+                  "type": "JSXClosingElement",
+                  "start": 58,
+                  "end": 67,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 28
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 37
+                    }
+                  },
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 60,
+                    "end": 66,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 36
+                      }
+                    },
+                    "name": "Answer"
+                  }
+                },
+                "children": [
+                  {
+                    "type": "JSXText",
+                    "start": 56,
+                    "end": 58,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 26
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 28
+                      }
+                    },
+                    "value": "no",
+                    "raw": "no"
+                  }
+                ]
+              },
+              "alternate": {
+                "type": "JSXElement",
+                "start": 74,
+                "end": 126,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 18
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 74,
+                  "end": 87,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 17
+                    }
+                  },
+                  "attributes": [],
+                  "name": {
+                    "type": "JSXMemberExpression",
+                    "start": 75,
+                    "end": 86,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 16
+                      }
+                    },
+                    "object": {
+                      "type": "JSXIdentifier",
+                      "start": 75,
+                      "end": 78,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 8
+                        }
+                      },
+                      "name": "Box"
+                    },
+                    "property": {
+                      "type": "JSXIdentifier",
+                      "start": 79,
+                      "end": 86,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 16
+                        }
+                      },
+                      "name": "Comment"
+                    }
+                  },
+                  "selfClosing": false
+                },
+                "closingElement": {
+                  "type": "JSXClosingElement",
+                  "start": 112,
+                  "end": 126,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 18
+                    }
+                  },
+                  "name": {
+                    "type": "JSXMemberExpression",
+                    "start": 114,
+                    "end": 125,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 17
+                      }
+                    },
+                    "object": {
+                      "type": "JSXIdentifier",
+                      "start": 114,
+                      "end": 117,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 9
+                        }
+                      },
+                      "name": "Box"
+                    },
+                    "property": {
+                      "type": "JSXIdentifier",
+                      "start": 118,
+                      "end": 125,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 17
+                        }
+                      },
+                      "name": "Comment"
+                    }
+                  }
+                },
+                "children": [
+                  {
+                    "type": "JSXText",
+                    "start": 87,
+                    "end": 112,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 4
+                      }
+                    },
+                    "value": "\n       Text Content\n    ",
+                    "raw": "\n       Text Content\n    "
+                  }
+                ]
+              }
+            }
           }
         }
       ],
@@ -411,17 +765,7 @@
           "line": 22,
           "column": 7,
           "offset": 398
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/examples-from-jsx.out b/packages/remark-mdx/test/fixtures/examples-from-jsx.out
index 1f9aa1c60..941b831d6 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-jsx.out
+++ b/packages/remark-mdx/test/fixtures/examples-from-jsx.out
@@ -4,9 +4,12 @@ From [jsx](https://facebook.github.io/jsx/).
 
 <Dropdown>
   A dropdown list
-  <Menu><MenuItem>Do Something</MenuItem>
-  <MenuItem>Do Something Fun!</MenuItem>
-  <MenuItem>Do Something Else</MenuItem></Menu>
+
+  <Menu>
+    <MenuItem>Do Something</MenuItem>
+    <MenuItem>Do Something Fun!</MenuItem>
+    <MenuItem>Do Something Else</MenuItem>
+  </Menu>
 </Dropdown>
 
 <Box>
@@ -14,7 +17,7 @@ From [jsx](https://facebook.github.io/jsx/).
     shouldShowAnswer(user) ?
     <Answer value={false}>no</Answer> :
     <Box.Comment>
-       Text Content
+    Text Content
     </Box.Comment>
   }
 </Box>
diff --git a/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.json b/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.json
index 951d906a9..f3b81c55e 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.json
+++ b/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 36,
               "offset": 35
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 36,
           "offset": 35
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,8 +51,7 @@
               "line": 3,
               "column": 6,
               "offset": 42
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -75,8 +72,7 @@
                   "line": 3,
                   "column": 26,
                   "offset": 62
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -90,8 +86,7 @@
               "line": 3,
               "column": 72,
               "offset": 108
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -107,8 +102,7 @@
               "line": 3,
               "column": 73,
               "offset": 109
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -122,160 +116,105 @@
           "line": 3,
           "column": 73,
           "offset": 109
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "input",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "type",
-          "value": "text",
-          "position": {
-            "start": {
-              "line": 6,
-              "column": 3,
-              "offset": 120
-            },
-            "end": {
-              "line": 6,
-              "column": 14,
-              "offset": 131
-            }
-          }
+          "value": "text"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "aria-label",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "labelText",
-            "position": {
-              "start": {
-                "line": 7,
-                "column": 14,
-                "offset": 145
-              },
-              "end": {
-                "line": 7,
-                "column": 25,
-                "offset": 156
+            "data": {
+              "estree": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "name": "labelText"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 7,
-              "column": 3,
-              "offset": 134
-            },
-            "end": {
-              "line": 7,
-              "column": 25,
-              "offset": 156
-            }
           }
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "aria-required",
-          "value": "true",
-          "position": {
-            "start": {
-              "line": 8,
-              "column": 3,
-              "offset": 159
-            },
-            "end": {
-              "line": 8,
-              "column": 23,
-              "offset": 179
-            }
-          }
+          "value": "true"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "onChange",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "onchangeHandler",
-            "position": {
-              "start": {
-                "line": 9,
-                "column": 12,
-                "offset": 191
-              },
-              "end": {
-                "line": 9,
-                "column": 29,
-                "offset": 208
+            "data": {
+              "estree": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  }
+                },
+                "name": "onchangeHandler"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 9,
-              "column": 3,
-              "offset": 182
-            },
-            "end": {
-              "line": 9,
-              "column": 29,
-              "offset": 208
-            }
           }
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "value",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "inputValue",
-            "position": {
-              "start": {
-                "line": 10,
-                "column": 9,
-                "offset": 217
-              },
-              "end": {
-                "line": 10,
-                "column": 21,
-                "offset": 229
+            "data": {
+              "estree": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "name": "inputValue"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 10,
-              "column": 3,
-              "offset": 211
-            },
-            "end": {
-              "line": 10,
-              "column": 21,
-              "offset": 229
-            }
           }
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "name",
-          "value": "name",
-          "position": {
-            "start": {
-              "line": 11,
-              "column": 3,
-              "offset": 232
-            },
-            "end": {
-              "line": 11,
-              "column": 14,
-              "offset": 243
-            }
-          }
+          "value": "name"
         }
       ],
       "children": [],
@@ -289,95 +228,217 @@
           "line": 12,
           "column": 3,
           "offset": 246
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": null,
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
-          "name": "dt",
-          "attributes": [],
+          "type": "paragraph",
           "children": [
             {
-              "type": "mdxBlockExpression",
-              "value": "item.term",
+              "type": "mdxJsxTextElement",
+              "name": "dt",
+              "attributes": [],
+              "children": [
+                {
+                  "type": "mdxTextExpression",
+                  "value": "item.term",
+                  "position": {
+                    "start": {
+                      "line": 15,
+                      "column": 7,
+                      "offset": 257
+                    },
+                    "end": {
+                      "line": 15,
+                      "column": 18,
+                      "offset": 268
+                    }
+                  },
+                  "data": {
+                    "estree": {
+                      "type": "MemberExpression",
+                      "start": 0,
+                      "end": 9,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 9
+                        }
+                      },
+                      "object": {
+                        "type": "Identifier",
+                        "start": 0,
+                        "end": 4,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 0
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 4
+                          }
+                        },
+                        "name": "item"
+                      },
+                      "property": {
+                        "type": "Identifier",
+                        "start": 5,
+                        "end": 9,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 9
+                          }
+                        },
+                        "name": "term"
+                      },
+                      "computed": false,
+                      "optional": false
+                    }
+                  }
+                }
+              ],
               "position": {
                 "start": {
                   "line": 15,
-                  "column": 7,
-                  "offset": 257
+                  "column": 3,
+                  "offset": 253
                 },
                 "end": {
                   "line": 15,
-                  "column": 18,
-                  "offset": 268
-                },
-                "indent": []
+                  "column": 23,
+                  "offset": 273
+                }
               }
-            }
-          ],
-          "position": {
-            "start": {
-              "line": 15,
-              "column": 1,
-              "offset": 251
             },
-            "end": {
-              "line": 15,
-              "column": 23,
-              "offset": 273
+            {
+              "type": "text",
+              "value": "\n",
+              "position": {
+                "start": {
+                  "line": 15,
+                  "column": 23,
+                  "offset": 273
+                },
+                "end": {
+                  "line": 16,
+                  "column": 1,
+                  "offset": 274
+                }
+              }
             },
-            "indent": []
-          }
-        },
-        {
-          "type": "mdxBlockElement",
-          "name": "dd",
-          "attributes": [],
-          "children": [
             {
-              "type": "mdxBlockExpression",
-              "value": "item.description",
+              "type": "mdxJsxTextElement",
+              "name": "dd",
+              "attributes": [],
+              "children": [
+                {
+                  "type": "mdxTextExpression",
+                  "value": "item.description",
+                  "position": {
+                    "start": {
+                      "line": 16,
+                      "column": 7,
+                      "offset": 280
+                    },
+                    "end": {
+                      "line": 16,
+                      "column": 25,
+                      "offset": 298
+                    }
+                  },
+                  "data": {
+                    "estree": {
+                      "type": "MemberExpression",
+                      "start": 0,
+                      "end": 16,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 16
+                        }
+                      },
+                      "object": {
+                        "type": "Identifier",
+                        "start": 0,
+                        "end": 4,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 0
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 4
+                          }
+                        },
+                        "name": "item"
+                      },
+                      "property": {
+                        "type": "Identifier",
+                        "start": 5,
+                        "end": 16,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 16
+                          }
+                        },
+                        "name": "description"
+                      },
+                      "computed": false,
+                      "optional": false
+                    }
+                  }
+                }
+              ],
               "position": {
                 "start": {
                   "line": 16,
-                  "column": 7,
-                  "offset": 280
+                  "column": 3,
+                  "offset": 276
                 },
                 "end": {
                   "line": 16,
-                  "column": 25,
-                  "offset": 298
-                },
-                "indent": []
+                  "column": 30,
+                  "offset": 303
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 16,
-              "column": 1,
-              "offset": 274
+              "line": 15,
+              "column": 3,
+              "offset": 253
             },
             "end": {
               "line": 16,
               "column": 30,
               "offset": 303
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -391,37 +452,375 @@
           "line": 17,
           "column": 4,
           "offset": 307
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "dl",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "props.items.map(item => (\n  <ListItem item={item} key={item.id} />\n))",
+          "type": "mdxFlowExpression",
+          "value": "props.items.map(item => (\n<ListItem item={item} key={item.id} />\n))",
           "position": {
             "start": {
               "line": 20,
-              "column": 1,
-              "offset": 314
+              "column": 3,
+              "offset": 316
             },
             "end": {
               "line": 22,
               "column": 6,
               "offset": 391
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "CallExpression",
+              "start": 0,
+              "end": 73,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 4
+                }
+              },
+              "callee": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "items"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 12,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "name": "map"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "arguments": [
+                {
+                  "type": "ArrowFunctionExpression",
+                  "start": 16,
+                  "end": 72,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 3
+                    }
+                  },
+                  "id": null,
+                  "expression": true,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 16,
+                      "end": 20,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 20
+                        }
+                      },
+                      "name": "item"
+                    }
+                  ],
+                  "body": {
+                    "type": "JSXElement",
+                    "start": 30,
+                    "end": 68,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 42
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 30,
+                      "end": 68,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 42
+                        }
+                      },
+                      "attributes": [
+                        {
+                          "type": "JSXAttribute",
+                          "start": 40,
+                          "end": 51,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 25
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 40,
+                            "end": 44,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 14
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 18
+                              }
+                            },
+                            "name": "item"
+                          },
+                          "value": {
+                            "type": "JSXExpressionContainer",
+                            "start": 45,
+                            "end": 51,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 19
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 25
+                              }
+                            },
+                            "expression": {
+                              "type": "Identifier",
+                              "start": 46,
+                              "end": 50,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 20
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 24
+                                }
+                              },
+                              "name": "item"
+                            }
+                          }
+                        },
+                        {
+                          "type": "JSXAttribute",
+                          "start": 52,
+                          "end": 65,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 26
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 39
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 52,
+                            "end": 55,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 26
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 29
+                              }
+                            },
+                            "name": "key"
+                          },
+                          "value": {
+                            "type": "JSXExpressionContainer",
+                            "start": 56,
+                            "end": 65,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 30
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 39
+                              }
+                            },
+                            "expression": {
+                              "type": "MemberExpression",
+                              "start": 57,
+                              "end": 64,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 31
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 38
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 57,
+                                "end": 61,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 31
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 35
+                                  }
+                                },
+                                "name": "item"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 62,
+                                "end": 64,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 36
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 38
+                                  }
+                                },
+                                "name": "id"
+                              },
+                              "computed": false,
+                              "optional": false
+                            }
+                          }
+                        }
+                      ],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 31,
+                        "end": 39,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 13
+                          }
+                        },
+                        "name": "ListItem"
+                      },
+                      "selfClosing": true
+                    },
+                    "closingElement": null,
+                    "children": []
+                  }
+                }
+              ],
+              "optional": false
+            }
           }
         }
       ],
@@ -435,42 +834,685 @@
           "line": 23,
           "column": 6,
           "offset": 397
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "dl",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "props.items.map(item => (\n  // Fragments should also have a `key` prop when mapping collections\n  <Fragment key={item.id}>\n    <dt>{item.term}</dt>\n    <dd>{item.description}</dd>\n  </Fragment>\n))",
+          "type": "mdxFlowExpression",
+          "value": "props.items.map(item => (\n// Fragments should also have a `key` prop when mapping collections\n<Fragment key={item.id}>\n<dt>{item.term}</dt>\n<dd>{item.description}</dd>\n</Fragment>\n))",
           "position": {
             "start": {
               "line": 26,
-              "column": 1,
-              "offset": 404
+              "column": 3,
+              "offset": 406
             },
             "end": {
               "line": 32,
               "column": 6,
               "offset": 616
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1,
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "CallExpression",
+              "start": 0,
+              "end": 208,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 7,
+                  "column": 4
+                }
+              },
+              "callee": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "items"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 12,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "name": "map"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "arguments": [
+                {
+                  "type": "ArrowFunctionExpression",
+                  "start": 16,
+                  "end": 207,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 3
+                    }
+                  },
+                  "id": null,
+                  "expression": true,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 16,
+                      "end": 20,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 20
+                        }
+                      },
+                      "name": "item"
+                    }
+                  ],
+                  "body": {
+                    "type": "JSXElement",
+                    "start": 102,
+                    "end": 203,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 15
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 102,
+                      "end": 126,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 28
+                        }
+                      },
+                      "attributes": [
+                        {
+                          "type": "JSXAttribute",
+                          "start": 112,
+                          "end": 125,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 27
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 112,
+                            "end": 115,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 14
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 17
+                              }
+                            },
+                            "name": "key"
+                          },
+                          "value": {
+                            "type": "JSXExpressionContainer",
+                            "start": 116,
+                            "end": 125,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 18
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 27
+                              }
+                            },
+                            "expression": {
+                              "type": "MemberExpression",
+                              "start": 117,
+                              "end": 124,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 19
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 26
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 117,
+                                "end": 121,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 19
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 23
+                                  }
+                                },
+                                "name": "item"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 122,
+                                "end": 124,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 24
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 26
+                                  }
+                                },
+                                "name": "id"
+                              },
+                              "computed": false,
+                              "optional": false
+                            }
+                          }
+                        }
+                      ],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 103,
+                        "end": 111,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 13
+                          }
+                        },
+                        "name": "Fragment"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 192,
+                      "end": 203,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 15
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 194,
+                        "end": 202,
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 6,
+                            "column": 14
+                          }
+                        },
+                        "name": "Fragment"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 126,
+                        "end": 133,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 28
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 6
+                          }
+                        },
+                        "value": "\n      ",
+                        "raw": "\n      "
+                      },
+                      {
+                        "type": "JSXElement",
+                        "start": 133,
+                        "end": 153,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 26
+                          }
+                        },
+                        "openingElement": {
+                          "type": "JSXOpeningElement",
+                          "start": 133,
+                          "end": 137,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 6
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 10
+                            }
+                          },
+                          "attributes": [],
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 134,
+                            "end": 136,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 7
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 9
+                              }
+                            },
+                            "name": "dt"
+                          },
+                          "selfClosing": false
+                        },
+                        "closingElement": {
+                          "type": "JSXClosingElement",
+                          "start": 148,
+                          "end": 153,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 26
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 150,
+                            "end": 152,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 23
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 25
+                              }
+                            },
+                            "name": "dt"
+                          }
+                        },
+                        "children": [
+                          {
+                            "type": "JSXExpressionContainer",
+                            "start": 137,
+                            "end": 148,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 10
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 21
+                              }
+                            },
+                            "expression": {
+                              "type": "MemberExpression",
+                              "start": 138,
+                              "end": 147,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 11
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 20
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 138,
+                                "end": 142,
+                                "loc": {
+                                  "start": {
+                                    "line": 4,
+                                    "column": 11
+                                  },
+                                  "end": {
+                                    "line": 4,
+                                    "column": 15
+                                  }
+                                },
+                                "name": "item"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 143,
+                                "end": 147,
+                                "loc": {
+                                  "start": {
+                                    "line": 4,
+                                    "column": 16
+                                  },
+                                  "end": {
+                                    "line": 4,
+                                    "column": 20
+                                  }
+                                },
+                                "name": "term"
+                              },
+                              "computed": false,
+                              "optional": false
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "JSXText",
+                        "start": 153,
+                        "end": 160,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 26
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 6
+                          }
+                        },
+                        "value": "\n      ",
+                        "raw": "\n      "
+                      },
+                      {
+                        "type": "JSXElement",
+                        "start": 160,
+                        "end": 187,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 33
+                          }
+                        },
+                        "openingElement": {
+                          "type": "JSXOpeningElement",
+                          "start": 160,
+                          "end": 164,
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 6
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 10
+                            }
+                          },
+                          "attributes": [],
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 161,
+                            "end": 163,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 7
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 9
+                              }
+                            },
+                            "name": "dd"
+                          },
+                          "selfClosing": false
+                        },
+                        "closingElement": {
+                          "type": "JSXClosingElement",
+                          "start": 182,
+                          "end": 187,
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 28
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 33
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 184,
+                            "end": 186,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 30
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 32
+                              }
+                            },
+                            "name": "dd"
+                          }
+                        },
+                        "children": [
+                          {
+                            "type": "JSXExpressionContainer",
+                            "start": 164,
+                            "end": 182,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 10
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 28
+                              }
+                            },
+                            "expression": {
+                              "type": "MemberExpression",
+                              "start": 165,
+                              "end": 181,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 11
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 27
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 165,
+                                "end": 169,
+                                "loc": {
+                                  "start": {
+                                    "line": 5,
+                                    "column": 11
+                                  },
+                                  "end": {
+                                    "line": 5,
+                                    "column": 15
+                                  }
+                                },
+                                "name": "item"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 170,
+                                "end": 181,
+                                "loc": {
+                                  "start": {
+                                    "line": 5,
+                                    "column": 16
+                                  },
+                                  "end": {
+                                    "line": 5,
+                                    "column": 27
+                                  }
+                                },
+                                "name": "description"
+                              },
+                              "computed": false,
+                              "optional": false
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "JSXText",
+                        "start": 187,
+                        "end": 192,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 33
+                          },
+                          "end": {
+                            "line": 6,
+                            "column": 4
+                          }
+                        },
+                        "value": "\n    ",
+                        "raw": "\n    "
+                      }
+                    ]
+                  }
+                }
+              ],
+              "optional": false
+            }
           }
         }
       ],
@@ -484,44 +1526,22 @@
           "line": 33,
           "column": 6,
           "offset": 622
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "label",
-      "attributes": [
-        {
-          "type": "mdxAttribute",
-          "name": "htmlFor",
-          "value": "namedInput",
-          "position": {
-            "start": {
-              "line": 35,
-              "column": 8,
-              "offset": 631
-            },
-            "end": {
-              "line": 35,
-              "column": 28,
-              "offset": 651
-            }
-          }
-        }
-      ],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "label",
+          "attributes": [
+            {
+              "type": "mdxJsxAttribute",
+              "name": "htmlFor",
+              "value": "namedInput"
+            }
+          ],
           "children": [
             {
               "type": "text",
@@ -536,23 +1556,21 @@
                   "line": 35,
                   "column": 34,
                   "offset": 657
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 35,
-              "column": 29,
-              "offset": 652
+              "column": 1,
+              "offset": 624
             },
             "end": {
               "line": 35,
-              "column": 34,
-              "offset": 657
-            },
-            "indent": []
+              "column": 42,
+              "offset": 665
+            }
           }
         }
       ],
@@ -566,64 +1584,27 @@
           "line": 35,
           "column": 42,
           "offset": 665
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "input",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "id",
-          "value": "namedInput",
-          "position": {
-            "start": {
-              "line": 36,
-              "column": 8,
-              "offset": 673
-            },
-            "end": {
-              "line": 36,
-              "column": 23,
-              "offset": 688
-            }
-          }
+          "value": "namedInput"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "type",
-          "value": "text",
-          "position": {
-            "start": {
-              "line": 36,
-              "column": 24,
-              "offset": 689
-            },
-            "end": {
-              "line": 36,
-              "column": 35,
-              "offset": 700
-            }
-          }
+          "value": "text"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "name",
-          "value": "name",
-          "position": {
-            "start": {
-              "line": 36,
-              "column": 36,
-              "offset": 701
-            },
-            "end": {
-              "line": 36,
-              "column": 47,
-              "offset": 712
-            }
-          }
+          "value": "name"
         }
       ],
       "children": [],
@@ -637,88 +1618,139 @@
           "line": 36,
           "column": 49,
           "offset": 714
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "ref",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "this.toggleContainer",
-            "position": {
-              "start": {
-                "line": 38,
-                "column": 10,
-                "offset": 725
-              },
-              "end": {
-                "line": 38,
-                "column": 32,
-                "offset": 747
+            "data": {
+              "estree": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "object": {
+                  "type": "ThisExpression",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  }
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 5,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "name": "toggleContainer"
+                },
+                "computed": false,
+                "optional": false
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 38,
-              "column": 6,
-              "offset": 721
-            },
-            "end": {
-              "line": 38,
-              "column": 32,
-              "offset": 747
-            }
           }
         }
       ],
       "children": [
         {
-          "type": "mdxBlockElement",
-          "name": "button",
-          "attributes": [
+          "type": "paragraph",
+          "children": [
             {
-              "type": "mdxAttribute",
-              "name": "onClick",
-              "value": {
-                "type": "mdxValueExpression",
-                "value": "this.onClickHandler",
-                "position": {
-                  "start": {
-                    "line": 39,
-                    "column": 19,
-                    "offset": 767
-                  },
-                  "end": {
-                    "line": 39,
-                    "column": 40,
-                    "offset": 788
+              "type": "mdxJsxTextElement",
+              "name": "button",
+              "attributes": [
+                {
+                  "type": "mdxJsxAttribute",
+                  "name": "onClick",
+                  "value": {
+                    "type": "mdxJsxAttributeValueExpression",
+                    "value": "this.onClickHandler",
+                    "data": {
+                      "estree": {
+                        "type": "MemberExpression",
+                        "start": 0,
+                        "end": 19,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 0
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 19
+                          }
+                        },
+                        "object": {
+                          "type": "ThisExpression",
+                          "start": 0,
+                          "end": 4,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 0
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 4
+                            }
+                          }
+                        },
+                        "property": {
+                          "type": "Identifier",
+                          "start": 5,
+                          "end": 19,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 19
+                            }
+                          },
+                          "name": "onClickHandler"
+                        },
+                        "computed": false,
+                        "optional": false
+                      }
+                    }
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 39,
-                  "column": 11,
-                  "offset": 759
-                },
-                "end": {
-                  "line": 39,
-                  "column": 40,
-                  "offset": 788
-                }
-              }
-            }
-          ],
-          "children": [
-            {
-              "type": "paragraph",
+              ],
               "children": [
                 {
                   "type": "text",
@@ -733,62 +1765,593 @@
                       "line": 39,
                       "column": 57,
                       "offset": 805
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 39,
-                  "column": 41,
-                  "offset": 789
+                  "column": 3,
+                  "offset": 751
                 },
                 "end": {
                   "line": 39,
-                  "column": 57,
-                  "offset": 805
-                },
-                "indent": []
+                  "column": 66,
+                  "offset": 814
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 39,
-              "column": 1,
-              "offset": 749
+              "column": 3,
+              "offset": 751
             },
             "end": {
               "line": 39,
               "column": 66,
               "offset": 814
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxBlockExpression",
-          "value": "this.state.isOpen && (\n  <ul>\n    <li>Option 1</li>\n    <li>Option 2</li>\n    <li>Option 3</li>\n  </ul>\n)",
+          "type": "mdxFlowExpression",
+          "value": "this.state.isOpen && (\n<ul>\n<li>Option 1</li>\n<li>Option 2</li>\n<li>Option 3</li>\n</ul>\n)",
           "position": {
             "start": {
               "line": 40,
-              "column": 1,
-              "offset": 815
+              "column": 3,
+              "offset": 817
             },
             "end": {
               "line": 46,
               "column": 5,
               "offset": 936
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1,
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "LogicalExpression",
+              "start": 0,
+              "end": 117,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 7,
+                  "column": 3
+                }
+              },
+              "left": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "ThisExpression",
+                    "start": 0,
+                    "end": 4,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 4
+                      }
+                    }
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 5,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "state"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 11,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "name": "isOpen"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "operator": "&&",
+              "right": {
+                "type": "JSXElement",
+                "start": 27,
+                "end": 113,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 9
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 27,
+                  "end": 31,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 8
+                    }
+                  },
+                  "attributes": [],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 28,
+                    "end": 30,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      }
+                    },
+                    "name": "ul"
+                  },
+                  "selfClosing": false
+                },
+                "closingElement": {
+                  "type": "JSXClosingElement",
+                  "start": 108,
+                  "end": 113,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 9
+                    }
+                  },
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 110,
+                    "end": 112,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 8
+                      }
+                    },
+                    "name": "ul"
+                  }
+                },
+                "children": [
+                  {
+                    "type": "JSXText",
+                    "start": 31,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 38,
+                    "end": 55,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 38,
+                      "end": 42,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 39,
+                        "end": 41,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 50,
+                      "end": 55,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 52,
+                        "end": 54,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 42,
+                        "end": 50,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 1",
+                        "raw": "Option 1"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 55,
+                    "end": 62,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 62,
+                    "end": 79,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 62,
+                      "end": 66,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 63,
+                        "end": 65,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 74,
+                      "end": 79,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 76,
+                        "end": 78,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 66,
+                        "end": 74,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 2",
+                        "raw": "Option 2"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 79,
+                    "end": 86,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 86,
+                    "end": 103,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 86,
+                      "end": 90,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 87,
+                        "end": 89,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 98,
+                      "end": 103,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 100,
+                        "end": 102,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 90,
+                        "end": 98,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 3",
+                        "raw": "Option 3"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 103,
+                    "end": 108,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 4
+                      }
+                    },
+                    "value": "\n    ",
+                    "raw": "\n    "
+                  }
+                ]
+              }
+            }
           }
         }
       ],
@@ -802,173 +2365,287 @@
           "line": 47,
           "column": 7,
           "offset": 943
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "onBlur",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "this.onBlurHandler",
-            "position": {
-              "start": {
-                "line": 49,
-                "column": 13,
-                "offset": 957
-              },
-              "end": {
-                "line": 49,
-                "column": 33,
-                "offset": 977
+            "data": {
+              "estree": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "object": {
+                  "type": "ThisExpression",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  }
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 5,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "name": "onBlurHandler"
+                },
+                "computed": false,
+                "optional": false
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 49,
-              "column": 6,
-              "offset": 950
-            },
-            "end": {
-              "line": 49,
-              "column": 33,
-              "offset": 977
-            }
           }
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "onFocus",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "this.onFocusHandler",
-            "position": {
-              "start": {
-                "line": 50,
-                "column": 14,
-                "offset": 991
-              },
-              "end": {
-                "line": 50,
-                "column": 35,
-                "offset": 1012
+            "data": {
+              "estree": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "object": {
+                  "type": "ThisExpression",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  }
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 5,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "name": "onFocusHandler"
+                },
+                "computed": false,
+                "optional": false
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 50,
-              "column": 6,
-              "offset": 983
-            },
-            "end": {
-              "line": 50,
-              "column": 35,
-              "offset": 1012
-            }
           }
         }
       ],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "button",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "onClick",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "this.onClickHandler",
-                "position": {
-                  "start": {
-                    "line": 51,
-                    "column": 19,
-                    "offset": 1032
-                  },
-                  "end": {
-                    "line": 51,
-                    "column": 40,
-                    "offset": 1053
+                "data": {
+                  "estree": {
+                    "type": "MemberExpression",
+                    "start": 0,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 19
+                      }
+                    },
+                    "object": {
+                      "type": "ThisExpression",
+                      "start": 0,
+                      "end": 4,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 4
+                        }
+                      }
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 5,
+                      "end": 19,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 19
+                        }
+                      },
+                      "name": "onClickHandler"
+                    },
+                    "computed": false,
+                    "optional": false
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 51,
-                  "column": 11,
-                  "offset": 1024
-                },
-                "end": {
-                  "line": 51,
-                  "column": 40,
-                  "offset": 1053
-                }
               }
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "aria-haspopup",
-              "value": "true",
-              "position": {
-                "start": {
-                  "line": 52,
-                  "column": 11,
-                  "offset": 1064
-                },
-                "end": {
-                  "line": 52,
-                  "column": 31,
-                  "offset": 1084
-                }
-              }
+              "value": "true"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "aria-expanded",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "this.state.isOpen",
-                "position": {
-                  "start": {
-                    "line": 53,
-                    "column": 25,
-                    "offset": 1109
-                  },
-                  "end": {
-                    "line": 53,
-                    "column": 44,
-                    "offset": 1128
+                "data": {
+                  "estree": {
+                    "type": "MemberExpression",
+                    "start": 0,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      }
+                    },
+                    "object": {
+                      "type": "MemberExpression",
+                      "start": 0,
+                      "end": 10,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 10
+                        }
+                      },
+                      "object": {
+                        "type": "ThisExpression",
+                        "start": 0,
+                        "end": 4,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 0
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 4
+                          }
+                        }
+                      },
+                      "property": {
+                        "type": "Identifier",
+                        "start": 5,
+                        "end": 10,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 10
+                          }
+                        },
+                        "name": "state"
+                      },
+                      "computed": false,
+                      "optional": false
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 11,
+                      "end": 17,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 17
+                        }
+                      },
+                      "name": "isOpen"
+                    },
+                    "computed": false,
+                    "optional": false
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 53,
-                  "column": 11,
-                  "offset": 1095
-                },
-                "end": {
-                  "line": 53,
-                  "column": 44,
-                  "offset": 1128
-                }
               }
             }
           ],
@@ -982,78 +2659,600 @@
                   "position": {
                     "start": {
                       "line": 54,
-                      "column": 1,
-                      "offset": 1130
+                      "column": 5,
+                      "offset": 1134
                     },
                     "end": {
-                      "line": 55,
-                      "column": 3,
-                      "offset": 1153
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "line": 54,
+                      "column": 21,
+                      "offset": 1150
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 54,
-                  "column": 1,
-                  "offset": 1130
+                  "column": 5,
+                  "offset": 1134
                 },
                 "end": {
-                  "line": 55,
-                  "column": 3,
-                  "offset": 1153
-                },
-                "indent": [
-                  1
-                ]
+                  "line": 54,
+                  "column": 21,
+                  "offset": 1150
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 51,
-              "column": 1,
-              "offset": 1014
+              "column": 3,
+              "offset": 1016
             },
             "end": {
               "line": 55,
               "column": 12,
               "offset": 1162
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1
-            ]
+            }
           }
         },
         {
-          "type": "mdxBlockExpression",
-          "value": "this.state.isOpen && (\n  <ul>\n    <li>Option 1</li>\n    <li>Option 2</li>\n    <li>Option 3</li>\n  </ul>\n)",
+          "type": "mdxFlowExpression",
+          "value": "this.state.isOpen && (\n<ul>\n<li>Option 1</li>\n<li>Option 2</li>\n<li>Option 3</li>\n</ul>\n)",
           "position": {
             "start": {
               "line": 56,
-              "column": 1,
-              "offset": 1163
+              "column": 3,
+              "offset": 1165
             },
             "end": {
               "line": 62,
               "column": 5,
               "offset": 1284
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1,
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "LogicalExpression",
+              "start": 0,
+              "end": 117,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 7,
+                  "column": 3
+                }
+              },
+              "left": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "ThisExpression",
+                    "start": 0,
+                    "end": 4,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 4
+                      }
+                    }
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 5,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "state"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 11,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "name": "isOpen"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "operator": "&&",
+              "right": {
+                "type": "JSXElement",
+                "start": 27,
+                "end": 113,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 9
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 27,
+                  "end": 31,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 8
+                    }
+                  },
+                  "attributes": [],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 28,
+                    "end": 30,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      }
+                    },
+                    "name": "ul"
+                  },
+                  "selfClosing": false
+                },
+                "closingElement": {
+                  "type": "JSXClosingElement",
+                  "start": 108,
+                  "end": 113,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 9
+                    }
+                  },
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 110,
+                    "end": 112,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 8
+                      }
+                    },
+                    "name": "ul"
+                  }
+                },
+                "children": [
+                  {
+                    "type": "JSXText",
+                    "start": 31,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 38,
+                    "end": 55,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 38,
+                      "end": 42,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 39,
+                        "end": 41,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 50,
+                      "end": 55,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 52,
+                        "end": 54,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 42,
+                        "end": 50,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 1",
+                        "raw": "Option 1"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 55,
+                    "end": 62,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 62,
+                    "end": 79,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 62,
+                      "end": 66,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 63,
+                        "end": 65,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 74,
+                      "end": 79,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 76,
+                        "end": 78,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 66,
+                        "end": 74,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 2",
+                        "raw": "Option 2"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 79,
+                    "end": 86,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 6
+                      }
+                    },
+                    "value": "\n      ",
+                    "raw": "\n      "
+                  },
+                  {
+                    "type": "JSXElement",
+                    "start": 86,
+                    "end": 103,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 23
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 86,
+                      "end": 90,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 10
+                        }
+                      },
+                      "attributes": [],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 87,
+                        "end": 89,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 9
+                          }
+                        },
+                        "name": "li"
+                      },
+                      "selfClosing": false
+                    },
+                    "closingElement": {
+                      "type": "JSXClosingElement",
+                      "start": 98,
+                      "end": 103,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 23
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 100,
+                        "end": 102,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 22
+                          }
+                        },
+                        "name": "li"
+                      }
+                    },
+                    "children": [
+                      {
+                        "type": "JSXText",
+                        "start": 90,
+                        "end": 98,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 18
+                          }
+                        },
+                        "value": "Option 3",
+                        "raw": "Option 3"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 103,
+                    "end": 108,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 4
+                      }
+                    },
+                    "value": "\n    ",
+                    "raw": "\n    "
+                  }
+                ]
+              }
+            }
           }
         }
       ],
@@ -1067,23 +3266,7 @@
           "line": 63,
           "column": 7,
           "offset": 1291
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.out b/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.out
index c01baad77..0e2de5851 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.out
+++ b/packages/remark-mdx/test/fixtures/examples-from-react-accessibility.out
@@ -12,42 +12,27 @@ From [React accessibility](https://reactjs.org/docs/accessibility.html):
 />
 
 <>
-  <dt>
-    {
-      item.term
-    }
-  </dt>
-
-  <dd>
-    {
-      item.description
-    }
-  </dd>
+  <dt>{item.term}</dt>
+  <dd>{item.description}</dd>
 </>
 
 <dl>
-  {
-    props.items.map(item => (
-      <ListItem item={item} key={item.id} />
-    ))
-  }
+  {props.items.map(item => (
+    <ListItem item={item} key={item.id} />
+    ))}
 </dl>
 
 <dl>
-  {
-    props.items.map(item => (
-      // Fragments should also have a `key` prop when mapping collections
-      <Fragment key={item.id}>
-        <dt>{item.term}</dt>
-        <dd>{item.description}</dd>
-      </Fragment>
-    ))
-  }
+  {props.items.map(item => (
+    // Fragments should also have a `key` prop when mapping collections
+    <Fragment key={item.id}>
+    <dt>{item.term}</dt>
+    <dd>{item.description}</dd>
+    </Fragment>
+    ))}
 </dl>
 
-<label htmlFor="namedInput">
-  Name:
-</label>
+<label htmlFor="namedInput">Name:</label>
 
 <input
   id="namedInput"
@@ -56,19 +41,15 @@ From [React accessibility](https://reactjs.org/docs/accessibility.html):
 />
 
 <div ref={this.toggleContainer}>
-  <button onClick={this.onClickHandler}>
-    Select an option
-  </button>
+  <button onClick={this.onClickHandler}>Select an option</button>
 
-  {
-    this.state.isOpen && (
-      <ul>
-        <li>Option 1</li>
-        <li>Option 2</li>
-        <li>Option 3</li>
-      </ul>
-    )
-  }
+  {this.state.isOpen && (
+    <ul>
+    <li>Option 1</li>
+    <li>Option 2</li>
+    <li>Option 3</li>
+    </ul>
+    )}
 </div>
 
 <div
@@ -83,13 +64,11 @@ From [React accessibility](https://reactjs.org/docs/accessibility.html):
     Select an option
   </button>
 
-  {
-    this.state.isOpen && (
-      <ul>
-        <li>Option 1</li>
-        <li>Option 2</li>
-        <li>Option 3</li>
-      </ul>
-    )
-  }
+  {this.state.isOpen && (
+    <ul>
+    <li>Option 1</li>
+    <li>Option 2</li>
+    <li>Option 3</li>
+    </ul>
+    )}
 </div>
diff --git a/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.json b/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.json
index b4e797f9d..20a5cb82a 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.json
+++ b/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 35,
               "offset": 34
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 35,
           "offset": 34
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,8 +51,7 @@
               "line": 3,
               "column": 6,
               "offset": 41
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -75,8 +72,7 @@
                   "line": 3,
                   "column": 25,
                   "offset": 60
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -90,8 +86,7 @@
               "line": 3,
               "column": 70,
               "offset": 105
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -107,8 +102,7 @@
               "line": 3,
               "column": 71,
               "offset": 106
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -122,61 +116,43 @@
           "line": 3,
           "column": 71,
           "offset": 106
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyButton",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "color",
-          "value": "blue",
-          "position": {
-            "start": {
-              "line": 5,
-              "column": 11,
-              "offset": 118
-            },
-            "end": {
-              "line": 5,
-              "column": 23,
-              "offset": 130
-            }
-          }
+          "value": "blue"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "shadowSize",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "2",
-            "position": {
-              "start": {
-                "line": 5,
-                "column": 35,
-                "offset": 142
-              },
-              "end": {
-                "line": 5,
-                "column": 38,
-                "offset": 145
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 1,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 1
+                  }
+                },
+                "value": 2,
+                "raw": "2"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 5,
-              "column": 24,
-              "offset": 131
-            },
-            "end": {
-              "line": 5,
-              "column": 38,
-              "offset": 145
-            }
           }
         }
       ],
@@ -190,30 +166,28 @@
               "position": {
                 "start": {
                   "line": 6,
-                  "column": 1,
-                  "offset": 147
+                  "column": 3,
+                  "offset": 149
                 },
                 "end": {
                   "line": 6,
                   "column": 11,
                   "offset": 157
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 6,
-              "column": 1,
-              "offset": 147
+              "column": 3,
+              "offset": 149
             },
             "end": {
               "line": 6,
               "column": 11,
               "offset": 157
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -227,33 +201,17 @@
           "line": 7,
           "column": 12,
           "offset": 169
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "className",
-          "value": "sidebar",
-          "position": {
-            "start": {
-              "line": 9,
-              "column": 6,
-              "offset": 176
-            },
-            "end": {
-              "line": 9,
-              "column": 25,
-              "offset": 195
-            }
-          }
+          "value": "sidebar"
         }
       ],
       "children": [],
@@ -267,30 +225,17 @@
           "line": 9,
           "column": 28,
           "offset": 198
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponents.DatePicker",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "color",
-          "value": "blue",
-          "position": {
-            "start": {
-              "line": 11,
-              "column": 26,
-              "offset": 225
-            },
-            "end": {
-              "line": 11,
-              "column": 38,
-              "offset": 237
-            }
-          }
+          "value": "blue"
         }
       ],
       "children": [],
@@ -304,17 +249,16 @@
           "line": 11,
           "column": 41,
           "offset": 240
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -329,12 +273,11 @@
                   "line": 13,
                   "column": 12,
                   "offset": 253
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.toWhat",
               "position": {
                 "start": {
@@ -346,23 +289,72 @@
                   "line": 13,
                   "column": 26,
                   "offset": 267
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 12,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 12
+                      }
+                    },
+                    "name": "toWhat"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 13,
-              "column": 6,
-              "offset": 247
+              "column": 1,
+              "offset": 242
             },
             "end": {
               "line": 13,
-              "column": 26,
-              "offset": 267
-            },
-            "indent": []
+              "column": 32,
+              "offset": 273
+            }
           }
         }
       ],
@@ -376,44 +368,137 @@
           "line": 13,
           "column": 32,
           "offset": 273
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "foo",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "1 + 2 + 3 + 4",
-            "position": {
-              "start": {
-                "line": 15,
-                "column": 18,
-                "offset": 292
-              },
-              "end": {
-                "line": 15,
-                "column": 33,
-                "offset": 307
+            "data": {
+              "estree": {
+                "type": "BinaryExpression",
+                "start": 0,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "left": {
+                  "type": "BinaryExpression",
+                  "start": 0,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    }
+                  },
+                  "left": {
+                    "type": "BinaryExpression",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "left": {
+                      "type": "Literal",
+                      "start": 0,
+                      "end": 1,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 1
+                        }
+                      },
+                      "value": 1,
+                      "raw": "1"
+                    },
+                    "operator": "+",
+                    "right": {
+                      "type": "Literal",
+                      "start": 4,
+                      "end": 5,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 5
+                        }
+                      },
+                      "value": 2,
+                      "raw": "2"
+                    }
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "Literal",
+                    "start": 8,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      }
+                    },
+                    "value": 3,
+                    "raw": "3"
+                  }
+                },
+                "operator": "+",
+                "right": {
+                  "type": "Literal",
+                  "start": 12,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "value": 4,
+                  "raw": "4"
+                }
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 15,
-              "column": 14,
-              "offset": 288
-            },
-            "end": {
-              "line": 15,
-              "column": 33,
-              "offset": 307
-            }
           }
         }
       ],
@@ -428,20 +513,19 @@
           "line": 15,
           "column": 36,
           "offset": 310
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
           "children": [
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.number",
               "position": {
                 "start": {
@@ -453,8 +537,58 @@
                   "line": 17,
                   "column": 20,
                   "offset": 331
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 12,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 12
+                      }
+                    },
+                    "name": "number"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             },
             {
@@ -470,12 +604,11 @@
                   "line": 17,
                   "column": 27,
                   "offset": 338
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "description",
               "position": {
                 "start": {
@@ -487,8 +620,25 @@
                   "line": 17,
                   "column": 40,
                   "offset": 351
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Identifier",
+                  "start": 0,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "name": "description"
+                }
               }
             },
             {
@@ -504,23 +654,21 @@
                   "line": 17,
                   "column": 47,
                   "offset": 358
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 17,
-              "column": 6,
-              "offset": 317
+              "column": 1,
+              "offset": 312
             },
             "end": {
               "line": 17,
-              "column": 47,
-              "offset": 358
-            },
-            "indent": []
+              "column": 53,
+              "offset": 364
+            }
           }
         }
       ],
@@ -534,30 +682,17 @@
           "line": 17,
           "column": 53,
           "offset": 364
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "message",
-          "value": "hello world",
-          "position": {
-            "start": {
-              "line": 19,
-              "column": 14,
-              "offset": 379
-            },
-            "end": {
-              "line": 19,
-              "column": 35,
-              "offset": 400
-            }
-          }
+          "value": "hello world"
         }
       ],
       "children": [],
@@ -571,44 +706,38 @@
           "line": 19,
           "column": 38,
           "offset": 403
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "message",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "'hello world'",
-            "position": {
-              "start": {
-                "line": 21,
-                "column": 22,
-                "offset": 426
-              },
-              "end": {
-                "line": 21,
-                "column": 37,
-                "offset": 441
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "value": "hello world",
+                "raw": "'hello world'"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 21,
-              "column": 14,
-              "offset": 418
-            },
-            "end": {
-              "line": 21,
-              "column": 37,
-              "offset": 441
-            }
           }
         }
       ],
@@ -623,30 +752,17 @@
           "line": 21,
           "column": 40,
           "offset": 444
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "message",
-          "value": "<3",
-          "position": {
-            "start": {
-              "line": 23,
-              "column": 14,
-              "offset": 459
-            },
-            "end": {
-              "line": 23,
-              "column": 29,
-              "offset": 474
-            }
-          }
+          "value": "<3"
         }
       ],
       "children": [],
@@ -660,44 +776,38 @@
           "line": 23,
           "column": 32,
           "offset": 477
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "message",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "'<3'",
-            "position": {
-              "start": {
-                "line": 25,
-                "column": 22,
-                "offset": 500
-              },
-              "end": {
-                "line": 25,
-                "column": 28,
-                "offset": 506
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  }
+                },
+                "value": "<3",
+                "raw": "'<3'"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 25,
-              "column": 14,
-              "offset": 492
-            },
-            "end": {
-              "line": 25,
-              "column": 28,
-              "offset": 506
-            }
           }
         }
       ],
@@ -712,30 +822,17 @@
           "line": 25,
           "column": 31,
           "offset": 509
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyTextBox",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "autocomplete",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 27,
-              "column": 12,
-              "offset": 522
-            },
-            "end": {
-              "line": 27,
-              "column": 24,
-              "offset": 534
-            }
-          }
+          "value": null
         }
       ],
       "children": [],
@@ -749,44 +846,38 @@
           "line": 27,
           "column": 27,
           "offset": 537
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyTextBox",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "autocomplete",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "true",
-            "position": {
-              "start": {
-                "line": 29,
-                "column": 25,
-                "offset": 563
-              },
-              "end": {
-                "line": 29,
-                "column": 31,
-                "offset": 569
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  }
+                },
+                "value": true,
+                "raw": "true"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 29,
-              "column": 12,
-              "offset": 550
-            },
-            "end": {
-              "line": 29,
-              "column": 31,
-              "offset": 569
-            }
           }
         }
       ],
@@ -801,47 +892,22 @@
           "line": 29,
           "column": 34,
           "offset": 572
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Greeting",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "firstName",
-          "value": "Ben",
-          "position": {
-            "start": {
-              "line": 31,
-              "column": 11,
-              "offset": 584
-            },
-            "end": {
-              "line": 31,
-              "column": 26,
-              "offset": 599
-            }
-          }
+          "value": "Ben"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "lastName",
-          "value": "Hector",
-          "position": {
-            "start": {
-              "line": 31,
-              "column": 27,
-              "offset": 600
-            },
-            "end": {
-              "line": 31,
-              "column": 44,
-              "offset": 617
-            }
-          }
+          "value": "Hector"
         }
       ],
       "children": [],
@@ -855,27 +921,47 @@
           "line": 31,
           "column": 47,
           "offset": 620
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Greeting",
       "attributes": [
         {
-          "type": "mdxAttributeExpression",
+          "type": "mdxJsxExpressionAttribute",
           "value": "...props",
-          "position": {
-            "start": {
-              "line": 33,
-              "column": 11,
-              "offset": 632
-            },
-            "end": {
-              "line": 33,
-              "column": 21,
-              "offset": 642
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 3,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "name": "props"
+              }
             }
           }
         }
@@ -891,59 +977,73 @@
           "line": 33,
           "column": 24,
           "offset": 645
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "button",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "className",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "className",
-            "position": {
-              "start": {
-                "line": 35,
-                "column": 19,
-                "offset": 665
-              },
-              "end": {
-                "line": 35,
-                "column": 30,
-                "offset": 676
+            "data": {
+              "estree": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "name": "className"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 35,
-              "column": 9,
-              "offset": 655
-            },
-            "end": {
-              "line": 35,
-              "column": 30,
-              "offset": 676
-            }
           }
         },
         {
-          "type": "mdxAttributeExpression",
+          "type": "mdxJsxExpressionAttribute",
           "value": "...other",
-          "position": {
-            "start": {
-              "line": 35,
-              "column": 31,
-              "offset": 677
-            },
-            "end": {
-              "line": 35,
-              "column": 41,
-              "offset": 687
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 3,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "name": "other"
+              }
             }
           }
         }
@@ -959,66 +1059,135 @@
           "line": 35,
           "column": 44,
           "offset": 690
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "Button",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "kind",
-              "value": "primary",
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 11,
-                  "offset": 708
-                },
-                "end": {
-                  "line": 38,
-                  "column": 25,
-                  "offset": 722
-                }
-              }
+              "value": "primary"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "onClick",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "() => console.log(\"clicked!\")",
-                "position": {
-                  "start": {
-                    "line": 38,
-                    "column": 34,
-                    "offset": 731
-                  },
-                  "end": {
-                    "line": 38,
-                    "column": 65,
-                    "offset": 762
+                "data": {
+                  "estree": {
+                    "type": "ArrowFunctionExpression",
+                    "start": 0,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    },
+                    "id": null,
+                    "expression": true,
+                    "generator": false,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "CallExpression",
+                      "start": 6,
+                      "end": 29,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 29
+                        }
+                      },
+                      "callee": {
+                        "type": "MemberExpression",
+                        "start": 6,
+                        "end": 17,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 17
+                          }
+                        },
+                        "object": {
+                          "type": "Identifier",
+                          "start": 6,
+                          "end": 13,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 6
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 13
+                            }
+                          },
+                          "name": "console"
+                        },
+                        "property": {
+                          "type": "Identifier",
+                          "start": 14,
+                          "end": 17,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 17
+                            }
+                          },
+                          "name": "log"
+                        },
+                        "computed": false,
+                        "optional": false
+                      },
+                      "arguments": [
+                        {
+                          "type": "Literal",
+                          "start": 18,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            }
+                          },
+                          "value": "clicked!",
+                          "raw": "\"clicked!\""
+                        }
+                      ],
+                      "optional": false
+                    }
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 26,
-                  "offset": 723
-                },
-                "end": {
-                  "line": 38,
-                  "column": 65,
-                  "offset": 762
-                }
               }
             }
           ],
@@ -1032,52 +1201,42 @@
                   "position": {
                     "start": {
                       "line": 39,
-                      "column": 1,
-                      "offset": 764
+                      "column": 5,
+                      "offset": 768
                     },
                     "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 783
-                    },
-                    "indent": [
-                      1
-                    ]
+                      "line": 39,
+                      "column": 17,
+                      "offset": 780
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 39,
-                  "column": 1,
-                  "offset": 764
+                  "column": 5,
+                  "offset": 768
                 },
                 "end": {
-                  "line": 40,
-                  "column": 3,
-                  "offset": 783
-                },
-                "indent": [
-                  1
-                ]
+                  "line": 39,
+                  "column": 17,
+                  "offset": 780
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 38,
-              "column": 1,
-              "offset": 698
+              "column": 3,
+              "offset": 700
             },
             "end": {
               "line": 40,
               "column": 12,
               "offset": 792
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -1091,22 +1250,16 @@
           "line": 41,
           "column": 7,
           "offset": 799
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "MyComponent",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "MyComponent",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -1121,23 +1274,21 @@
                   "line": 43,
                   "column": 26,
                   "offset": 826
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 43,
-              "column": 14,
-              "offset": 814
+              "column": 1,
+              "offset": 801
             },
             "end": {
               "line": 43,
-              "column": 26,
-              "offset": 826
-            },
-            "indent": []
+              "column": 40,
+              "offset": 840
+            }
           }
         }
       ],
@@ -1151,17 +1302,16 @@
           "line": 43,
           "column": 40,
           "offset": 840
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -1176,23 +1326,21 @@
                   "line": 45,
                   "column": 48,
                   "offset": 889
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 45,
-              "column": 6,
-              "offset": 847
+              "column": 1,
+              "offset": 842
             },
             "end": {
               "line": 45,
-              "column": 48,
-              "offset": 889
-            },
-            "indent": []
+              "column": 54,
+              "offset": 895
+            }
           }
         }
       ],
@@ -1206,17 +1354,16 @@
           "line": 45,
           "column": 54,
           "offset": 895
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -1231,23 +1378,21 @@
                   "line": 47,
                   "column": 17,
                   "offset": 913
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 47,
-              "column": 6,
-              "offset": 902
+              "column": 1,
+              "offset": 897
             },
             "end": {
               "line": 47,
-              "column": 17,
-              "offset": 913
-            },
-            "indent": []
+              "column": 23,
+              "offset": 919
+            }
           }
         }
       ],
@@ -1261,12 +1406,11 @@
           "line": 47,
           "column": 23,
           "offset": 919
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
@@ -1279,30 +1423,28 @@
               "position": {
                 "start": {
                   "line": 50,
-                  "column": 1,
-                  "offset": 927
+                  "column": 3,
+                  "offset": 929
                 },
                 "end": {
                   "line": 50,
                   "column": 14,
                   "offset": 940
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 50,
-              "column": 1,
-              "offset": 927
+              "column": 3,
+              "offset": 929
             },
             "end": {
               "line": 50,
               "column": 14,
               "offset": 940
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1316,15 +1458,11 @@
           "line": 51,
           "column": 7,
           "offset": 947
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
@@ -1337,34 +1475,28 @@
               "position": {
                 "start": {
                   "line": 54,
-                  "column": 1,
-                  "offset": 955
+                  "column": 3,
+                  "offset": 957
                 },
                 "end": {
                   "line": 55,
                   "column": 8,
                   "offset": 970
-                },
-                "indent": [
-                  1
-                ]
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 54,
-              "column": 1,
-              "offset": 955
+              "column": 3,
+              "offset": 957
             },
             "end": {
               "line": 55,
               "column": 8,
               "offset": 970
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
@@ -1378,16 +1510,11 @@
           "line": 56,
           "column": 7,
           "offset": 977
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
@@ -1400,30 +1527,28 @@
               "position": {
                 "start": {
                   "line": 60,
-                  "column": 1,
-                  "offset": 986
+                  "column": 3,
+                  "offset": 988
                 },
                 "end": {
                   "line": 60,
                   "column": 14,
                   "offset": 999
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 60,
-              "column": 1,
-              "offset": 986
+              "column": 3,
+              "offset": 988
             },
             "end": {
               "line": 60,
               "column": 14,
               "offset": 999
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1437,55 +1562,48 @@
           "line": 61,
           "column": 7,
           "offset": 1006
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "MyContainer",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "MyFirstComponent",
           "attributes": [],
           "children": [],
           "position": {
             "start": {
               "line": 64,
-              "column": 1,
-              "offset": 1022
+              "column": 3,
+              "offset": 1024
             },
             "end": {
               "line": 64,
               "column": 23,
               "offset": 1044
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "MySecondComponent",
           "attributes": [],
           "children": [],
           "position": {
             "start": {
               "line": 65,
-              "column": 1,
-              "offset": 1045
+              "column": 3,
+              "offset": 1047
             },
             "end": {
               "line": 65,
               "column": 24,
               "offset": 1068
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1499,16 +1617,11 @@
           "line": 66,
           "column": 15,
           "offset": 1083
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
@@ -1521,44 +1634,42 @@
               "position": {
                 "start": {
                   "line": 69,
-                  "column": 1,
-                  "offset": 1091
+                  "column": 3,
+                  "offset": 1093
                 },
                 "end": {
                   "line": 69,
                   "column": 18,
                   "offset": 1108
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 69,
-              "column": 1,
-              "offset": 1091
+              "column": 3,
+              "offset": 1093
             },
             "end": {
               "line": 69,
               "column": 18,
               "offset": 1108
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "ul",
           "attributes": [],
           "children": [
             {
-              "type": "mdxBlockElement",
-              "name": "li",
-              "attributes": [],
+              "type": "paragraph",
               "children": [
                 {
-                  "type": "paragraph",
+                  "type": "mdxJsxTextElement",
+                  "name": "li",
+                  "attributes": [],
                   "children": [
                     {
                       "type": "text",
@@ -1573,47 +1684,43 @@
                           "line": 72,
                           "column": 15,
                           "offset": 1131
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 72,
-                      "column": 9,
-                      "offset": 1125
+                      "column": 5,
+                      "offset": 1121
                     },
                     "end": {
                       "line": 72,
-                      "column": 15,
-                      "offset": 1131
-                    },
-                    "indent": []
+                      "column": 20,
+                      "offset": 1136
+                    }
                   }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 72,
-                  "column": 1,
-                  "offset": 1117
                 },
-                "end": {
-                  "line": 72,
-                  "column": 20,
-                  "offset": 1136
+                {
+                  "type": "text",
+                  "value": "\n",
+                  "position": {
+                    "start": {
+                      "line": 72,
+                      "column": 20,
+                      "offset": 1136
+                    },
+                    "end": {
+                      "line": 73,
+                      "column": 1,
+                      "offset": 1137
+                    }
+                  }
                 },
-                "indent": []
-              }
-            },
-            {
-              "type": "mdxBlockElement",
-              "name": "li",
-              "attributes": [],
-              "children": [
                 {
-                  "type": "paragraph",
+                  "type": "mdxJsxTextElement",
+                  "name": "li",
+                  "attributes": [],
                   "children": [
                     {
                       "type": "text",
@@ -1628,57 +1735,49 @@
                           "line": 73,
                           "column": 15,
                           "offset": 1151
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 73,
-                      "column": 9,
-                      "offset": 1145
+                      "column": 5,
+                      "offset": 1141
                     },
                     "end": {
                       "line": 73,
-                      "column": 15,
-                      "offset": 1151
-                    },
-                    "indent": []
+                      "column": 20,
+                      "offset": 1156
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 73,
-                  "column": 1,
-                  "offset": 1137
+                  "line": 72,
+                  "column": 5,
+                  "offset": 1121
                 },
                 "end": {
                   "line": 73,
                   "column": 20,
                   "offset": 1156
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 71,
-              "column": 1,
-              "offset": 1110
+              "column": 3,
+              "offset": 1112
             },
             "end": {
               "line": 74,
               "column": 8,
               "offset": 1164
-            },
-            "indent": [
-              1,
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -1692,25 +1791,16 @@
           "line": 75,
           "column": 7,
           "offset": 1171
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "MyComponent",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "MyComponent",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -1725,23 +1815,21 @@
                   "line": 77,
                   "column": 17,
                   "offset": 1189
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 77,
-              "column": 14,
-              "offset": 1186
+              "column": 1,
+              "offset": 1173
             },
             "end": {
               "line": 77,
-              "column": 17,
-              "offset": 1189
-            },
-            "indent": []
+              "column": 31,
+              "offset": 1203
+            }
           }
         }
       ],
@@ -1755,30 +1843,64 @@
           "line": 77,
           "column": 31,
           "offset": 1203
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "MyComponent",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "'foo'",
+          "type": "mdxJsxTextElement",
+          "name": "MyComponent",
+          "attributes": [],
+          "children": [
+            {
+              "type": "mdxTextExpression",
+              "value": "'foo'",
+              "position": {
+                "start": {
+                  "line": 79,
+                  "column": 14,
+                  "offset": 1218
+                },
+                "end": {
+                  "line": 79,
+                  "column": 21,
+                  "offset": 1225
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Literal",
+                  "start": 0,
+                  "end": 5,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 5
+                    }
+                  },
+                  "value": "foo",
+                  "raw": "'foo'"
+                }
+              }
+            }
+          ],
           "position": {
             "start": {
               "line": 79,
-              "column": 14,
-              "offset": 1218
+              "column": 1,
+              "offset": 1205
             },
             "end": {
               "line": 79,
-              "column": 21,
-              "offset": 1225
-            },
-            "indent": []
+              "column": 35,
+              "offset": 1239
+            }
           }
         }
       ],
@@ -1792,30 +1914,309 @@
           "line": 79,
           "column": 35,
           "offset": 1239
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "ul",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
+          "type": "mdxFlowExpression",
           "value": "todos.map((message) => <Item key={message} message={message} />)",
           "position": {
             "start": {
               "line": 82,
-              "column": 1,
-              "offset": 1246
+              "column": 3,
+              "offset": 1248
             },
             "end": {
               "line": 82,
               "column": 69,
               "offset": 1314
-            },
-            "indent": []
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "CallExpression",
+              "start": 0,
+              "end": 64,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 64
+                }
+              },
+              "callee": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "object": {
+                  "type": "Identifier",
+                  "start": 0,
+                  "end": 5,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 5
+                    }
+                  },
+                  "name": "todos"
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    }
+                  },
+                  "name": "map"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "arguments": [
+                {
+                  "type": "ArrowFunctionExpression",
+                  "start": 10,
+                  "end": 63,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 63
+                    }
+                  },
+                  "id": null,
+                  "expression": true,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 11,
+                      "end": 18,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 18
+                        }
+                      },
+                      "name": "message"
+                    }
+                  ],
+                  "body": {
+                    "type": "JSXElement",
+                    "start": 23,
+                    "end": 63,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 63
+                      }
+                    },
+                    "openingElement": {
+                      "type": "JSXOpeningElement",
+                      "start": 23,
+                      "end": 63,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 63
+                        }
+                      },
+                      "attributes": [
+                        {
+                          "type": "JSXAttribute",
+                          "start": 29,
+                          "end": 42,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 42
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 29,
+                            "end": 32,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 29
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 32
+                              }
+                            },
+                            "name": "key"
+                          },
+                          "value": {
+                            "type": "JSXExpressionContainer",
+                            "start": 33,
+                            "end": 42,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 33
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 42
+                              }
+                            },
+                            "expression": {
+                              "type": "Identifier",
+                              "start": 34,
+                              "end": 41,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 34
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 41
+                                }
+                              },
+                              "name": "message"
+                            }
+                          }
+                        },
+                        {
+                          "type": "JSXAttribute",
+                          "start": 43,
+                          "end": 60,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 43
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 60
+                            }
+                          },
+                          "name": {
+                            "type": "JSXIdentifier",
+                            "start": 43,
+                            "end": 50,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 43
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 50
+                              }
+                            },
+                            "name": "message"
+                          },
+                          "value": {
+                            "type": "JSXExpressionContainer",
+                            "start": 51,
+                            "end": 60,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 51
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 60
+                              }
+                            },
+                            "expression": {
+                              "type": "Identifier",
+                              "start": 52,
+                              "end": 59,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 52
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 59
+                                }
+                              },
+                              "name": "message"
+                            }
+                          }
+                        }
+                      ],
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 24,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 24
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 28
+                          }
+                        },
+                        "name": "Item"
+                      },
+                      "selfClosing": true
+                    },
+                    "closingElement": null,
+                    "children": []
+                  }
+                }
+              ],
+              "optional": false
+            }
           }
         }
       ],
@@ -1829,20 +2230,16 @@
           "line": 83,
           "column": 6,
           "offset": 1320
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -1857,12 +2254,11 @@
                   "line": 85,
                   "column": 12,
                   "offset": 1333
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.addressee",
               "position": {
                 "start": {
@@ -1874,8 +2270,58 @@
                   "line": 85,
                   "column": 29,
                   "offset": 1350
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 15,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 15
+                      }
+                    },
+                    "name": "addressee"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             },
             {
@@ -1891,23 +2337,21 @@
                   "line": 85,
                   "column": 30,
                   "offset": 1351
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 85,
-              "column": 6,
-              "offset": 1327
+              "column": 1,
+              "offset": 1322
             },
             "end": {
               "line": 85,
-              "column": 30,
-              "offset": 1351
-            },
-            "indent": []
+              "column": 36,
+              "offset": 1357
+            }
           }
         }
       ],
@@ -1921,63 +2365,304 @@
           "line": 85,
           "column": 36,
           "offset": 1357
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Repeat",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "numTimes",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "10",
-            "position": {
-              "start": {
-                "line": 87,
-                "column": 18,
-                "offset": 1376
-              },
-              "end": {
-                "line": 87,
-                "column": 22,
-                "offset": 1380
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 2,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 2
+                  }
+                },
+                "value": 10,
+                "raw": "10"
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 87,
-              "column": 9,
-              "offset": 1367
-            },
-            "end": {
-              "line": 87,
-              "column": 22,
-              "offset": 1380
-            }
           }
         }
       ],
       "children": [
         {
-          "type": "mdxBlockExpression",
+          "type": "mdxFlowExpression",
           "value": "(index) => <div key={index}>This is item {index} in the list</div>",
           "position": {
             "start": {
               "line": 88,
-              "column": 1,
-              "offset": 1382
+              "column": 3,
+              "offset": 1384
             },
             "end": {
               "line": 88,
               "column": 71,
               "offset": 1452
-            },
-            "indent": []
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "ArrowFunctionExpression",
+              "start": 0,
+              "end": 66,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 66
+                }
+              },
+              "id": null,
+              "expression": true,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 1,
+                  "end": 6,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 6
+                    }
+                  },
+                  "name": "index"
+                }
+              ],
+              "body": {
+                "type": "JSXElement",
+                "start": 11,
+                "end": 66,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 66
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 11,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 28
+                    }
+                  },
+                  "attributes": [
+                    {
+                      "type": "JSXAttribute",
+                      "start": 16,
+                      "end": 27,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 27
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 16,
+                        "end": 19,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 19
+                          }
+                        },
+                        "name": "key"
+                      },
+                      "value": {
+                        "type": "JSXExpressionContainer",
+                        "start": 20,
+                        "end": 27,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 27
+                          }
+                        },
+                        "expression": {
+                          "type": "Identifier",
+                          "start": 21,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            }
+                          },
+                          "name": "index"
+                        }
+                      }
+                    }
+                  ],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 12,
+                    "end": 15,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 15
+                      }
+                    },
+                    "name": "div"
+                  },
+                  "selfClosing": false
+                },
+                "closingElement": {
+                  "type": "JSXClosingElement",
+                  "start": 60,
+                  "end": 66,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 60
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 66
+                    }
+                  },
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 62,
+                    "end": 65,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 62
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 65
+                      }
+                    },
+                    "name": "div"
+                  }
+                },
+                "children": [
+                  {
+                    "type": "JSXText",
+                    "start": 28,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 41
+                      }
+                    },
+                    "value": "This is item ",
+                    "raw": "This is item "
+                  },
+                  {
+                    "type": "JSXExpressionContainer",
+                    "start": 41,
+                    "end": 48,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 41
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 48
+                      }
+                    },
+                    "expression": {
+                      "type": "Identifier",
+                      "start": 42,
+                      "end": 47,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 42
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 47
+                        }
+                      },
+                      "name": "index"
+                    }
+                  },
+                  {
+                    "type": "JSXText",
+                    "start": 48,
+                    "end": 60,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 48
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 60
+                      }
+                    },
+                    "value": " in the list",
+                    "raw": " in the list"
+                  }
+                ]
+              }
+            }
           }
         }
       ],
@@ -1991,15 +2676,11 @@
           "line": 89,
           "column": 10,
           "offset": 1462
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [],
@@ -2013,12 +2694,11 @@
           "line": 91,
           "column": 8,
           "offset": 1471
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [],
@@ -2032,30 +2712,64 @@
           "line": 93,
           "column": 12,
           "offset": 1484
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "false",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
+          "children": [
+            {
+              "type": "mdxTextExpression",
+              "value": "false",
+              "position": {
+                "start": {
+                  "line": 95,
+                  "column": 6,
+                  "offset": 1491
+                },
+                "end": {
+                  "line": 95,
+                  "column": 13,
+                  "offset": 1498
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Literal",
+                  "start": 0,
+                  "end": 5,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 5
+                    }
+                  },
+                  "value": false,
+                  "raw": "false"
+                }
+              }
+            }
+          ],
           "position": {
             "start": {
               "line": 95,
-              "column": 6,
-              "offset": 1491
+              "column": 1,
+              "offset": 1486
             },
             "end": {
               "line": 95,
-              "column": 13,
-              "offset": 1498
-            },
-            "indent": []
+              "column": 19,
+              "offset": 1504
+            }
           }
         }
       ],
@@ -2069,30 +2783,64 @@
           "line": 95,
           "column": 19,
           "offset": 1504
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "null",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
+          "children": [
+            {
+              "type": "mdxTextExpression",
+              "value": "null",
+              "position": {
+                "start": {
+                  "line": 97,
+                  "column": 6,
+                  "offset": 1511
+                },
+                "end": {
+                  "line": 97,
+                  "column": 12,
+                  "offset": 1517
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Literal",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  },
+                  "value": null,
+                  "raw": "null"
+                }
+              }
+            }
+          ],
           "position": {
             "start": {
               "line": 97,
-              "column": 6,
-              "offset": 1511
+              "column": 1,
+              "offset": 1506
             },
             "end": {
               "line": 97,
-              "column": 12,
-              "offset": 1517
-            },
-            "indent": []
+              "column": 18,
+              "offset": 1523
+            }
           }
         }
       ],
@@ -2106,30 +2854,63 @@
           "line": 97,
           "column": 18,
           "offset": 1523
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "undefined",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
+          "children": [
+            {
+              "type": "mdxTextExpression",
+              "value": "undefined",
+              "position": {
+                "start": {
+                  "line": 99,
+                  "column": 6,
+                  "offset": 1530
+                },
+                "end": {
+                  "line": 99,
+                  "column": 17,
+                  "offset": 1541
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Identifier",
+                  "start": 0,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    }
+                  },
+                  "name": "undefined"
+                }
+              }
+            }
+          ],
           "position": {
             "start": {
               "line": 99,
-              "column": 6,
-              "offset": 1530
+              "column": 1,
+              "offset": 1525
             },
             "end": {
               "line": 99,
-              "column": 17,
-              "offset": 1541
-            },
-            "indent": []
+              "column": 23,
+              "offset": 1547
+            }
           }
         }
       ],
@@ -2143,30 +2924,64 @@
           "line": 99,
           "column": 23,
           "offset": 1547
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "div",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "true",
+          "type": "mdxJsxTextElement",
+          "name": "div",
+          "attributes": [],
+          "children": [
+            {
+              "type": "mdxTextExpression",
+              "value": "true",
+              "position": {
+                "start": {
+                  "line": 101,
+                  "column": 6,
+                  "offset": 1554
+                },
+                "end": {
+                  "line": 101,
+                  "column": 12,
+                  "offset": 1560
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "Literal",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  },
+                  "value": true,
+                  "raw": "true"
+                }
+              }
+            }
+          ],
           "position": {
             "start": {
               "line": 101,
-              "column": 6,
-              "offset": 1554
+              "column": 1,
+              "offset": 1549
             },
             "end": {
               "line": 101,
-              "column": 12,
-              "offset": 1560
-            },
-            "indent": []
+              "column": 18,
+              "offset": 1566
+            }
           }
         }
       ],
@@ -2180,49 +2995,130 @@
           "line": 101,
           "column": 18,
           "offset": 1566
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
+          "type": "mdxFlowExpression",
           "value": "showHeader && <Header />",
           "position": {
             "start": {
               "line": 104,
-              "column": 1,
-              "offset": 1574
+              "column": 3,
+              "offset": 1576
             },
             "end": {
               "line": 104,
               "column": 29,
               "offset": 1602
-            },
-            "indent": []
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "LogicalExpression",
+              "start": 0,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 24
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "name": "showHeader"
+              },
+              "operator": "&&",
+              "right": {
+                "type": "JSXElement",
+                "start": 14,
+                "end": 24,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 24
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 14,
+                  "end": 24,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 24
+                    }
+                  },
+                  "attributes": [],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 15,
+                    "end": 21,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 21
+                      }
+                    },
+                    "name": "Header"
+                  },
+                  "selfClosing": true
+                },
+                "closingElement": null,
+                "children": []
+              }
+            }
           }
         },
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "Content",
           "attributes": [],
           "children": [],
           "position": {
             "start": {
               "line": 105,
-              "column": 1,
-              "offset": 1603
+              "column": 3,
+              "offset": 1605
             },
             "end": {
               "line": 105,
               "column": 14,
               "offset": 1616
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -2236,37 +3132,274 @@
           "line": 106,
           "column": 7,
           "offset": 1623
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "props.messages.length &&\n<MessageList messages={props.messages} />",
+          "type": "mdxFlowExpression",
+          "value": "props.messages.length &&\n<MessageList messages={props.messages} />\n",
           "position": {
             "start": {
               "line": 109,
-              "column": 1,
-              "offset": 1631
+              "column": 3,
+              "offset": 1633
             },
             "end": {
               "line": 111,
               "column": 4,
               "offset": 1708
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "LogicalExpression",
+              "start": 0,
+              "end": 70,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 45
+                }
+              },
+              "left": {
+                "type": "MemberExpression",
+                "start": 0,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      }
+                    },
+                    "name": "messages"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 15,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    }
+                  },
+                  "name": "length"
+                },
+                "computed": false,
+                "optional": false
+              },
+              "operator": "&&",
+              "right": {
+                "type": "JSXElement",
+                "start": 29,
+                "end": 70,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 45
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 29,
+                  "end": 70,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 45
+                    }
+                  },
+                  "attributes": [
+                    {
+                      "type": "JSXAttribute",
+                      "start": 42,
+                      "end": 67,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 17
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 42
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 42,
+                        "end": 50,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 17
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 25
+                          }
+                        },
+                        "name": "messages"
+                      },
+                      "value": {
+                        "type": "JSXExpressionContainer",
+                        "start": 51,
+                        "end": 67,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 26
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 42
+                          }
+                        },
+                        "expression": {
+                          "type": "MemberExpression",
+                          "start": 52,
+                          "end": 66,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 27
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 41
+                            }
+                          },
+                          "object": {
+                            "type": "Identifier",
+                            "start": 52,
+                            "end": 57,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 27
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 32
+                              }
+                            },
+                            "name": "props"
+                          },
+                          "property": {
+                            "type": "Identifier",
+                            "start": 58,
+                            "end": 66,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 33
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 41
+                              }
+                            },
+                            "name": "messages"
+                          },
+                          "computed": false,
+                          "optional": false
+                        }
+                      }
+                    }
+                  ],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 30,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 16
+                      }
+                    },
+                    "name": "MessageList"
+                  },
+                  "selfClosing": true
+                },
+                "closingElement": null,
+                "children": []
+              }
+            }
           }
         }
       ],
@@ -2280,38 +3413,307 @@
           "line": 112,
           "column": 7,
           "offset": 1715
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "props.messages.length > 0 &&\n<MessageList messages={props.messages} />",
+          "type": "mdxFlowExpression",
+          "value": "props.messages.length > 0 &&\n<MessageList messages={props.messages} />\n",
           "position": {
             "start": {
               "line": 115,
-              "column": 1,
-              "offset": 1723
+              "column": 3,
+              "offset": 1725
             },
             "end": {
               "line": 117,
               "column": 4,
               "offset": 1804
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "LogicalExpression",
+              "start": 0,
+              "end": 74,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 45
+                }
+              },
+              "left": {
+                "type": "BinaryExpression",
+                "start": 0,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 25
+                  }
+                },
+                "left": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    }
+                  },
+                  "object": {
+                    "type": "MemberExpression",
+                    "start": 0,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      }
+                    },
+                    "object": {
+                      "type": "Identifier",
+                      "start": 0,
+                      "end": 5,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 5
+                        }
+                      },
+                      "name": "props"
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 6,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      },
+                      "name": "messages"
+                    },
+                    "computed": false,
+                    "optional": false
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 21,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 21
+                      }
+                    },
+                    "name": "length"
+                  },
+                  "computed": false,
+                  "optional": false
+                },
+                "operator": ">",
+                "right": {
+                  "type": "Literal",
+                  "start": 24,
+                  "end": 25,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 25
+                    }
+                  },
+                  "value": 0,
+                  "raw": "0"
+                }
+              },
+              "operator": "&&",
+              "right": {
+                "type": "JSXElement",
+                "start": 33,
+                "end": 74,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 45
+                  }
+                },
+                "openingElement": {
+                  "type": "JSXOpeningElement",
+                  "start": 33,
+                  "end": 74,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 45
+                    }
+                  },
+                  "attributes": [
+                    {
+                      "type": "JSXAttribute",
+                      "start": 46,
+                      "end": 71,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 17
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 42
+                        }
+                      },
+                      "name": {
+                        "type": "JSXIdentifier",
+                        "start": 46,
+                        "end": 54,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 17
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 25
+                          }
+                        },
+                        "name": "messages"
+                      },
+                      "value": {
+                        "type": "JSXExpressionContainer",
+                        "start": 55,
+                        "end": 71,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 26
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 42
+                          }
+                        },
+                        "expression": {
+                          "type": "MemberExpression",
+                          "start": 56,
+                          "end": 70,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 27
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 41
+                            }
+                          },
+                          "object": {
+                            "type": "Identifier",
+                            "start": 56,
+                            "end": 61,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 27
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 32
+                              }
+                            },
+                            "name": "props"
+                          },
+                          "property": {
+                            "type": "Identifier",
+                            "start": 62,
+                            "end": 70,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 33
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 41
+                              }
+                            },
+                            "name": "messages"
+                          },
+                          "computed": false,
+                          "optional": false
+                        }
+                      }
+                    }
+                  ],
+                  "name": {
+                    "type": "JSXIdentifier",
+                    "start": 34,
+                    "end": 45,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 16
+                      }
+                    },
+                    "name": "MessageList"
+                  },
+                  "selfClosing": true
+                },
+                "closingElement": null,
+                "children": []
+              }
+            }
           }
         }
       ],
@@ -2325,17 +3727,11 @@
           "line": 118,
           "column": 7,
           "offset": 1811
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
@@ -2348,19 +3744,18 @@
               "position": {
                 "start": {
                   "line": 121,
-                  "column": 1,
-                  "offset": 1819
+                  "column": 3,
+                  "offset": 1821
                 },
                 "end": {
                   "line": 121,
                   "column": 29,
                   "offset": 1847
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "String(myVariable)",
               "position": {
                 "start": {
@@ -2372,8 +3767,59 @@
                   "line": 121,
                   "column": 49,
                   "offset": 1867
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "CallExpression",
+                  "start": 0,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "name": "String"
+                  },
+                  "arguments": [
+                    {
+                      "type": "Identifier",
+                      "start": 7,
+                      "end": 17,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 7
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 17
+                        }
+                      },
+                      "name": "myVariable"
+                    }
+                  ],
+                  "optional": false
+                }
               }
             },
             {
@@ -2389,23 +3835,21 @@
                   "line": 121,
                   "column": 50,
                   "offset": 1868
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 121,
-              "column": 1,
-              "offset": 1819
+              "column": 3,
+              "offset": 1821
             },
             "end": {
               "line": 121,
               "column": 50,
               "offset": 1868
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -2419,11 +3863,7 @@
           "line": 122,
           "column": 7,
           "offset": 1875
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.out b/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.out
index 42195996a..bd13c2dc7 100644
--- a/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.out
+++ b/packages/remark-mdx/test/fixtures/examples-from-react-jsx-in-depth.out
@@ -13,15 +13,11 @@ From [React JSX in depth](https://reactjs.org/docs/jsx-in-depth.html):
 
 <MyComponents.DatePicker color="blue"/>
 
-<div>
-  Hello {props.toWhat}
-</div>
+<div>Hello {props.toWhat}</div>
 
 <MyComponent foo={1 + 2 + 3 + 4}/>
 
-<div>
-  {props.number} is an {description} number
-</div>
+<div>{props.number} is an {description} number</div>
 
 <MyComponent message="hello world"/>
 
@@ -56,17 +52,11 @@ From [React JSX in depth](https://reactjs.org/docs/jsx-in-depth.html):
   </Button>
 </div>
 
-<MyComponent>
-  Hello world!
-</MyComponent>
+<MyComponent>Hello world!</MyComponent>
 
-<div>
-  This is valid HTML & JSX at the same time.
-</div>
+<div>This is valid HTML & JSX at the same time.</div>
 
-<div>
-  Hello World
-</div>
+<div>Hello World</div>
 
 <div>
   Hello World
@@ -91,88 +81,51 @@ From [React JSX in depth](https://reactjs.org/docs/jsx-in-depth.html):
   Here is a list:
 
   <ul>
-    <li>
-      Item 1
-    </li>
-
-    <li>
-      Item 2
-    </li>
+    <li>Item 1</li>
+    <li>Item 2</li>
   </ul>
 </div>
 
-<MyComponent>
-  foo
-</MyComponent>
+<MyComponent>foo</MyComponent>
 
-<MyComponent>
-  {
-    'foo'
-  }
-</MyComponent>
+<MyComponent>{'foo'}</MyComponent>
 
 <ul>
-  {
-    todos.map((message) => <Item key={message} message={message} />)
-  }
+  {todos.map((message) => <Item key={message} message={message} />)}
 </ul>
 
-<div>
-  Hello {props.addressee}!
-</div>
+<div>Hello {props.addressee}!</div>
 
 <Repeat numTimes={10}>
-  {
-    (index) => <div key={index}>This is item {index} in the list</div>
-  }
+  {(index) => <div key={index}>This is item {index} in the list</div>}
 </Repeat>
 
 <div/>
 
 <div/>
 
-<div>
-  {
-    false
-  }
-</div>
+<div>{false}</div>
 
-<div>
-  {
-    null
-  }
-</div>
+<div>{null}</div>
 
-<div>
-  {
-    undefined
-  }
-</div>
+<div>{undefined}</div>
 
-<div>
-  {
-    true
-  }
-</div>
+<div>{true}</div>
 
 <div>
-  {
-    showHeader && <Header />
-  }
+  {showHeader && <Header />}
 
   <Content/>
 </div>
 
 <div>
-  {
-    props.messages.length &&
+  {props.messages.length &&
     <MessageList messages={props.messages} />
   }
 </div>
 
 <div>
-  {
-    props.messages.length > 0 &&
+  {props.messages.length > 0 &&
     <MessageList messages={props.messages} />
   }
 </div>
diff --git a/packages/remark-mdx/test/fixtures/expressions.json b/packages/remark-mdx/test/fixtures/expressions.json
index 671fd1ab4..25a322b9d 100644
--- a/packages/remark-mdx/test/fixtures/expressions.json
+++ b/packages/remark-mdx/test/fixtures/expressions.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 26,
               "offset": 25
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 26,
           "offset": 25
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -54,8 +52,7 @@
               "line": 3,
               "column": 30,
               "offset": 56
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -69,44 +66,59 @@
           "line": 3,
           "column": 30,
           "offset": 56
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "y",
           "value": {
-            "type": "mdxValueExpression",
-            "value": "`\n  // Blank line in attribute\n\n  // …expression.\n`",
-            "position": {
-              "start": {
-                "line": 5,
-                "column": 6,
-                "offset": 63
-              },
-              "end": {
-                "line": 9,
-                "column": 3,
-                "offset": 116
+            "type": "mdxJsxAttributeValueExpression",
+            "value": "`\n// Blank line in attribute\n\n// …expression.\n`",
+            "data": {
+              "estree": {
+                "type": "TemplateLiteral",
+                "start": 0,
+                "end": 51,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 1
+                  }
+                },
+                "expressions": [],
+                "quasis": [
+                  {
+                    "type": "TemplateElement",
+                    "start": 1,
+                    "end": 50,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 0
+                      }
+                    },
+                    "value": {
+                      "raw": "\n  // Blank line in attribute\n\n  // …expression.\n",
+                      "cooked": "\n  // Blank line in attribute\n\n  // …expression.\n"
+                    },
+                    "tail": true
+                  }
+                ]
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 5,
-              "column": 4,
-              "offset": 61
-            },
-            "end": {
-              "line": 9,
-              "column": 3,
-              "offset": 116
-            }
           }
         }
       ],
@@ -121,13 +133,7 @@
           "line": 9,
           "column": 5,
           "offset": 118
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -142,8 +148,7 @@
           "line": 11,
           "column": 6,
           "offset": 125
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -162,44 +167,90 @@
               "line": 13,
               "column": 26,
               "offset": 152
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "x",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "y",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "{z: true}",
-                "position": {
-                  "start": {
-                    "line": 13,
-                    "column": 31,
-                    "offset": 157
-                  },
-                  "end": {
-                    "line": 13,
-                    "column": 42,
-                    "offset": 168
+                "data": {
+                  "estree": {
+                    "type": "ObjectExpression",
+                    "start": 0,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      }
+                    },
+                    "properties": [
+                      {
+                        "type": "Property",
+                        "start": 1,
+                        "end": 8,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 1
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 8
+                          }
+                        },
+                        "method": false,
+                        "shorthand": false,
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "start": 1,
+                          "end": 2,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 1
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 2
+                            }
+                          },
+                          "name": "z"
+                        },
+                        "value": {
+                          "type": "Literal",
+                          "start": 4,
+                          "end": 8,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 4
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 8
+                            }
+                          },
+                          "value": true,
+                          "raw": "true"
+                        },
+                        "kind": "init"
+                      }
+                    ]
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 13,
-                  "column": 29,
-                  "offset": 155
-                },
-                "end": {
-                  "line": 13,
-                  "column": 42,
-                  "offset": 168
-                }
               }
             }
           ],
@@ -214,8 +265,7 @@
               "line": 13,
               "column": 44,
               "offset": 170
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -229,8 +279,7 @@
           "line": 13,
           "column": 44,
           "offset": 170
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -250,8 +299,7 @@
               "line": 15,
               "column": 24,
               "offset": 195
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -265,27 +313,47 @@
           "line": 15,
           "column": 24,
           "offset": 195
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [
         {
-          "type": "mdxAttributeExpression",
-          "value": "/*stuff!*/",
-          "position": {
-            "start": {
-              "line": 17,
-              "column": 4,
-              "offset": 200
-            },
-            "end": {
-              "line": 17,
-              "column": 16,
-              "offset": 212
+          "type": "mdxJsxExpressionAttribute",
+          "value": "/*stuff!*/...d",
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 13,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 13
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "name": "d"
+              }
             }
           }
         }
@@ -299,10 +367,9 @@
         },
         "end": {
           "line": 17,
-          "column": 18,
-          "offset": 214
-        },
-        "indent": []
+          "column": 22,
+          "offset": 218
+        }
       }
     },
     {
@@ -311,14 +378,13 @@
         "start": {
           "line": 19,
           "column": 1,
-          "offset": 216
+          "offset": 220
         },
         "end": {
           "line": 19,
           "column": 6,
-          "offset": 221
-        },
-        "indent": []
+          "offset": 225
+        }
       }
     },
     {
@@ -331,33 +397,158 @@
             "start": {
               "line": 21,
               "column": 1,
-              "offset": 223
+              "offset": 227
             },
             "end": {
               "line": 21,
               "column": 14,
-              "offset": 236
-            },
-            "indent": []
+              "offset": 240
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "x",
           "attributes": [
             {
-              "type": "mdxAttributeExpression",
+              "type": "mdxJsxExpressionAttribute",
               "value": "...{x: '1', z: \"zulu\"}",
-              "position": {
-                "start": {
-                  "line": 21,
-                  "column": 17,
-                  "offset": 239
-                },
-                "end": {
-                  "line": 21,
-                  "column": 41,
-                  "offset": 263
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 25,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 25
+                    }
+                  },
+                  "argument": {
+                    "type": "ObjectExpression",
+                    "start": 6,
+                    "end": 25,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 25
+                      }
+                    },
+                    "properties": [
+                      {
+                        "type": "Property",
+                        "start": 7,
+                        "end": 13,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 13
+                          }
+                        },
+                        "method": false,
+                        "shorthand": false,
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "start": 7,
+                          "end": 8,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 7
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 8
+                            }
+                          },
+                          "name": "x"
+                        },
+                        "value": {
+                          "type": "Literal",
+                          "start": 10,
+                          "end": 13,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 10
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 13
+                            }
+                          },
+                          "value": "1",
+                          "raw": "'1'"
+                        },
+                        "kind": "init"
+                      },
+                      {
+                        "type": "Property",
+                        "start": 15,
+                        "end": 24,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 15
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 24
+                          }
+                        },
+                        "method": false,
+                        "shorthand": false,
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "start": 15,
+                          "end": 16,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 15
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 16
+                            }
+                          },
+                          "name": "z"
+                        },
+                        "value": {
+                          "type": "Literal",
+                          "start": 18,
+                          "end": 24,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 24
+                            }
+                          },
+                          "value": "zulu",
+                          "raw": "\"zulu\""
+                        },
+                        "kind": "init"
+                      }
+                    ]
+                  }
                 }
               }
             }
@@ -367,14 +558,13 @@
             "start": {
               "line": 21,
               "column": 14,
-              "offset": 236
+              "offset": 240
             },
             "end": {
               "line": 21,
               "column": 43,
-              "offset": 265
-            },
-            "indent": []
+              "offset": 269
+            }
           }
         }
       ],
@@ -382,14 +572,13 @@
         "start": {
           "line": 21,
           "column": 1,
-          "offset": 223
+          "offset": 227
         },
         "end": {
           "line": 21,
           "column": 43,
-          "offset": 265
-        },
-        "indent": []
+          "offset": 269
+        }
       }
     },
     {
@@ -403,14 +592,13 @@
             "start": {
               "line": 23,
               "column": 4,
-              "offset": 270
+              "offset": 274
             },
             "end": {
               "line": 23,
               "column": 14,
-              "offset": 280
-            },
-            "indent": []
+              "offset": 284
+            }
           }
         }
       ],
@@ -418,14 +606,13 @@
         "start": {
           "line": 23,
           "column": 1,
-          "offset": 267
+          "offset": 271
         },
         "end": {
           "line": 23,
           "column": 14,
-          "offset": 280
-        },
-        "indent": []
+          "offset": 284
+        }
       }
     },
     {
@@ -439,14 +626,13 @@
             "start": {
               "line": 25,
               "column": 5,
-              "offset": 286
+              "offset": 290
             },
             "end": {
               "line": 25,
               "column": 11,
-              "offset": 292
-            },
-            "indent": []
+              "offset": 296
+            }
           }
         }
       ],
@@ -454,34 +640,80 @@
         "start": {
           "line": 25,
           "column": 1,
-          "offset": 282
+          "offset": 286
         },
         "end": {
           "line": 25,
           "column": 11,
-          "offset": 292
-        },
-        "indent": []
+          "offset": 296
+        }
       }
     },
     {
-      "type": "mdxBlockExpression",
-      "value": "Math.PI",
+      "type": "mdxFlowExpression",
+      "value": "\nMath.PI\n",
       "position": {
         "start": {
           "line": 27,
           "column": 1,
-          "offset": 294
+          "offset": 298
         },
         "end": {
           "line": 29,
           "column": 2,
-          "offset": 307
-        },
-        "indent": [
-          1,
-          1
-        ]
+          "offset": 311
+        }
+      },
+      "data": {
+        "estree": {
+          "type": "MemberExpression",
+          "start": 3,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 2,
+              "column": 9
+            }
+          },
+          "object": {
+            "type": "Identifier",
+            "start": 3,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 2
+              },
+              "end": {
+                "line": 2,
+                "column": 6
+              }
+            },
+            "name": "Math"
+          },
+          "property": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 7
+              },
+              "end": {
+                "line": 2,
+                "column": 9
+              }
+            },
+            "name": "PI"
+          },
+          "computed": false,
+          "optional": false
+        }
       }
     },
     {
@@ -490,14 +722,13 @@
         "start": {
           "line": 31,
           "column": 1,
-          "offset": 309
+          "offset": 313
         },
         "end": {
           "line": 31,
           "column": 6,
-          "offset": 314
-        },
-        "indent": []
+          "offset": 318
+        }
       }
     },
     {
@@ -510,31 +741,167 @@
             "start": {
               "line": 33,
               "column": 1,
-              "offset": 316
+              "offset": 320
             },
             "end": {
               "line": 33,
               "column": 14,
-              "offset": 329
-            },
-            "indent": []
+              "offset": 333
+            }
           }
         },
         {
-          "type": "mdxSpanExpression",
+          "type": "mdxTextExpression",
           "value": "{a: 1 + 1}[\"a\"]",
           "position": {
             "start": {
               "line": 33,
               "column": 14,
-              "offset": 329
+              "offset": 333
             },
             "end": {
               "line": 33,
               "column": 31,
-              "offset": 346
-            },
-            "indent": []
+              "offset": 350
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "MemberExpression",
+              "start": 0,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "object": {
+                "type": "ObjectExpression",
+                "start": 0,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "Property",
+                    "start": 1,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      }
+                    },
+                    "method": false,
+                    "shorthand": false,
+                    "computed": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 1,
+                      "end": 2,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 1
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 2
+                        }
+                      },
+                      "name": "a"
+                    },
+                    "value": {
+                      "type": "BinaryExpression",
+                      "start": 4,
+                      "end": 9,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 9
+                        }
+                      },
+                      "left": {
+                        "type": "Literal",
+                        "start": 4,
+                        "end": 5,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 5
+                          }
+                        },
+                        "value": 1,
+                        "raw": "1"
+                      },
+                      "operator": "+",
+                      "right": {
+                        "type": "Literal",
+                        "start": 8,
+                        "end": 9,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 8
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 9
+                          }
+                        },
+                        "value": 1,
+                        "raw": "1"
+                      }
+                    },
+                    "kind": "init"
+                  }
+                ]
+              },
+              "property": {
+                "type": "Literal",
+                "start": 11,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "value": "a",
+                "raw": "\"a\""
+              },
+              "computed": true,
+              "optional": false
+            }
           }
         },
         {
@@ -544,14 +911,13 @@
             "start": {
               "line": 33,
               "column": 31,
-              "offset": 346
+              "offset": 350
             },
             "end": {
               "line": 33,
               "column": 32,
-              "offset": 347
-            },
-            "indent": []
+              "offset": 351
+            }
           }
         }
       ],
@@ -559,14 +925,13 @@
         "start": {
           "line": 33,
           "column": 1,
-          "offset": 316
+          "offset": 320
         },
         "end": {
           "line": 33,
           "column": 32,
-          "offset": 347
-        },
-        "indent": []
+          "offset": 351
+        }
       }
     },
     {
@@ -580,14 +945,13 @@
             "start": {
               "line": 35,
               "column": 5,
-              "offset": 353
+              "offset": 357
             },
             "end": {
               "line": 35,
               "column": 10,
-              "offset": 358
-            },
-            "indent": []
+              "offset": 362
+            }
           }
         }
       ],
@@ -595,39 +959,86 @@
         "start": {
           "line": 35,
           "column": 1,
-          "offset": 349
+          "offset": 353
         },
         "end": {
           "line": 35,
           "column": 10,
-          "offset": 358
-        },
-        "indent": []
+          "offset": 362
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "1 + 1",
+          "type": "mdxFlowExpression",
+          "value": "\n1 + 1\n",
           "position": {
             "start": {
               "line": 38,
-              "column": 1,
-              "offset": 364
+              "column": 3,
+              "offset": 370
             },
             "end": {
               "line": 40,
               "column": 4,
-              "offset": 381
-            },
-            "indent": [
-              1,
-              1
-            ]
+              "offset": 385
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 9
+                }
+              },
+              "left": {
+                "type": "Literal",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 5
+                  }
+                },
+                "value": 1,
+                "raw": "1"
+              },
+              "operator": "+",
+              "right": {
+                "type": "Literal",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 9
+                  }
+                },
+                "value": 1,
+                "raw": "1"
+              }
+            }
           }
         }
       ],
@@ -635,19 +1046,13 @@
         "start": {
           "line": 37,
           "column": 1,
-          "offset": 360
+          "offset": 364
         },
         "end": {
           "line": 41,
           "column": 5,
-          "offset": 386
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+          "offset": 390
+        }
       }
     },
     {
@@ -656,14 +1061,13 @@
         "start": {
           "line": 43,
           "column": 1,
-          "offset": 388
+          "offset": 392
         },
         "end": {
           "line": 43,
           "column": 6,
-          "offset": 393
-        },
-        "indent": []
+          "offset": 397
+        }
       }
     },
     {
@@ -676,18 +1080,17 @@
             "start": {
               "line": 45,
               "column": 1,
-              "offset": 395
+              "offset": 399
             },
             "end": {
               "line": 45,
               "column": 6,
-              "offset": 400
-            },
-            "indent": []
+              "offset": 404
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -698,31 +1101,167 @@
                 "start": {
                   "line": 45,
                   "column": 8,
-                  "offset": 402
+                  "offset": 406
                 },
                 "end": {
                   "line": 45,
                   "column": 16,
-                  "offset": 410
-                },
-                "indent": []
+                  "offset": 414
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "{a: 1 + 1}[\"a\"]",
               "position": {
                 "start": {
                   "line": 45,
                   "column": 16,
-                  "offset": 410
+                  "offset": 414
                 },
                 "end": {
                   "line": 45,
                   "column": 33,
-                  "offset": 427
-                },
-                "indent": []
+                  "offset": 431
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "object": {
+                    "type": "ObjectExpression",
+                    "start": 0,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "properties": [
+                      {
+                        "type": "Property",
+                        "start": 1,
+                        "end": 9,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 1
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 9
+                          }
+                        },
+                        "method": false,
+                        "shorthand": false,
+                        "computed": false,
+                        "key": {
+                          "type": "Identifier",
+                          "start": 1,
+                          "end": 2,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 1
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 2
+                            }
+                          },
+                          "name": "a"
+                        },
+                        "value": {
+                          "type": "BinaryExpression",
+                          "start": 4,
+                          "end": 9,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 4
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 9
+                            }
+                          },
+                          "left": {
+                            "type": "Literal",
+                            "start": 4,
+                            "end": 5,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 4
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 5
+                              }
+                            },
+                            "value": 1,
+                            "raw": "1"
+                          },
+                          "operator": "+",
+                          "right": {
+                            "type": "Literal",
+                            "start": 8,
+                            "end": 9,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 9
+                              }
+                            },
+                            "value": 1,
+                            "raw": "1"
+                          }
+                        },
+                        "kind": "init"
+                      }
+                    ]
+                  },
+                  "property": {
+                    "type": "Literal",
+                    "start": 11,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      }
+                    },
+                    "value": "a",
+                    "raw": "\"a\""
+                  },
+                  "computed": true,
+                  "optional": false
+                }
               }
             }
           ],
@@ -730,14 +1269,13 @@
             "start": {
               "line": 45,
               "column": 6,
-              "offset": 400
+              "offset": 404
             },
             "end": {
               "line": 45,
               "column": 36,
-              "offset": 430
-            },
-            "indent": []
+              "offset": 434
+            }
           }
         },
         {
@@ -747,14 +1285,13 @@
             "start": {
               "line": 45,
               "column": 36,
-              "offset": 430
+              "offset": 434
             },
             "end": {
               "line": 45,
               "column": 37,
-              "offset": 431
-            },
-            "indent": []
+              "offset": 435
+            }
           }
         }
       ],
@@ -762,14 +1299,13 @@
         "start": {
           "line": 45,
           "column": 1,
-          "offset": 395
+          "offset": 399
         },
         "end": {
           "line": 45,
           "column": 37,
-          "offset": 431
-        },
-        "indent": []
+          "offset": 435
+        }
       }
     }
   ],
@@ -782,7 +1318,7 @@
     "end": {
       "line": 46,
       "column": 1,
-      "offset": 432
+      "offset": 436
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/expressions.md b/packages/remark-mdx/test/fixtures/expressions.md
index 6755d20ee..8b7dff40a 100644
--- a/packages/remark-mdx/test/fixtures/expressions.md
+++ b/packages/remark-mdx/test/fixtures/expressions.md
@@ -14,7 +14,7 @@ Can contain more braces: <x y={{z: true}}/>
 
 ## Attribute expression
 
-<X {/*stuff!*/}/>
+<X {/*stuff!*/...d}/>
 
 * * *
 
diff --git a/packages/remark-mdx/test/fixtures/expressions.out b/packages/remark-mdx/test/fixtures/expressions.out
index 97ac44158..b90e23e4c 100644
--- a/packages/remark-mdx/test/fixtures/expressions.out
+++ b/packages/remark-mdx/test/fixtures/expressions.out
@@ -3,20 +3,20 @@
 ## Attribute value expression
 
 <X y={`
-    // Blank line in attribute
+  // Blank line in attribute
 
-    // …expression.
+  // …expression.
   `}/>
 
-* * *
+***
 
 Can contain more braces: <x y={{z: true}}/>
 
 ## Attribute expression
 
-<X {/*stuff!*/}/>
+<X {/*stuff!*/...d}/>
 
-* * *
+***
 
 More braces: <x {...{x: '1', z: "zulu"}}/>
 
@@ -28,7 +28,7 @@ More braces: <x {...{x: '1', z: "zulu"}}/>
   Math.PI
 }
 
-* * *
+***
 
 More braces: {{a: 1 + 1}["a"]}.
 
@@ -40,6 +40,6 @@ More braces: {{a: 1 + 1}["a"]}.
   }
 </X>
 
-* * *
+***
 
 More <>braces: {{a: 1 + 1}["a"]}</>.
diff --git a/packages/remark-mdx/test/fixtures/format-attributes.json b/packages/remark-mdx/test/fixtures/format-attributes.json
index 2bbd70e00..990574a5a 100644
--- a/packages/remark-mdx/test/fixtures/format-attributes.json
+++ b/packages/remark-mdx/test/fixtures/format-attributes.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 23,
               "offset": 22
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 23,
           "offset": 22
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -54,8 +52,7 @@
               "line": 3,
               "column": 9,
               "offset": 32
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -69,8 +66,7 @@
           "line": 3,
           "column": 9,
           "offset": 32
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -90,8 +86,7 @@
               "line": 5,
               "column": 17,
               "offset": 50
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -105,12 +100,11 @@
           "line": 5,
           "column": 17,
           "offset": 50
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [],
       "children": [],
@@ -124,30 +118,17 @@
           "line": 7,
           "column": 7,
           "offset": 58
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "prop",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 9,
-              "column": 6,
-              "offset": 65
-            },
-            "end": {
-              "line": 9,
-              "column": 10,
-              "offset": 69
-            }
-          }
+          "value": null
         }
       ],
       "children": [],
@@ -161,47 +142,22 @@
           "line": 9,
           "column": 12,
           "offset": 71
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 11,
-              "column": 6,
-              "offset": 78
-            },
-            "end": {
-              "line": 11,
-              "column": 11,
-              "offset": 83
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "bravo",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 11,
-              "column": 12,
-              "offset": 84
-            },
-            "end": {
-              "line": 11,
-              "column": 17,
-              "offset": 89
-            }
-          }
+          "value": null
         }
       ],
       "children": [],
@@ -215,93 +171,84 @@
           "line": 11,
           "column": 19,
           "offset": 91
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": "bravo",
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 6,
-              "offset": 98
-            },
-            "end": {
-              "line": 13,
-              "column": 19,
-              "offset": 111
-            }
-          }
+          "value": "bravo"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "charlie",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 20,
-              "offset": 112
-            },
-            "end": {
-              "line": 13,
-              "column": 27,
-              "offset": 119
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "delta",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "\"echo\"",
-            "position": {
-              "start": {
-                "line": 13,
-                "column": 34,
-                "offset": 126
-              },
-              "end": {
-                "line": 13,
-                "column": 42,
-                "offset": 134
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  }
+                },
+                "value": "echo",
+                "raw": "\"echo\""
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 28,
-              "offset": 120
-            },
-            "end": {
-              "line": 13,
-              "column": 42,
-              "offset": 134
-            }
           }
         },
         {
-          "type": "mdxAttributeExpression",
+          "type": "mdxJsxExpressionAttribute",
           "value": "...props",
-          "position": {
-            "start": {
-              "line": 13,
-              "column": 43,
-              "offset": 135
-            },
-            "end": {
-              "line": 13,
-              "column": 53,
-              "offset": 145
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 3,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "name": "props"
+              }
             }
           }
         }
@@ -317,8 +264,7 @@
           "line": 13,
           "column": 55,
           "offset": 147
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -338,8 +284,7 @@
               "line": 15,
               "column": 10,
               "offset": 158
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -353,12 +298,11 @@
           "line": 15,
           "column": 10,
           "offset": 158
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [],
       "children": [],
@@ -372,30 +316,17 @@
           "line": 17,
           "column": 12,
           "offset": 171
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "prop",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 19,
-              "column": 6,
-              "offset": 178
-            },
-            "end": {
-              "line": 19,
-              "column": 10,
-              "offset": 182
-            }
-          }
+          "value": null
         }
       ],
       "children": [],
@@ -409,47 +340,22 @@
           "line": 19,
           "column": 17,
           "offset": 189
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 21,
-              "column": 6,
-              "offset": 196
-            },
-            "end": {
-              "line": 21,
-              "column": 11,
-              "offset": 201
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "bravo",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 21,
-              "column": 12,
-              "offset": 202
-            },
-            "end": {
-              "line": 21,
-              "column": 17,
-              "offset": 207
-            }
-          }
+          "value": null
         }
       ],
       "children": [],
@@ -463,93 +369,84 @@
           "line": 21,
           "column": 24,
           "offset": 214
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": "bravo",
-          "position": {
-            "start": {
-              "line": 23,
-              "column": 6,
-              "offset": 221
-            },
-            "end": {
-              "line": 23,
-              "column": 19,
-              "offset": 234
-            }
-          }
+          "value": "bravo"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "charlie",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 23,
-              "column": 20,
-              "offset": 235
-            },
-            "end": {
-              "line": 23,
-              "column": 27,
-              "offset": 242
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "delta",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "\"echo\"",
-            "position": {
-              "start": {
-                "line": 23,
-                "column": 34,
-                "offset": 249
-              },
-              "end": {
-                "line": 23,
-                "column": 42,
-                "offset": 257
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  }
+                },
+                "value": "echo",
+                "raw": "\"echo\""
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 23,
-              "column": 28,
-              "offset": 243
-            },
-            "end": {
-              "line": 23,
-              "column": 42,
-              "offset": 257
-            }
           }
         },
         {
-          "type": "mdxAttributeExpression",
+          "type": "mdxJsxExpressionAttribute",
           "value": "...props",
-          "position": {
-            "start": {
-              "line": 23,
-              "column": 43,
-              "offset": 258
-            },
-            "end": {
-              "line": 23,
-              "column": 53,
-              "offset": 268
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 3,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "name": "props"
+              }
             }
           }
         }
@@ -565,8 +462,7 @@
           "line": 23,
           "column": 60,
           "offset": 275
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -586,8 +482,7 @@
               "line": 25,
               "column": 10,
               "offset": 286
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -601,17 +496,16 @@
           "line": 25,
           "column": 10,
           "offset": 286
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "Tag",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "Tag",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -626,23 +520,21 @@
                   "line": 27,
                   "column": 16,
                   "offset": 303
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 27,
-              "column": 6,
-              "offset": 293
+              "column": 1,
+              "offset": 288
             },
             "end": {
               "line": 27,
-              "column": 16,
-              "offset": 303
-            },
-            "indent": []
+              "column": 22,
+              "offset": 309
+            }
           }
         }
       ],
@@ -656,35 +548,22 @@
           "line": 27,
           "column": 22,
           "offset": 309
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "Tag",
-      "attributes": [
-        {
-          "type": "mdxAttribute",
-          "name": "prop",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 29,
-              "column": 6,
-              "offset": 316
-            },
-            "end": {
-              "line": 29,
-              "column": 10,
-              "offset": 320
-            }
-          }
-        }
-      ],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "Tag",
+          "attributes": [
+            {
+              "type": "mdxJsxAttribute",
+              "name": "prop",
+              "value": null
+            }
+          ],
           "children": [
             {
               "type": "text",
@@ -699,23 +578,21 @@
                   "line": 29,
                   "column": 21,
                   "offset": 331
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 29,
-              "column": 11,
-              "offset": 321
+              "column": 1,
+              "offset": 311
             },
             "end": {
               "line": 29,
-              "column": 21,
-              "offset": 331
-            },
-            "indent": []
+              "column": 27,
+              "offset": 337
+            }
           }
         }
       ],
@@ -729,52 +606,27 @@
           "line": 29,
           "column": 27,
           "offset": 337
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "Tag",
-      "attributes": [
-        {
-          "type": "mdxAttribute",
-          "name": "alpha",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 31,
-              "column": 6,
-              "offset": 344
-            },
-            "end": {
-              "line": 31,
-              "column": 11,
-              "offset": 349
-            }
-          }
-        },
+      "type": "paragraph",
+      "children": [
         {
-          "type": "mdxAttribute",
-          "name": "bravo",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 31,
-              "column": 12,
-              "offset": 350
+          "type": "mdxJsxTextElement",
+          "name": "Tag",
+          "attributes": [
+            {
+              "type": "mdxJsxAttribute",
+              "name": "alpha",
+              "value": null
             },
-            "end": {
-              "line": 31,
-              "column": 17,
-              "offset": 355
+            {
+              "type": "mdxJsxAttribute",
+              "name": "bravo",
+              "value": null
             }
-          }
-        }
-      ],
-      "children": [
-        {
-          "type": "paragraph",
+          ],
           "children": [
             {
               "type": "text",
@@ -789,23 +641,21 @@
                   "line": 31,
                   "column": 28,
                   "offset": 366
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 31,
-              "column": 18,
-              "offset": 356
+              "column": 1,
+              "offset": 339
             },
             "end": {
               "line": 31,
-              "column": 28,
-              "offset": 366
-            },
-            "indent": []
+              "column": 34,
+              "offset": 372
+            }
           }
         }
       ],
@@ -819,100 +669,91 @@
           "line": 31,
           "column": 34,
           "offset": 372
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "Tag",
-      "attributes": [
+      "type": "paragraph",
+      "children": [
         {
-          "type": "mdxAttribute",
-          "name": "alpha",
-          "value": "bravo",
-          "position": {
-            "start": {
-              "line": 33,
-              "column": 6,
-              "offset": 379
+          "type": "mdxJsxTextElement",
+          "name": "Tag",
+          "attributes": [
+            {
+              "type": "mdxJsxAttribute",
+              "name": "alpha",
+              "value": "bravo"
             },
-            "end": {
-              "line": 33,
-              "column": 19,
-              "offset": 392
-            }
-          }
-        },
-        {
-          "type": "mdxAttribute",
-          "name": "charlie",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 33,
-              "column": 20,
-              "offset": 393
+            {
+              "type": "mdxJsxAttribute",
+              "name": "charlie",
+              "value": null
             },
-            "end": {
-              "line": 33,
-              "column": 27,
-              "offset": 400
-            }
-          }
-        },
-        {
-          "type": "mdxAttribute",
-          "name": "delta",
-          "value": {
-            "type": "mdxValueExpression",
-            "value": "\"echo\"",
-            "position": {
-              "start": {
-                "line": 33,
-                "column": 34,
-                "offset": 407
-              },
-              "end": {
-                "line": 33,
-                "column": 42,
-                "offset": 415
+            {
+              "type": "mdxJsxAttribute",
+              "name": "delta",
+              "value": {
+                "type": "mdxJsxAttributeValueExpression",
+                "value": "\"echo\"",
+                "data": {
+                  "estree": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "value": "echo",
+                    "raw": "\"echo\""
+                  }
+                }
               }
-            }
-          },
-          "position": {
-            "start": {
-              "line": 33,
-              "column": 28,
-              "offset": 401
-            },
-            "end": {
-              "line": 33,
-              "column": 42,
-              "offset": 415
-            }
-          }
-        },
-        {
-          "type": "mdxAttributeExpression",
-          "value": "...props",
-          "position": {
-            "start": {
-              "line": 33,
-              "column": 43,
-              "offset": 416
             },
-            "end": {
-              "line": 33,
-              "column": 53,
-              "offset": 426
+            {
+              "type": "mdxJsxExpressionAttribute",
+              "value": "...props",
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
+                }
+              }
             }
-          }
-        }
-      ],
-      "children": [
-        {
-          "type": "paragraph",
+          ],
           "children": [
             {
               "type": "text",
@@ -927,23 +768,21 @@
                   "line": 33,
                   "column": 64,
                   "offset": 437
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 33,
-              "column": 54,
-              "offset": 427
+              "column": 1,
+              "offset": 374
             },
             "end": {
               "line": 33,
-              "column": 64,
-              "offset": 437
-            },
-            "indent": []
+              "column": 70,
+              "offset": 443
+            }
           }
         }
       ],
@@ -957,8 +796,7 @@
           "line": 33,
           "column": 70,
           "offset": 443
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -978,8 +816,7 @@
               "line": 35,
               "column": 13,
               "offset": 457
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -993,12 +830,11 @@
           "line": 35,
           "column": 13,
           "offset": 457
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [],
       "children": [
@@ -1010,31 +846,29 @@
               "value": "Paragraph.",
               "position": {
                 "start": {
-                  "line": 37,
-                  "column": 6,
-                  "offset": 464
+                  "line": 38,
+                  "column": 1,
+                  "offset": 465
                 },
                 "end": {
-                  "line": 37,
-                  "column": 16,
-                  "offset": 474
-                },
-                "indent": []
+                  "line": 38,
+                  "column": 11,
+                  "offset": 475
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 37,
-              "column": 6,
-              "offset": 464
+              "line": 38,
+              "column": 1,
+              "offset": 465
             },
             "end": {
-              "line": 37,
-              "column": 16,
-              "offset": 474
-            },
-            "indent": []
+              "line": 38,
+              "column": 11,
+              "offset": 475
+            }
           }
         },
         {
@@ -1048,46 +882,43 @@
                   "value": "Block quote",
                   "position": {
                     "start": {
-                      "line": 39,
+                      "line": 40,
                       "column": 3,
-                      "offset": 478
+                      "offset": 479
                     },
                     "end": {
-                      "line": 39,
+                      "line": 40,
                       "column": 14,
-                      "offset": 489
-                    },
-                    "indent": []
+                      "offset": 490
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 39,
+                  "line": 40,
                   "column": 3,
-                  "offset": 478
+                  "offset": 479
                 },
                 "end": {
-                  "line": 39,
+                  "line": 40,
                   "column": 14,
-                  "offset": 489
-                },
-                "indent": []
+                  "offset": 490
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 39,
+              "line": 40,
               "column": 1,
-              "offset": 476
+              "offset": 477
             },
             "end": {
-              "line": 39,
+              "line": 40,
               "column": 14,
-              "offset": 489
-            },
-            "indent": []
+              "offset": 490
+            }
           }
         }
       ],
@@ -1098,36 +929,20 @@
           "offset": 459
         },
         "end": {
-          "line": 39,
-          "column": 22,
+          "line": 41,
+          "column": 7,
           "offset": 497
-        },
-        "indent": [
-          1,
-          3
-        ]
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "prop",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 41,
-              "column": 6,
-              "offset": 502
-            },
-            "end": {
-              "line": 41,
-              "column": 10,
-              "offset": 506
-            }
-          }
+          "value": null
         }
       ],
       "children": [
@@ -1139,31 +954,29 @@
               "value": "Paragraph.",
               "position": {
                 "start": {
-                  "line": 41,
-                  "column": 11,
-                  "offset": 507
+                  "line": 44,
+                  "column": 1,
+                  "offset": 510
                 },
                 "end": {
-                  "line": 41,
-                  "column": 21,
-                  "offset": 517
-                },
-                "indent": []
+                  "line": 44,
+                  "column": 11,
+                  "offset": 520
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 41,
-              "column": 11,
-              "offset": 507
+              "line": 44,
+              "column": 1,
+              "offset": 510
             },
             "end": {
-              "line": 41,
-              "column": 21,
-              "offset": 517
-            },
-            "indent": []
+              "line": 44,
+              "column": 11,
+              "offset": 520
+            }
           }
         },
         {
@@ -1177,103 +990,72 @@
                   "value": "Block quote",
                   "position": {
                     "start": {
-                      "line": 43,
+                      "line": 46,
                       "column": 3,
-                      "offset": 521
+                      "offset": 524
                     },
                     "end": {
-                      "line": 43,
+                      "line": 46,
                       "column": 14,
-                      "offset": 532
-                    },
-                    "indent": []
+                      "offset": 535
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 43,
+                  "line": 46,
                   "column": 3,
-                  "offset": 521
+                  "offset": 524
                 },
                 "end": {
-                  "line": 43,
+                  "line": 46,
                   "column": 14,
-                  "offset": 532
-                },
-                "indent": []
+                  "offset": 535
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 43,
+              "line": 46,
               "column": 1,
-              "offset": 519
+              "offset": 522
             },
             "end": {
-              "line": 43,
+              "line": 46,
               "column": 14,
-              "offset": 532
-            },
-            "indent": []
+              "offset": 535
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 41,
+          "line": 43,
           "column": 1,
-          "offset": 497
+          "offset": 499
         },
         "end": {
-          "line": 43,
-          "column": 22,
-          "offset": 540
-        },
-        "indent": [
-          1,
-          3
-        ]
+          "line": 47,
+          "column": 7,
+          "offset": 542
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 45,
-              "column": 6,
-              "offset": 545
-            },
-            "end": {
-              "line": 45,
-              "column": 11,
-              "offset": 550
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "bravo",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 45,
-              "column": 12,
-              "offset": 551
-            },
-            "end": {
-              "line": 45,
-              "column": 17,
-              "offset": 556
-            }
-          }
+          "value": null
         }
       ],
       "children": [
@@ -1285,31 +1067,29 @@
               "value": "Paragraph.",
               "position": {
                 "start": {
-                  "line": 45,
-                  "column": 18,
-                  "offset": 557
+                  "line": 50,
+                  "column": 1,
+                  "offset": 562
                 },
                 "end": {
-                  "line": 45,
-                  "column": 28,
-                  "offset": 567
-                },
-                "indent": []
+                  "line": 50,
+                  "column": 11,
+                  "offset": 572
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 45,
-              "column": 18,
-              "offset": 557
+              "line": 50,
+              "column": 1,
+              "offset": 562
             },
             "end": {
-              "line": 45,
-              "column": 28,
-              "offset": 567
-            },
-            "indent": []
+              "line": 50,
+              "column": 11,
+              "offset": 572
+            }
           }
         },
         {
@@ -1323,149 +1103,134 @@
                   "value": "Block quote",
                   "position": {
                     "start": {
-                      "line": 47,
+                      "line": 52,
                       "column": 3,
-                      "offset": 571
+                      "offset": 576
                     },
                     "end": {
-                      "line": 47,
+                      "line": 52,
                       "column": 14,
-                      "offset": 582
-                    },
-                    "indent": []
+                      "offset": 587
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 47,
+                  "line": 52,
                   "column": 3,
-                  "offset": 571
+                  "offset": 576
                 },
                 "end": {
-                  "line": 47,
+                  "line": 52,
                   "column": 14,
-                  "offset": 582
-                },
-                "indent": []
+                  "offset": 587
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 47,
+              "line": 52,
               "column": 1,
-              "offset": 569
+              "offset": 574
             },
             "end": {
-              "line": 47,
+              "line": 52,
               "column": 14,
-              "offset": 582
-            },
-            "indent": []
+              "offset": 587
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 45,
+          "line": 49,
           "column": 1,
-          "offset": 540
+          "offset": 544
         },
         "end": {
-          "line": 47,
-          "column": 22,
-          "offset": 590
-        },
-        "indent": [
-          1,
-          3
-        ]
+          "line": 53,
+          "column": 7,
+          "offset": 594
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Tag",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "alpha",
-          "value": "bravo",
-          "position": {
-            "start": {
-              "line": 49,
-              "column": 6,
-              "offset": 595
-            },
-            "end": {
-              "line": 49,
-              "column": 19,
-              "offset": 608
-            }
-          }
+          "value": "bravo"
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "charlie",
-          "value": null,
-          "position": {
-            "start": {
-              "line": 49,
-              "column": 20,
-              "offset": 609
-            },
-            "end": {
-              "line": 49,
-              "column": 27,
-              "offset": 616
-            }
-          }
+          "value": null
         },
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "delta",
           "value": {
-            "type": "mdxValueExpression",
+            "type": "mdxJsxAttributeValueExpression",
             "value": "\"echo\"",
-            "position": {
-              "start": {
-                "line": 49,
-                "column": 34,
-                "offset": 623
-              },
-              "end": {
-                "line": 49,
-                "column": 42,
-                "offset": 631
+            "data": {
+              "estree": {
+                "type": "Literal",
+                "start": 0,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  }
+                },
+                "value": "echo",
+                "raw": "\"echo\""
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 49,
-              "column": 28,
-              "offset": 617
-            },
-            "end": {
-              "line": 49,
-              "column": 42,
-              "offset": 631
-            }
           }
         },
         {
-          "type": "mdxAttributeExpression",
+          "type": "mdxJsxExpressionAttribute",
           "value": "...props",
-          "position": {
-            "start": {
-              "line": 49,
-              "column": 43,
-              "offset": 632
-            },
-            "end": {
-              "line": 49,
-              "column": 53,
-              "offset": 642
+          "data": {
+            "estree": {
+              "type": "SpreadElement",
+              "start": 3,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "name": "props"
+              }
             }
           }
         }
@@ -1479,31 +1244,29 @@
               "value": "Paragraph.",
               "position": {
                 "start": {
-                  "line": 49,
-                  "column": 54,
-                  "offset": 643
+                  "line": 56,
+                  "column": 1,
+                  "offset": 650
                 },
                 "end": {
-                  "line": 49,
-                  "column": 64,
-                  "offset": 653
-                },
-                "indent": []
+                  "line": 56,
+                  "column": 11,
+                  "offset": 660
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 49,
-              "column": 54,
-              "offset": 643
+              "line": 56,
+              "column": 1,
+              "offset": 650
             },
             "end": {
-              "line": 49,
-              "column": 64,
-              "offset": 653
-            },
-            "indent": []
+              "line": 56,
+              "column": 11,
+              "offset": 660
+            }
           }
         },
         {
@@ -1517,64 +1280,57 @@
                   "value": "Block quote",
                   "position": {
                     "start": {
-                      "line": 51,
+                      "line": 58,
                       "column": 3,
-                      "offset": 657
+                      "offset": 664
                     },
                     "end": {
-                      "line": 51,
+                      "line": 58,
                       "column": 14,
-                      "offset": 668
-                    },
-                    "indent": []
+                      "offset": 675
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 51,
+                  "line": 58,
                   "column": 3,
-                  "offset": 657
+                  "offset": 664
                 },
                 "end": {
-                  "line": 51,
+                  "line": 58,
                   "column": 14,
-                  "offset": 668
-                },
-                "indent": []
+                  "offset": 675
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 51,
+              "line": 58,
               "column": 1,
-              "offset": 655
+              "offset": 662
             },
             "end": {
-              "line": 51,
+              "line": 58,
               "column": 14,
-              "offset": 668
-            },
-            "indent": []
+              "offset": 675
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 49,
+          "line": 55,
           "column": 1,
-          "offset": 590
+          "offset": 596
         },
         "end": {
-          "line": 51,
-          "column": 22,
-          "offset": 676
-        },
-        "indent": [
-          1,
-          3
-        ]
+          "line": 59,
+          "column": 7,
+          "offset": 682
+        }
       }
     },
     {
@@ -1586,31 +1342,29 @@
           "value": "Span",
           "position": {
             "start": {
-              "line": 53,
+              "line": 61,
               "column": 4,
-              "offset": 679
+              "offset": 687
             },
             "end": {
-              "line": 53,
+              "line": 61,
               "column": 8,
-              "offset": 683
-            },
-            "indent": []
+              "offset": 691
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 53,
+          "line": 61,
           "column": 1,
-          "offset": 676
+          "offset": 684
         },
         "end": {
-          "line": 53,
+          "line": 61,
           "column": 8,
-          "offset": 683
-        },
-        "indent": []
+          "offset": 691
+        }
       }
     },
     {
@@ -1622,53 +1376,50 @@
           "value": "Self-closing",
           "position": {
             "start": {
-              "line": 55,
+              "line": 63,
               "column": 5,
-              "offset": 689
+              "offset": 697
             },
             "end": {
-              "line": 55,
+              "line": 63,
               "column": 17,
-              "offset": 701
-            },
-            "indent": []
+              "offset": 709
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 55,
+          "line": 63,
           "column": 1,
-          "offset": 685
+          "offset": 693
         },
         "end": {
-          "line": 55,
+          "line": 63,
           "column": 17,
-          "offset": 701
-        },
-        "indent": []
+          "offset": 709
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [],
           "children": [],
           "position": {
             "start": {
-              "line": 57,
+              "line": 65,
               "column": 1,
-              "offset": 703
+              "offset": 711
             },
             "end": {
-              "line": 57,
+              "line": 65,
               "column": 7,
-              "offset": 709
-            },
-            "indent": []
+              "offset": 717
+            }
           }
         },
         {
@@ -1676,71 +1427,56 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 57,
+              "line": 65,
               "column": 7,
-              "offset": 709
+              "offset": 717
             },
             "end": {
-              "line": 57,
+              "line": 65,
               "column": 8,
-              "offset": 710
-            },
-            "indent": []
+              "offset": 718
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 57,
+          "line": 65,
           "column": 1,
-          "offset": 703
+          "offset": 711
         },
         "end": {
-          "line": 57,
+          "line": 65,
           "column": 8,
-          "offset": 710
-        },
-        "indent": []
+          "offset": 718
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "prop",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 59,
-                  "column": 6,
-                  "offset": 717
-                },
-                "end": {
-                  "line": 59,
-                  "column": 10,
-                  "offset": 721
-                }
-              }
+              "value": null
             }
           ],
           "children": [],
           "position": {
             "start": {
-              "line": 59,
+              "line": 67,
               "column": 1,
-              "offset": 712
+              "offset": 720
             },
             "end": {
-              "line": 59,
+              "line": 67,
               "column": 12,
-              "offset": 723
-            },
-            "indent": []
+              "offset": 731
+            }
           }
         },
         {
@@ -1748,88 +1484,61 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 59,
+              "line": 67,
               "column": 12,
-              "offset": 723
+              "offset": 731
             },
             "end": {
-              "line": 59,
+              "line": 67,
               "column": 13,
-              "offset": 724
-            },
-            "indent": []
+              "offset": 732
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 59,
+          "line": 67,
           "column": 1,
-          "offset": 712
+          "offset": 720
         },
         "end": {
-          "line": 59,
+          "line": 67,
           "column": 13,
-          "offset": 724
-        },
-        "indent": []
+          "offset": 732
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 61,
-                  "column": 6,
-                  "offset": 731
-                },
-                "end": {
-                  "line": 61,
-                  "column": 11,
-                  "offset": 736
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "bravo",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 61,
-                  "column": 12,
-                  "offset": 737
-                },
-                "end": {
-                  "line": 61,
-                  "column": 17,
-                  "offset": 742
-                }
-              }
+              "value": null
             }
           ],
           "children": [],
           "position": {
             "start": {
-              "line": 61,
+              "line": 69,
               "column": 1,
-              "offset": 726
+              "offset": 734
             },
             "end": {
-              "line": 61,
+              "line": 69,
               "column": 19,
-              "offset": 744
-            },
-            "indent": []
+              "offset": 752
+            }
           }
         },
         {
@@ -1837,119 +1546,109 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 61,
+              "line": 69,
               "column": 19,
-              "offset": 744
+              "offset": 752
             },
             "end": {
-              "line": 61,
+              "line": 69,
               "column": 20,
-              "offset": 745
-            },
-            "indent": []
+              "offset": 753
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 61,
+          "line": 69,
           "column": 1,
-          "offset": 726
+          "offset": 734
         },
         "end": {
-          "line": 61,
+          "line": 69,
           "column": 20,
-          "offset": 745
-        },
-        "indent": []
+          "offset": 753
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": "bravo",
-              "position": {
-                "start": {
-                  "line": 63,
-                  "column": 6,
-                  "offset": 752
-                },
-                "end": {
-                  "line": 63,
-                  "column": 19,
-                  "offset": 765
-                }
-              }
+              "value": "bravo"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "charlie",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 63,
-                  "column": 20,
-                  "offset": 766
-                },
-                "end": {
-                  "line": 63,
-                  "column": 27,
-                  "offset": 773
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "delta",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "\"echo\"",
-                "position": {
-                  "start": {
-                    "line": 63,
-                    "column": 34,
-                    "offset": 780
-                  },
-                  "end": {
-                    "line": 63,
-                    "column": 42,
-                    "offset": 788
+                "data": {
+                  "estree": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "value": "echo",
+                    "raw": "\"echo\""
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 63,
-                  "column": 28,
-                  "offset": 774
-                },
-                "end": {
-                  "line": 63,
-                  "column": 42,
-                  "offset": 788
-                }
               }
             },
             {
-              "type": "mdxAttributeExpression",
+              "type": "mdxJsxExpressionAttribute",
               "value": "...props",
-              "position": {
-                "start": {
-                  "line": 63,
-                  "column": 43,
-                  "offset": 789
-                },
-                "end": {
-                  "line": 63,
-                  "column": 53,
-                  "offset": 799
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
                 }
               }
             }
@@ -1957,16 +1656,15 @@
           "children": [],
           "position": {
             "start": {
-              "line": 63,
+              "line": 71,
               "column": 1,
-              "offset": 747
+              "offset": 755
             },
             "end": {
-              "line": 63,
+              "line": 71,
               "column": 55,
-              "offset": 801
-            },
-            "indent": []
+              "offset": 809
+            }
           }
         },
         {
@@ -1974,31 +1672,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 63,
+              "line": 71,
               "column": 55,
-              "offset": 801
+              "offset": 809
             },
             "end": {
-              "line": 63,
+              "line": 71,
               "column": 56,
-              "offset": 802
-            },
-            "indent": []
+              "offset": 810
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 63,
+          "line": 71,
           "column": 1,
-          "offset": 747
+          "offset": 755
         },
         "end": {
-          "line": 63,
+          "line": 71,
           "column": 56,
-          "offset": 802
-        },
-        "indent": []
+          "offset": 810
+        }
       }
     },
     {
@@ -2010,53 +1706,50 @@
           "value": "Empty",
           "position": {
             "start": {
-              "line": 65,
+              "line": 73,
               "column": 5,
-              "offset": 808
+              "offset": 816
             },
             "end": {
-              "line": 65,
+              "line": 73,
               "column": 10,
-              "offset": 813
-            },
-            "indent": []
+              "offset": 821
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 65,
+          "line": 73,
           "column": 1,
-          "offset": 804
+          "offset": 812
         },
         "end": {
-          "line": 65,
+          "line": 73,
           "column": 10,
-          "offset": 813
-        },
-        "indent": []
+          "offset": 821
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [],
           "children": [],
           "position": {
             "start": {
-              "line": 67,
+              "line": 75,
               "column": 1,
-              "offset": 815
+              "offset": 823
             },
             "end": {
-              "line": 67,
+              "line": 75,
               "column": 12,
-              "offset": 826
-            },
-            "indent": []
+              "offset": 834
+            }
           }
         },
         {
@@ -2064,71 +1757,56 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 67,
+              "line": 75,
               "column": 12,
-              "offset": 826
+              "offset": 834
             },
             "end": {
-              "line": 67,
+              "line": 75,
               "column": 13,
-              "offset": 827
-            },
-            "indent": []
+              "offset": 835
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 67,
+          "line": 75,
           "column": 1,
-          "offset": 815
+          "offset": 823
         },
         "end": {
-          "line": 67,
+          "line": 75,
           "column": 13,
-          "offset": 827
-        },
-        "indent": []
+          "offset": 835
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "prop",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 69,
-                  "column": 6,
-                  "offset": 834
-                },
-                "end": {
-                  "line": 69,
-                  "column": 10,
-                  "offset": 838
-                }
-              }
+              "value": null
             }
           ],
           "children": [],
           "position": {
             "start": {
-              "line": 69,
+              "line": 77,
               "column": 1,
-              "offset": 829
+              "offset": 837
             },
             "end": {
-              "line": 69,
+              "line": 77,
               "column": 17,
-              "offset": 845
-            },
-            "indent": []
+              "offset": 853
+            }
           }
         },
         {
@@ -2136,88 +1814,61 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 69,
+              "line": 77,
               "column": 17,
-              "offset": 845
+              "offset": 853
             },
             "end": {
-              "line": 69,
+              "line": 77,
               "column": 18,
-              "offset": 846
-            },
-            "indent": []
+              "offset": 854
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 69,
+          "line": 77,
           "column": 1,
-          "offset": 829
+          "offset": 837
         },
         "end": {
-          "line": 69,
+          "line": 77,
           "column": 18,
-          "offset": 846
-        },
-        "indent": []
+          "offset": 854
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 71,
-                  "column": 6,
-                  "offset": 853
-                },
-                "end": {
-                  "line": 71,
-                  "column": 11,
-                  "offset": 858
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "bravo",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 71,
-                  "column": 12,
-                  "offset": 859
-                },
-                "end": {
-                  "line": 71,
-                  "column": 17,
-                  "offset": 864
-                }
-              }
+              "value": null
             }
           ],
           "children": [],
           "position": {
             "start": {
-              "line": 71,
+              "line": 79,
               "column": 1,
-              "offset": 848
+              "offset": 856
             },
             "end": {
-              "line": 71,
+              "line": 79,
               "column": 24,
-              "offset": 871
-            },
-            "indent": []
+              "offset": 879
+            }
           }
         },
         {
@@ -2225,119 +1876,109 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 71,
+              "line": 79,
               "column": 24,
-              "offset": 871
+              "offset": 879
             },
             "end": {
-              "line": 71,
+              "line": 79,
               "column": 25,
-              "offset": 872
-            },
-            "indent": []
+              "offset": 880
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 71,
+          "line": 79,
           "column": 1,
-          "offset": 848
+          "offset": 856
         },
         "end": {
-          "line": 71,
+          "line": 79,
           "column": 25,
-          "offset": 872
-        },
-        "indent": []
+          "offset": 880
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": "bravo",
-              "position": {
-                "start": {
-                  "line": 73,
-                  "column": 6,
-                  "offset": 879
-                },
-                "end": {
-                  "line": 73,
-                  "column": 19,
-                  "offset": 892
-                }
-              }
+              "value": "bravo"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "charlie",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 73,
-                  "column": 20,
-                  "offset": 893
-                },
-                "end": {
-                  "line": 73,
-                  "column": 27,
-                  "offset": 900
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "delta",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "\"echo\"",
-                "position": {
-                  "start": {
-                    "line": 73,
-                    "column": 34,
-                    "offset": 907
-                  },
-                  "end": {
-                    "line": 73,
-                    "column": 42,
-                    "offset": 915
+                "data": {
+                  "estree": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "value": "echo",
+                    "raw": "\"echo\""
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 73,
-                  "column": 28,
-                  "offset": 901
-                },
-                "end": {
-                  "line": 73,
-                  "column": 42,
-                  "offset": 915
-                }
               }
             },
             {
-              "type": "mdxAttributeExpression",
+              "type": "mdxJsxExpressionAttribute",
               "value": "...props",
-              "position": {
-                "start": {
-                  "line": 73,
-                  "column": 43,
-                  "offset": 916
-                },
-                "end": {
-                  "line": 73,
-                  "column": 53,
-                  "offset": 926
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
                 }
               }
             }
@@ -2345,16 +1986,15 @@
           "children": [],
           "position": {
             "start": {
-              "line": 73,
+              "line": 81,
               "column": 1,
-              "offset": 874
+              "offset": 882
             },
             "end": {
-              "line": 73,
+              "line": 81,
               "column": 60,
-              "offset": 933
-            },
-            "indent": []
+              "offset": 941
+            }
           }
         },
         {
@@ -2362,31 +2002,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 73,
+              "line": 81,
               "column": 60,
-              "offset": 933
+              "offset": 941
             },
             "end": {
-              "line": 73,
+              "line": 81,
               "column": 61,
-              "offset": 934
-            },
-            "indent": []
+              "offset": 942
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 73,
+          "line": 81,
           "column": 1,
-          "offset": 874
+          "offset": 882
         },
         "end": {
-          "line": 73,
+          "line": 81,
           "column": 61,
-          "offset": 934
-        },
-        "indent": []
+          "offset": 942
+        }
       }
     },
     {
@@ -2398,38 +2036,36 @@
           "value": "Child",
           "position": {
             "start": {
-              "line": 75,
+              "line": 83,
               "column": 5,
-              "offset": 940
+              "offset": 948
             },
             "end": {
-              "line": 75,
+              "line": 83,
               "column": 10,
-              "offset": 945
-            },
-            "indent": []
+              "offset": 953
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 75,
+          "line": 83,
           "column": 1,
-          "offset": 936
+          "offset": 944
         },
         "end": {
-          "line": 75,
+          "line": 83,
           "column": 10,
-          "offset": 945
-        },
-        "indent": []
+          "offset": 953
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [],
           "children": [
@@ -2441,46 +2077,43 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 77,
+                      "line": 85,
                       "column": 7,
-                      "offset": 953
+                      "offset": 961
                     },
                     "end": {
-                      "line": 77,
+                      "line": 85,
                       "column": 15,
-                      "offset": 961
-                    },
-                    "indent": []
+                      "offset": 969
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 77,
+                  "line": 85,
                   "column": 6,
-                  "offset": 952
+                  "offset": 960
                 },
                 "end": {
-                  "line": 77,
+                  "line": 85,
                   "column": 16,
-                  "offset": 962
-                },
-                "indent": []
+                  "offset": 970
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 77,
+              "line": 85,
               "column": 1,
-              "offset": 947
+              "offset": 955
             },
             "end": {
-              "line": 77,
+              "line": 85,
               "column": 22,
-              "offset": 968
-            },
-            "indent": []
+              "offset": 976
+            }
           }
         },
         {
@@ -2488,56 +2121,42 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 77,
+              "line": 85,
               "column": 22,
-              "offset": 968
+              "offset": 976
             },
             "end": {
-              "line": 77,
+              "line": 85,
               "column": 23,
-              "offset": 969
-            },
-            "indent": []
+              "offset": 977
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 77,
+          "line": 85,
           "column": 1,
-          "offset": 947
+          "offset": 955
         },
         "end": {
-          "line": 77,
+          "line": 85,
           "column": 23,
-          "offset": 969
-        },
-        "indent": []
+          "offset": 977
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "prop",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 79,
-                  "column": 6,
-                  "offset": 976
-                },
-                "end": {
-                  "line": 79,
-                  "column": 10,
-                  "offset": 980
-                }
-              }
+              "value": null
             }
           ],
           "children": [
@@ -2549,46 +2168,43 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 79,
+                      "line": 87,
                       "column": 12,
-                      "offset": 982
+                      "offset": 990
                     },
                     "end": {
-                      "line": 79,
+                      "line": 87,
                       "column": 20,
-                      "offset": 990
-                    },
-                    "indent": []
+                      "offset": 998
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 79,
+                  "line": 87,
                   "column": 11,
-                  "offset": 981
+                  "offset": 989
                 },
                 "end": {
-                  "line": 79,
+                  "line": 87,
                   "column": 21,
-                  "offset": 991
-                },
-                "indent": []
+                  "offset": 999
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 79,
+              "line": 87,
               "column": 1,
-              "offset": 971
+              "offset": 979
             },
             "end": {
-              "line": 79,
+              "line": 87,
               "column": 27,
-              "offset": 997
-            },
-            "indent": []
+              "offset": 1005
+            }
           }
         },
         {
@@ -2596,73 +2212,47 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 79,
+              "line": 87,
               "column": 27,
-              "offset": 997
+              "offset": 1005
             },
             "end": {
-              "line": 79,
+              "line": 87,
               "column": 28,
-              "offset": 998
-            },
-            "indent": []
+              "offset": 1006
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 79,
+          "line": 87,
           "column": 1,
-          "offset": 971
+          "offset": 979
         },
         "end": {
-          "line": 79,
+          "line": 87,
           "column": 28,
-          "offset": 998
-        },
-        "indent": []
+          "offset": 1006
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 81,
-                  "column": 6,
-                  "offset": 1005
-                },
-                "end": {
-                  "line": 81,
-                  "column": 11,
-                  "offset": 1010
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "bravo",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 81,
-                  "column": 12,
-                  "offset": 1011
-                },
-                "end": {
-                  "line": 81,
-                  "column": 17,
-                  "offset": 1016
-                }
-              }
+              "value": null
             }
           ],
           "children": [
@@ -2674,46 +2264,43 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 81,
+                      "line": 89,
                       "column": 19,
-                      "offset": 1018
+                      "offset": 1026
                     },
                     "end": {
-                      "line": 81,
+                      "line": 89,
                       "column": 27,
-                      "offset": 1026
-                    },
-                    "indent": []
+                      "offset": 1034
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 81,
+                  "line": 89,
                   "column": 18,
-                  "offset": 1017
+                  "offset": 1025
                 },
                 "end": {
-                  "line": 81,
+                  "line": 89,
                   "column": 28,
-                  "offset": 1027
-                },
-                "indent": []
+                  "offset": 1035
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 81,
+              "line": 89,
               "column": 1,
-              "offset": 1000
+              "offset": 1008
             },
             "end": {
-              "line": 81,
+              "line": 89,
               "column": 34,
-              "offset": 1033
-            },
-            "indent": []
+              "offset": 1041
+            }
           }
         },
         {
@@ -2721,119 +2308,109 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 81,
+              "line": 89,
               "column": 34,
-              "offset": 1033
+              "offset": 1041
             },
             "end": {
-              "line": 81,
+              "line": 89,
               "column": 35,
-              "offset": 1034
-            },
-            "indent": []
+              "offset": 1042
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 81,
+          "line": 89,
           "column": 1,
-          "offset": 1000
+          "offset": 1008
         },
         "end": {
-          "line": 81,
+          "line": 89,
           "column": 35,
-          "offset": 1034
-        },
-        "indent": []
+          "offset": 1042
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
-              "name": "alpha",
-              "value": "bravo",
-              "position": {
-                "start": {
-                  "line": 83,
-                  "column": 6,
-                  "offset": 1041
-                },
-                "end": {
-                  "line": 83,
-                  "column": 19,
-                  "offset": 1054
-                }
-              }
+              "type": "mdxJsxAttribute",
+              "name": "alpha",
+              "value": "bravo"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "charlie",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 83,
-                  "column": 20,
-                  "offset": 1055
-                },
-                "end": {
-                  "line": 83,
-                  "column": 27,
-                  "offset": 1062
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "delta",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "\"echo\"",
-                "position": {
-                  "start": {
-                    "line": 83,
-                    "column": 34,
-                    "offset": 1069
-                  },
-                  "end": {
-                    "line": 83,
-                    "column": 42,
-                    "offset": 1077
+                "data": {
+                  "estree": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "value": "echo",
+                    "raw": "\"echo\""
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 83,
-                  "column": 28,
-                  "offset": 1063
-                },
-                "end": {
-                  "line": 83,
-                  "column": 42,
-                  "offset": 1077
-                }
               }
             },
             {
-              "type": "mdxAttributeExpression",
+              "type": "mdxJsxExpressionAttribute",
               "value": "...props",
-              "position": {
-                "start": {
-                  "line": 83,
-                  "column": 43,
-                  "offset": 1078
-                },
-                "end": {
-                  "line": 83,
-                  "column": 53,
-                  "offset": 1088
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
                 }
               }
             }
@@ -2847,46 +2424,43 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 83,
+                      "line": 91,
                       "column": 55,
-                      "offset": 1090
+                      "offset": 1098
                     },
                     "end": {
-                      "line": 83,
+                      "line": 91,
                       "column": 63,
-                      "offset": 1098
-                    },
-                    "indent": []
+                      "offset": 1106
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 83,
+                  "line": 91,
                   "column": 54,
-                  "offset": 1089
+                  "offset": 1097
                 },
                 "end": {
-                  "line": 83,
+                  "line": 91,
                   "column": 64,
-                  "offset": 1099
-                },
-                "indent": []
+                  "offset": 1107
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 83,
+              "line": 91,
               "column": 1,
-              "offset": 1036
+              "offset": 1044
             },
             "end": {
-              "line": 83,
+              "line": 91,
               "column": 70,
-              "offset": 1105
-            },
-            "indent": []
+              "offset": 1113
+            }
           }
         },
         {
@@ -2894,31 +2468,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 83,
+              "line": 91,
               "column": 70,
-              "offset": 1105
+              "offset": 1113
             },
             "end": {
-              "line": 83,
+              "line": 91,
               "column": 71,
-              "offset": 1106
-            },
-            "indent": []
+              "offset": 1114
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 83,
+          "line": 91,
           "column": 1,
-          "offset": 1036
+          "offset": 1044
         },
         "end": {
-          "line": 83,
+          "line": 91,
           "column": 71,
-          "offset": 1106
-        },
-        "indent": []
+          "offset": 1114
+        }
       }
     },
     {
@@ -2930,38 +2502,36 @@
           "value": "Children",
           "position": {
             "start": {
-              "line": 85,
+              "line": 93,
               "column": 5,
-              "offset": 1112
+              "offset": 1120
             },
             "end": {
-              "line": 85,
+              "line": 93,
               "column": 13,
-              "offset": 1120
-            },
-            "indent": []
+              "offset": 1128
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 85,
+          "line": 93,
           "column": 1,
-          "offset": 1108
+          "offset": 1116
         },
         "end": {
-          "line": 85,
+          "line": 93,
           "column": 13,
-          "offset": 1120
-        },
-        "indent": []
+          "offset": 1128
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [],
           "children": [
@@ -2973,31 +2543,29 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 87,
+                      "line": 95,
                       "column": 7,
-                      "offset": 1128
+                      "offset": 1136
                     },
                     "end": {
-                      "line": 87,
+                      "line": 95,
                       "column": 15,
-                      "offset": 1136
-                    },
-                    "indent": []
+                      "offset": 1144
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 87,
+                  "line": 95,
                   "column": 6,
-                  "offset": 1127
+                  "offset": 1135
                 },
                 "end": {
-                  "line": 87,
+                  "line": 95,
                   "column": 16,
-                  "offset": 1137
-                },
-                "indent": []
+                  "offset": 1145
+                }
               }
             },
             {
@@ -3005,16 +2573,15 @@
               "value": " and ",
               "position": {
                 "start": {
-                  "line": 87,
+                  "line": 95,
                   "column": 16,
-                  "offset": 1137
+                  "offset": 1145
                 },
                 "end": {
-                  "line": 87,
+                  "line": 95,
                   "column": 21,
-                  "offset": 1142
-                },
-                "indent": []
+                  "offset": 1150
+                }
               }
             },
             {
@@ -3025,46 +2592,43 @@
                   "value": "importance",
                   "position": {
                     "start": {
-                      "line": 87,
+                      "line": 95,
                       "column": 23,
-                      "offset": 1144
+                      "offset": 1152
                     },
                     "end": {
-                      "line": 87,
+                      "line": 95,
                       "column": 33,
-                      "offset": 1154
-                    },
-                    "indent": []
+                      "offset": 1162
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 87,
+                  "line": 95,
                   "column": 21,
-                  "offset": 1142
+                  "offset": 1150
                 },
                 "end": {
-                  "line": 87,
+                  "line": 95,
                   "column": 35,
-                  "offset": 1156
-                },
-                "indent": []
+                  "offset": 1164
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 87,
+              "line": 95,
               "column": 1,
-              "offset": 1122
+              "offset": 1130
             },
             "end": {
-              "line": 87,
+              "line": 95,
               "column": 41,
-              "offset": 1162
-            },
-            "indent": []
+              "offset": 1170
+            }
           }
         },
         {
@@ -3072,56 +2636,42 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 87,
+              "line": 95,
               "column": 41,
-              "offset": 1162
+              "offset": 1170
             },
             "end": {
-              "line": 87,
+              "line": 95,
               "column": 42,
-              "offset": 1163
-            },
-            "indent": []
+              "offset": 1171
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 87,
+          "line": 95,
           "column": 1,
-          "offset": 1122
+          "offset": 1130
         },
         "end": {
-          "line": 87,
+          "line": 95,
           "column": 42,
-          "offset": 1163
-        },
-        "indent": []
+          "offset": 1171
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "prop",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 89,
-                  "column": 6,
-                  "offset": 1170
-                },
-                "end": {
-                  "line": 89,
-                  "column": 10,
-                  "offset": 1174
-                }
-              }
+              "value": null
             }
           ],
           "children": [
@@ -3133,31 +2683,29 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 89,
+                      "line": 97,
                       "column": 12,
-                      "offset": 1176
+                      "offset": 1184
                     },
                     "end": {
-                      "line": 89,
+                      "line": 97,
                       "column": 20,
-                      "offset": 1184
-                    },
-                    "indent": []
+                      "offset": 1192
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 89,
+                  "line": 97,
                   "column": 11,
-                  "offset": 1175
+                  "offset": 1183
                 },
                 "end": {
-                  "line": 89,
+                  "line": 97,
                   "column": 21,
-                  "offset": 1185
-                },
-                "indent": []
+                  "offset": 1193
+                }
               }
             },
             {
@@ -3165,16 +2713,15 @@
               "value": " and ",
               "position": {
                 "start": {
-                  "line": 89,
+                  "line": 97,
                   "column": 21,
-                  "offset": 1185
+                  "offset": 1193
                 },
                 "end": {
-                  "line": 89,
+                  "line": 97,
                   "column": 26,
-                  "offset": 1190
-                },
-                "indent": []
+                  "offset": 1198
+                }
               }
             },
             {
@@ -3185,46 +2732,43 @@
                   "value": "importance",
                   "position": {
                     "start": {
-                      "line": 89,
+                      "line": 97,
                       "column": 28,
-                      "offset": 1192
+                      "offset": 1200
                     },
                     "end": {
-                      "line": 89,
+                      "line": 97,
                       "column": 38,
-                      "offset": 1202
-                    },
-                    "indent": []
+                      "offset": 1210
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 89,
+                  "line": 97,
                   "column": 26,
-                  "offset": 1190
+                  "offset": 1198
                 },
                 "end": {
-                  "line": 89,
+                  "line": 97,
                   "column": 40,
-                  "offset": 1204
-                },
-                "indent": []
+                  "offset": 1212
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 89,
+              "line": 97,
               "column": 1,
-              "offset": 1165
+              "offset": 1173
             },
             "end": {
-              "line": 89,
+              "line": 97,
               "column": 46,
-              "offset": 1210
-            },
-            "indent": []
+              "offset": 1218
+            }
           }
         },
         {
@@ -3232,73 +2776,47 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 89,
+              "line": 97,
               "column": 46,
-              "offset": 1210
+              "offset": 1218
             },
             "end": {
-              "line": 89,
+              "line": 97,
               "column": 47,
-              "offset": 1211
-            },
-            "indent": []
+              "offset": 1219
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 89,
+          "line": 97,
           "column": 1,
-          "offset": 1165
+          "offset": 1173
         },
         "end": {
-          "line": 89,
+          "line": 97,
           "column": 47,
-          "offset": 1211
-        },
-        "indent": []
+          "offset": 1219
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 91,
-                  "column": 6,
-                  "offset": 1218
-                },
-                "end": {
-                  "line": 91,
-                  "column": 11,
-                  "offset": 1223
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "bravo",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 91,
-                  "column": 12,
-                  "offset": 1224
-                },
-                "end": {
-                  "line": 91,
-                  "column": 17,
-                  "offset": 1229
-                }
-              }
+              "value": null
             }
           ],
           "children": [
@@ -3310,31 +2828,29 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 91,
+                      "line": 99,
                       "column": 19,
-                      "offset": 1231
+                      "offset": 1239
                     },
                     "end": {
-                      "line": 91,
+                      "line": 99,
                       "column": 27,
-                      "offset": 1239
-                    },
-                    "indent": []
+                      "offset": 1247
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 91,
+                  "line": 99,
                   "column": 18,
-                  "offset": 1230
+                  "offset": 1238
                 },
                 "end": {
-                  "line": 91,
+                  "line": 99,
                   "column": 28,
-                  "offset": 1240
-                },
-                "indent": []
+                  "offset": 1248
+                }
               }
             },
             {
@@ -3342,16 +2858,15 @@
               "value": " and ",
               "position": {
                 "start": {
-                  "line": 91,
+                  "line": 99,
                   "column": 28,
-                  "offset": 1240
+                  "offset": 1248
                 },
                 "end": {
-                  "line": 91,
+                  "line": 99,
                   "column": 33,
-                  "offset": 1245
-                },
-                "indent": []
+                  "offset": 1253
+                }
               }
             },
             {
@@ -3362,46 +2877,43 @@
                   "value": "importance",
                   "position": {
                     "start": {
-                      "line": 91,
+                      "line": 99,
                       "column": 35,
-                      "offset": 1247
+                      "offset": 1255
                     },
                     "end": {
-                      "line": 91,
+                      "line": 99,
                       "column": 45,
-                      "offset": 1257
-                    },
-                    "indent": []
+                      "offset": 1265
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 91,
+                  "line": 99,
                   "column": 33,
-                  "offset": 1245
+                  "offset": 1253
                 },
                 "end": {
-                  "line": 91,
+                  "line": 99,
                   "column": 47,
-                  "offset": 1259
-                },
-                "indent": []
+                  "offset": 1267
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 91,
+              "line": 99,
               "column": 1,
-              "offset": 1213
+              "offset": 1221
             },
             "end": {
-              "line": 91,
+              "line": 99,
               "column": 53,
-              "offset": 1265
-            },
-            "indent": []
+              "offset": 1273
+            }
           }
         },
         {
@@ -3409,119 +2921,109 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 91,
+              "line": 99,
               "column": 53,
-              "offset": 1265
+              "offset": 1273
             },
             "end": {
-              "line": 91,
+              "line": 99,
               "column": 54,
-              "offset": 1266
-            },
-            "indent": []
+              "offset": 1274
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 91,
+          "line": 99,
           "column": 1,
-          "offset": 1213
+          "offset": 1221
         },
         "end": {
-          "line": 91,
+          "line": 99,
           "column": 54,
-          "offset": 1266
-        },
-        "indent": []
+          "offset": 1274
+        }
       }
     },
     {
       "type": "paragraph",
       "children": [
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "tag",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "alpha",
-              "value": "bravo",
-              "position": {
-                "start": {
-                  "line": 93,
-                  "column": 6,
-                  "offset": 1273
-                },
-                "end": {
-                  "line": 93,
-                  "column": 19,
-                  "offset": 1286
-                }
-              }
+              "value": "bravo"
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "charlie",
-              "value": null,
-              "position": {
-                "start": {
-                  "line": 93,
-                  "column": 20,
-                  "offset": 1287
-                },
-                "end": {
-                  "line": 93,
-                  "column": 27,
-                  "offset": 1294
-                }
-              }
+              "value": null
             },
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "delta",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "\"echo\"",
-                "position": {
-                  "start": {
-                    "line": 93,
-                    "column": 34,
-                    "offset": 1301
-                  },
-                  "end": {
-                    "line": 93,
-                    "column": 42,
-                    "offset": 1309
+                "data": {
+                  "estree": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 6,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 6
+                      }
+                    },
+                    "value": "echo",
+                    "raw": "\"echo\""
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 93,
-                  "column": 28,
-                  "offset": 1295
-                },
-                "end": {
-                  "line": 93,
-                  "column": 42,
-                  "offset": 1309
-                }
               }
             },
             {
-              "type": "mdxAttributeExpression",
+              "type": "mdxJsxExpressionAttribute",
               "value": "...props",
-              "position": {
-                "start": {
-                  "line": 93,
-                  "column": 43,
-                  "offset": 1310
-                },
-                "end": {
-                  "line": 93,
-                  "column": 53,
-                  "offset": 1320
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
                 }
               }
             }
@@ -3535,31 +3037,29 @@
                   "value": "Emphasis",
                   "position": {
                     "start": {
-                      "line": 93,
+                      "line": 101,
                       "column": 55,
-                      "offset": 1322
+                      "offset": 1330
                     },
                     "end": {
-                      "line": 93,
+                      "line": 101,
                       "column": 63,
-                      "offset": 1330
-                    },
-                    "indent": []
+                      "offset": 1338
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 93,
+                  "line": 101,
                   "column": 54,
-                  "offset": 1321
+                  "offset": 1329
                 },
                 "end": {
-                  "line": 93,
+                  "line": 101,
                   "column": 64,
-                  "offset": 1331
-                },
-                "indent": []
+                  "offset": 1339
+                }
               }
             },
             {
@@ -3567,16 +3067,15 @@
               "value": " and ",
               "position": {
                 "start": {
-                  "line": 93,
+                  "line": 101,
                   "column": 64,
-                  "offset": 1331
+                  "offset": 1339
                 },
                 "end": {
-                  "line": 93,
+                  "line": 101,
                   "column": 69,
-                  "offset": 1336
-                },
-                "indent": []
+                  "offset": 1344
+                }
               }
             },
             {
@@ -3587,46 +3086,43 @@
                   "value": "importance",
                   "position": {
                     "start": {
-                      "line": 93,
+                      "line": 101,
                       "column": 71,
-                      "offset": 1338
+                      "offset": 1346
                     },
                     "end": {
-                      "line": 93,
+                      "line": 101,
                       "column": 81,
-                      "offset": 1348
-                    },
-                    "indent": []
+                      "offset": 1356
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
-                  "line": 93,
+                  "line": 101,
                   "column": 69,
-                  "offset": 1336
+                  "offset": 1344
                 },
                 "end": {
-                  "line": 93,
+                  "line": 101,
                   "column": 83,
-                  "offset": 1350
-                },
-                "indent": []
+                  "offset": 1358
+                }
               }
             }
           ],
           "position": {
             "start": {
-              "line": 93,
+              "line": 101,
               "column": 1,
-              "offset": 1268
+              "offset": 1276
             },
             "end": {
-              "line": 93,
+              "line": 101,
               "column": 89,
-              "offset": 1356
-            },
-            "indent": []
+              "offset": 1364
+            }
           }
         },
         {
@@ -3634,31 +3130,29 @@
           "value": ".",
           "position": {
             "start": {
-              "line": 93,
+              "line": 101,
               "column": 89,
-              "offset": 1356
+              "offset": 1364
             },
             "end": {
-              "line": 93,
+              "line": 101,
               "column": 90,
-              "offset": 1357
-            },
-            "indent": []
+              "offset": 1365
+            }
           }
         }
       ],
       "position": {
         "start": {
-          "line": 93,
+          "line": 101,
           "column": 1,
-          "offset": 1268
+          "offset": 1276
         },
         "end": {
-          "line": 93,
+          "line": 101,
           "column": 90,
-          "offset": 1357
-        },
-        "indent": []
+          "offset": 1365
+        }
       }
     }
   ],
@@ -3669,9 +3163,9 @@
       "offset": 0
     },
     "end": {
-      "line": 94,
+      "line": 102,
       "column": 1,
-      "offset": 1358
+      "offset": 1366
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/format-attributes.md b/packages/remark-mdx/test/fixtures/format-attributes.md
index 6b13c3018..5189949b5 100644
--- a/packages/remark-mdx/test/fixtures/format-attributes.md
+++ b/packages/remark-mdx/test/fixtures/format-attributes.md
@@ -34,21 +34,29 @@
 
 ### Children
 
-<Tag>Paragraph.
+<Tag>
+Paragraph.
 
-> Block quote</Tag>
+> Block quote
+</Tag>
 
-<Tag prop>Paragraph.
+<Tag prop>
+Paragraph.
 
-> Block quote</Tag>
+> Block quote
+</Tag>
 
-<Tag alpha bravo>Paragraph.
+<Tag alpha bravo>
+Paragraph.
 
-> Block quote</Tag>
+> Block quote
+</Tag>
 
-<Tag alpha="bravo" charlie delta={"echo"} {...props}>Paragraph.
+<Tag alpha="bravo" charlie delta={"echo"} {...props}>
+Paragraph.
 
-> Block quote</Tag>
+> Block quote
+</Tag>
 
 ## Span
 
diff --git a/packages/remark-mdx/test/fixtures/format-attributes.out b/packages/remark-mdx/test/fixtures/format-attributes.out
index fcb32eb2c..189d05698 100644
--- a/packages/remark-mdx/test/fixtures/format-attributes.out
+++ b/packages/remark-mdx/test/fixtures/format-attributes.out
@@ -40,29 +40,13 @@
 
 ### Child
 
-<Tag>
-  Paragraph.
-</Tag>
+<Tag>Paragraph.</Tag>
 
-<Tag prop>
-  Paragraph.
-</Tag>
+<Tag prop>Paragraph.</Tag>
 
-<Tag
-  alpha
-  bravo
->
-  Paragraph.
-</Tag>
+<Tag alpha bravo>Paragraph.</Tag>
 
-<Tag
-  alpha="bravo"
-  charlie
-  delta={"echo"}
-  {...props}
->
-  Paragraph.
-</Tag>
+<Tag alpha="bravo" charlie delta={"echo"} {...props}>Paragraph.</Tag>
 
 ### Children
 
@@ -122,20 +106,20 @@
 
 ### Child
 
-<tag>_Emphasis_</tag>.
+<tag>*Emphasis*</tag>.
 
-<tag prop>_Emphasis_</tag>.
+<tag prop>*Emphasis*</tag>.
 
-<tag alpha bravo>_Emphasis_</tag>.
+<tag alpha bravo>*Emphasis*</tag>.
 
-<tag alpha="bravo" charlie delta={"echo"} {...props}>_Emphasis_</tag>.
+<tag alpha="bravo" charlie delta={"echo"} {...props}>*Emphasis*</tag>.
 
 ### Children
 
-<tag>_Emphasis_ and **importance**</tag>.
+<tag>*Emphasis* and **importance**</tag>.
 
-<tag prop>_Emphasis_ and **importance**</tag>.
+<tag prop>*Emphasis* and **importance**</tag>.
 
-<tag alpha bravo>_Emphasis_ and **importance**</tag>.
+<tag alpha bravo>*Emphasis* and **importance**</tag>.
 
-<tag alpha="bravo" charlie delta={"echo"} {...props}>_Emphasis_ and **importance**</tag>.
+<tag alpha="bravo" charlie delta={"echo"} {...props}>*Emphasis* and **importance**</tag>.
diff --git a/packages/remark-mdx/test/fixtures/interleaving.json b/packages/remark-mdx/test/fixtures/interleaving.json
index aaf980b2e..e947bd507 100644
--- a/packages/remark-mdx/test/fixtures/interleaving.json
+++ b/packages/remark-mdx/test/fixtures/interleaving.json
@@ -23,8 +23,7 @@
                   "line": 1,
                   "column": 16,
                   "offset": 15
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -38,8 +37,7 @@
               "line": 1,
               "column": 59,
               "offset": 58
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -53,8 +51,7 @@
           "line": 1,
           "column": 59,
           "offset": 58
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -73,8 +70,7 @@
               "line": 3,
               "column": 6,
               "offset": 65
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -95,8 +91,7 @@
                   "line": 3,
                   "column": 13,
                   "offset": 72
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -110,8 +105,7 @@
               "line": 3,
               "column": 72,
               "offset": 131
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -127,8 +121,7 @@
               "line": 3,
               "column": 73,
               "offset": 132
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -142,8 +135,7 @@
           "line": 3,
           "column": 73,
           "offset": 132
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -158,8 +150,7 @@
           "line": 5,
           "column": 6,
           "offset": 139
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -179,12 +170,11 @@
               "line": 7,
               "column": 10,
               "offset": 150
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "span",
           "attributes": [],
           "children": [
@@ -204,8 +194,7 @@
                       "line": 7,
                       "column": 22,
                       "offset": 162
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -219,8 +208,7 @@
                   "line": 7,
                   "column": 23,
                   "offset": 163
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -234,8 +222,7 @@
               "line": 7,
               "column": 30,
               "offset": 170
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -251,17 +238,16 @@
               "line": 7,
               "column": 37,
               "offset": 177
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.name",
               "position": {
                 "start": {
@@ -273,8 +259,58 @@
                   "line": 7,
                   "column": 51,
                   "offset": 191
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "name"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
@@ -288,8 +324,7 @@
               "line": 7,
               "column": 54,
               "offset": 194
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -305,8 +340,7 @@
               "line": 7,
               "column": 55,
               "offset": 195
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -320,12 +354,11 @@
           "line": 7,
           "column": 55,
           "offset": 195
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Note",
       "attributes": [],
       "children": [
@@ -345,8 +378,7 @@
                   "line": 11,
                   "column": 6,
                   "offset": 210
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -365,8 +397,7 @@
                       "line": 11,
                       "column": 9,
                       "offset": 213
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -380,8 +411,7 @@
                   "line": 11,
                   "column": 10,
                   "offset": 214
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -397,8 +427,7 @@
                   "line": 11,
                   "column": 11,
                   "offset": 215
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -417,8 +446,7 @@
                       "line": 11,
                       "column": 21,
                       "offset": 225
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -432,8 +460,7 @@
                   "line": 11,
                   "column": 23,
                   "offset": 227
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -449,8 +476,7 @@
                   "line": 11,
                   "column": 24,
                   "offset": 228
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -464,8 +490,7 @@
               "line": 11,
               "column": 24,
               "offset": 228
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -479,13 +504,7 @@
           "line": 13,
           "column": 8,
           "offset": 237
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -500,8 +519,7 @@
           "line": 15,
           "column": 6,
           "offset": 244
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -521,17 +539,16 @@
               "line": 17,
               "column": 15,
               "offset": 260
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.name",
               "position": {
                 "start": {
@@ -543,8 +560,58 @@
                   "line": 17,
                   "column": 29,
                   "offset": 274
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "name"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
@@ -558,8 +625,7 @@
               "line": 17,
               "column": 32,
               "offset": 277
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -573,12 +639,11 @@
           "line": 17,
           "column": 32,
           "offset": 277
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Note",
       "attributes": [],
       "children": [
@@ -598,17 +663,16 @@
                   "line": 21,
                   "column": 28,
                   "offset": 314
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": null,
               "attributes": [],
               "children": [
                 {
-                  "type": "mdxSpanExpression",
+                  "type": "mdxTextExpression",
                   "value": "props.thing",
                   "position": {
                     "start": {
@@ -620,8 +684,58 @@
                       "line": 21,
                       "column": 43,
                       "offset": 329
-                    },
-                    "indent": []
+                    }
+                  },
+                  "data": {
+                    "estree": {
+                      "type": "MemberExpression",
+                      "start": 0,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        }
+                      },
+                      "object": {
+                        "type": "Identifier",
+                        "start": 0,
+                        "end": 5,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 0
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 5
+                          }
+                        },
+                        "name": "props"
+                      },
+                      "property": {
+                        "type": "Identifier",
+                        "start": 6,
+                        "end": 11,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 11
+                          }
+                        },
+                        "name": "thing"
+                      },
+                      "computed": false,
+                      "optional": false
+                    }
                   }
                 }
               ],
@@ -635,8 +749,7 @@
                   "line": 21,
                   "column": 46,
                   "offset": 332
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -650,8 +763,7 @@
               "line": 21,
               "column": 46,
               "offset": 332
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -665,13 +777,7 @@
           "line": 23,
           "column": 8,
           "offset": 341
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -686,8 +792,7 @@
           "line": 25,
           "column": 6,
           "offset": 348
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -707,12 +812,11 @@
               "line": 27,
               "column": 10,
               "offset": 359
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -729,12 +833,11 @@
                   "line": 27,
                   "column": 17,
                   "offset": 366
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.name",
               "position": {
                 "start": {
@@ -746,8 +849,58 @@
                   "line": 27,
                   "column": 29,
                   "offset": 378
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "name"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
@@ -761,8 +914,7 @@
               "line": 27,
               "column": 32,
               "offset": 381
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -776,8 +928,7 @@
           "line": 27,
           "column": 32,
           "offset": 381
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -792,8 +943,7 @@
           "line": 29,
           "column": 6,
           "offset": 388
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -813,8 +963,7 @@
               "line": 31,
               "column": 16,
               "offset": 405
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -828,17 +977,16 @@
           "line": 31,
           "column": 16,
           "offset": 405
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "div",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockElement",
+          "type": "mdxJsxFlowElement",
           "name": "div",
           "attributes": [],
           "children": [
@@ -859,8 +1007,7 @@
                       "line": 36,
                       "column": 36,
                       "offset": 457
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -874,28 +1021,21 @@
                   "line": 36,
                   "column": 36,
                   "offset": 457
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 34,
-              "column": 1,
-              "offset": 413
+              "column": 3,
+              "offset": 415
             },
             "end": {
               "line": 38,
               "column": 9,
               "offset": 467
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -909,15 +1049,7 @@
           "line": 39,
           "column": 7,
           "offset": 474
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -936,10 +1068,7 @@
               "line": 42,
               "column": 1,
               "offset": 555
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         },
         {
@@ -955,8 +1084,7 @@
               "line": 42,
               "column": 8,
               "offset": 562
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -972,8 +1100,7 @@
               "line": 42,
               "column": 20,
               "offset": 574
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -989,8 +1116,7 @@
               "line": 42,
               "column": 28,
               "offset": 582
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1006,8 +1132,7 @@
               "line": 42,
               "column": 29,
               "offset": 583
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1021,10 +1146,7 @@
           "line": 42,
           "column": 29,
           "offset": 583
-        },
-        "indent": [
-          1
-        ]
+        }
       }
     },
     {
@@ -1039,8 +1161,7 @@
           "line": 44,
           "column": 6,
           "offset": 590
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1060,8 +1181,7 @@
               "line": 46,
               "column": 15,
               "offset": 606
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1075,35 +1195,310 @@
           "line": 46,
           "column": 15,
           "offset": 606
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "SomeComponent",
       "attributes": [],
       "children": [
         {
-          "type": "mdxBlockExpression",
-          "value": "prop => {\n  const newValue = doStuff(prop)\n\n  return <h1>{newValue}</h1>\n}",
+          "type": "mdxFlowExpression",
+          "value": "prop => {\nconst newValue = doStuff(prop)\n\nreturn <h1>{newValue}</h1>\n}",
           "position": {
             "start": {
               "line": 49,
-              "column": 1,
-              "offset": 624
+              "column": 3,
+              "offset": 626
             },
             "end": {
               "line": 53,
               "column": 5,
               "offset": 708
-            },
-            "indent": [
-              1,
-              1,
-              1,
-              1
-            ]
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "ArrowFunctionExpression",
+              "start": 0,
+              "end": 80,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 5,
+                  "column": 3
+                }
+              },
+              "id": null,
+              "expression": false,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 0,
+                  "end": 4,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 4
+                    }
+                  },
+                  "name": "prop"
+                }
+              ],
+              "body": {
+                "type": "BlockStatement",
+                "start": 8,
+                "end": 80,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 3
+                  }
+                },
+                "body": [
+                  {
+                    "type": "VariableDeclaration",
+                    "start": 14,
+                    "end": 44,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 34
+                      }
+                    },
+                    "declarations": [
+                      {
+                        "type": "VariableDeclarator",
+                        "start": 20,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 34
+                          }
+                        },
+                        "id": {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 10
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 18
+                            }
+                          },
+                          "name": "newValue"
+                        },
+                        "init": {
+                          "type": "CallExpression",
+                          "start": 31,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 34
+                            }
+                          },
+                          "callee": {
+                            "type": "Identifier",
+                            "start": 31,
+                            "end": 38,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 21
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 28
+                              }
+                            },
+                            "name": "doStuff"
+                          },
+                          "arguments": [
+                            {
+                              "type": "Identifier",
+                              "start": 39,
+                              "end": 43,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 29
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 33
+                                }
+                              },
+                              "name": "prop"
+                            }
+                          ],
+                          "optional": false
+                        }
+                      }
+                    ],
+                    "kind": "const"
+                  },
+                  {
+                    "type": "ReturnStatement",
+                    "start": 50,
+                    "end": 76,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 30
+                      }
+                    },
+                    "argument": {
+                      "type": "JSXElement",
+                      "start": 57,
+                      "end": 76,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 30
+                        }
+                      },
+                      "openingElement": {
+                        "type": "JSXOpeningElement",
+                        "start": 57,
+                        "end": 61,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 11
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 15
+                          }
+                        },
+                        "attributes": [],
+                        "name": {
+                          "type": "JSXIdentifier",
+                          "start": 58,
+                          "end": 60,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 14
+                            }
+                          },
+                          "name": "h1"
+                        },
+                        "selfClosing": false
+                      },
+                      "closingElement": {
+                        "type": "JSXClosingElement",
+                        "start": 71,
+                        "end": 76,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 25
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 30
+                          }
+                        },
+                        "name": {
+                          "type": "JSXIdentifier",
+                          "start": 73,
+                          "end": 75,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 27
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 29
+                            }
+                          },
+                          "name": "h1"
+                        }
+                      },
+                      "children": [
+                        {
+                          "type": "JSXExpressionContainer",
+                          "start": 61,
+                          "end": 71,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 15
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 25
+                            }
+                          },
+                          "expression": {
+                            "type": "Identifier",
+                            "start": 62,
+                            "end": 70,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 24
+                              }
+                            },
+                            "name": "newValue"
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
           }
         }
       ],
@@ -1117,15 +1512,7 @@
           "line": 54,
           "column": 17,
           "offset": 725
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -1140,8 +1527,7 @@
           "line": 56,
           "column": 6,
           "offset": 732
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1161,8 +1547,7 @@
               "line": 58,
               "column": 16,
               "offset": 749
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1176,44 +1561,59 @@
           "line": 58,
           "column": 16,
           "offset": 749
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "SomeComponent",
       "attributes": [
         {
-          "type": "mdxAttribute",
+          "type": "mdxJsxAttribute",
           "name": "someProp",
           "value": {
-            "type": "mdxValueExpression",
-            "value": "`\n  Here's a template string\n\n  with empty lines\n`",
-            "position": {
-              "start": {
-                "line": 61,
-                "column": 12,
-                "offset": 777
-              },
-              "end": {
-                "line": 65,
-                "column": 5,
-                "offset": 835
+            "type": "mdxJsxAttributeValueExpression",
+            "value": "`\nHere's a template string\n\nwith empty lines\n`",
+            "data": {
+              "estree": {
+                "type": "TemplateLiteral",
+                "start": 0,
+                "end": 56,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 3
+                  }
+                },
+                "expressions": [],
+                "quasis": [
+                  {
+                    "type": "TemplateElement",
+                    "start": 1,
+                    "end": 55,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 2
+                      }
+                    },
+                    "value": {
+                      "raw": "\n    Here's a template string\n\n    with empty lines\n  ",
+                      "cooked": "\n    Here's a template string\n\n    with empty lines\n  "
+                    },
+                    "tail": true
+                  }
+                ]
               }
             }
-          },
-          "position": {
-            "start": {
-              "line": 61,
-              "column": 3,
-              "offset": 768
-            },
-            "end": {
-              "line": 65,
-              "column": 5,
-              "offset": 835
-            }
           }
         }
       ],
@@ -1228,15 +1628,7 @@
           "line": 66,
           "column": 3,
           "offset": 838
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -1251,8 +1643,7 @@
           "line": 68,
           "column": 6,
           "offset": 845
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1271,8 +1662,7 @@
               "line": 70,
               "column": 6,
               "offset": 852
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1293,8 +1683,7 @@
                   "line": 70,
                   "column": 13,
                   "offset": 859
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1308,8 +1697,7 @@
               "line": 70,
               "column": 79,
               "offset": 925
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1325,8 +1713,7 @@
               "line": 70,
               "column": 80,
               "offset": 926
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1340,8 +1727,7 @@
           "line": 70,
           "column": 80,
           "offset": 926
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1361,12 +1747,11 @@
               "line": 72,
               "column": 10,
               "offset": 937
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "span",
           "attributes": [],
           "children": [
@@ -1386,8 +1771,7 @@
                       "line": 72,
                       "column": 22,
                       "offset": 949
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -1401,8 +1785,7 @@
                   "line": 72,
                   "column": 23,
                   "offset": 950
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1416,8 +1799,7 @@
               "line": 72,
               "column": 30,
               "offset": 957
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1433,8 +1815,7 @@
               "line": 72,
               "column": 31,
               "offset": 958
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1448,12 +1829,11 @@
           "line": 72,
           "column": 31,
           "offset": 958
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "Note",
       "attributes": [],
       "children": [
@@ -1473,8 +1853,7 @@
                   "line": 76,
                   "column": 6,
                   "offset": 973
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -1493,8 +1872,7 @@
                       "line": 76,
                       "column": 9,
                       "offset": 976
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -1508,8 +1886,7 @@
                   "line": 76,
                   "column": 10,
                   "offset": 977
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -1525,8 +1902,7 @@
                   "line": 76,
                   "column": 11,
                   "offset": 978
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -1545,8 +1921,7 @@
                       "line": 76,
                       "column": 21,
                       "offset": 988
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -1560,8 +1935,7 @@
                   "line": 76,
                   "column": 23,
                   "offset": 990
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -1577,8 +1951,7 @@
                   "line": 76,
                   "column": 24,
                   "offset": 991
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1592,8 +1965,7 @@
               "line": 76,
               "column": 24,
               "offset": 991
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1607,13 +1979,7 @@
           "line": 78,
           "column": 8,
           "offset": 1000
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -1628,8 +1994,7 @@
           "line": 80,
           "column": 6,
           "offset": 1007
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1648,8 +2013,7 @@
               "line": 82,
               "column": 6,
               "offset": 1014
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1670,8 +2034,7 @@
                   "line": 82,
                   "column": 13,
                   "offset": 1021
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1685,8 +2048,7 @@
               "line": 82,
               "column": 79,
               "offset": 1087
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1702,8 +2064,7 @@
               "line": 82,
               "column": 80,
               "offset": 1088
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1717,8 +2078,7 @@
           "line": 82,
           "column": 80,
           "offset": 1088
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1738,12 +2098,11 @@
               "line": 84,
               "column": 10,
               "offset": 1099
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
@@ -1760,12 +2119,11 @@
                   "line": 84,
                   "column": 17,
                   "offset": 1106
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "props.name",
               "position": {
                 "start": {
@@ -1777,8 +2135,58 @@
                   "line": 84,
                   "column": 29,
                   "offset": 1118
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "MemberExpression",
+                  "start": 0,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "name": "props"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "name"
+                  },
+                  "computed": false,
+                  "optional": false
+                }
               }
             }
           ],
@@ -1792,8 +2200,7 @@
               "line": 84,
               "column": 32,
               "offset": 1121
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1807,8 +2214,7 @@
           "line": 84,
           "column": 32,
           "offset": 1121
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1828,12 +2234,11 @@
               "line": 86,
               "column": 14,
               "offset": 1136
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanExpression",
+          "type": "mdxTextExpression",
           "value": "props.name",
           "position": {
             "start": {
@@ -1845,8 +2250,58 @@
               "line": 86,
               "column": 26,
               "offset": 1148
-            },
-            "indent": []
+            }
+          },
+          "data": {
+            "estree": {
+              "type": "MemberExpression",
+              "start": 0,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              },
+              "object": {
+                "type": "Identifier",
+                "start": 0,
+                "end": 5,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 5
+                  }
+                },
+                "name": "props"
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "name": "name"
+              },
+              "computed": false,
+              "optional": false
+            }
           }
         }
       ],
@@ -1860,8 +2315,7 @@
           "line": 86,
           "column": 26,
           "offset": 1148
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1876,8 +2330,7 @@
           "line": 88,
           "column": 6,
           "offset": 1155
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1896,8 +2349,7 @@
               "line": 90,
               "column": 6,
               "offset": 1162
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1918,8 +2370,7 @@
                   "line": 90,
                   "column": 13,
                   "offset": 1169
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1933,8 +2384,7 @@
               "line": 90,
               "column": 79,
               "offset": 1235
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1950,8 +2400,7 @@
               "line": 90,
               "column": 80,
               "offset": 1236
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1965,12 +2414,11 @@
           "line": 90,
           "column": 80,
           "offset": 1236
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "ListStyleOne",
       "attributes": [],
       "children": [
@@ -2001,8 +2449,7 @@
                           "line": 94,
                           "column": 11,
                           "offset": 1264
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -2016,8 +2463,7 @@
                       "line": 94,
                       "column": 11,
                       "offset": 1264
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -2047,12 +2493,11 @@
                                   "line": 95,
                                   "column": 36,
                                   "offset": 1300
-                                },
-                                "indent": []
+                                }
                               }
                             },
                             {
-                              "type": "mdxSpanElement",
+                              "type": "mdxJsxTextElement",
                               "name": "Red",
                               "attributes": [],
                               "children": [
@@ -2069,8 +2514,7 @@
                                       "line": 95,
                                       "column": 44,
                                       "offset": 1308
-                                    },
-                                    "indent": []
+                                    }
                                   }
                                 }
                               ],
@@ -2084,8 +2528,7 @@
                                   "line": 95,
                                   "column": 50,
                                   "offset": 1314
-                                },
-                                "indent": []
+                                }
                               }
                             },
                             {
@@ -2101,8 +2544,7 @@
                                   "line": 95,
                                   "column": 62,
                                   "offset": 1326
-                                },
-                                "indent": []
+                                }
                               }
                             }
                           ],
@@ -2116,23 +2558,21 @@
                               "line": 95,
                               "column": 62,
                               "offset": 1326
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
                       "position": {
                         "start": {
                           "line": 95,
-                          "column": 6,
-                          "offset": 1270
+                          "column": 7,
+                          "offset": 1271
                         },
                         "end": {
                           "line": 95,
                           "column": 62,
                           "offset": 1326
-                        },
-                        "indent": []
+                        }
                       }
                     },
                     {
@@ -2156,12 +2596,11 @@
                                   "line": 96,
                                   "column": 34,
                                   "offset": 1360
-                                },
-                                "indent": []
+                                }
                               }
                             },
                             {
-                              "type": "mdxSpanElement",
+                              "type": "mdxJsxTextElement",
                               "name": "Blue",
                               "attributes": [],
                               "children": [
@@ -2178,8 +2617,7 @@
                                       "line": 96,
                                       "column": 48,
                                       "offset": 1374
-                                    },
-                                    "indent": []
+                                    }
                                   }
                                 }
                               ],
@@ -2193,8 +2631,7 @@
                                   "line": 96,
                                   "column": 55,
                                   "offset": 1381
-                                },
-                                "indent": []
+                                }
                               }
                             },
                             {
@@ -2210,8 +2647,7 @@
                                   "line": 96,
                                   "column": 67,
                                   "offset": 1393
-                                },
-                                "indent": []
+                                }
                               }
                             }
                           ],
@@ -2225,76 +2661,63 @@
                               "line": 96,
                               "column": 67,
                               "offset": 1393
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
                       "position": {
                         "start": {
                           "line": 96,
-                          "column": 6,
-                          "offset": 1332
+                          "column": 7,
+                          "offset": 1333
                         },
                         "end": {
                           "line": 96,
                           "column": 67,
                           "offset": 1393
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 95,
-                      "column": 6,
-                      "offset": 1270
+                      "column": 7,
+                      "offset": 1271
                     },
                     "end": {
                       "line": 96,
                       "column": 67,
                       "offset": 1393
-                    },
-                    "indent": [
-                      6
-                    ]
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 94,
-                  "column": 1,
-                  "offset": 1254
+                  "column": 3,
+                  "offset": 1256
                 },
                 "end": {
                   "line": 96,
                   "column": 67,
                   "offset": 1393
-                },
-                "indent": [
-                  1,
-                  1
-                ]
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 94,
-              "column": 1,
-              "offset": 1254
+              "column": 3,
+              "offset": 1256
             },
             "end": {
               "line": 96,
               "column": 67,
               "offset": 1393
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -2308,15 +2731,7 @@
           "line": 98,
           "column": 16,
           "offset": 1410
-        },
-        "indent": [
-          1,
-          6,
-          10,
-          10,
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/interleaving.out b/packages/remark-mdx/test/fixtures/interleaving.out
index 2c4ad4595..ed5c3db01 100644
--- a/packages/remark-mdx/test/fixtures/interleaving.out
+++ b/packages/remark-mdx/test/fixtures/interleaving.out
@@ -2,15 +2,15 @@
 
 From [GitHub](https://github.com/mdx-js/mdx/issues/628#issue-466943193).
 
-* * *
+***
 
-# Hello, <span>_world_</span>, from <>{props.name}</>!
+# Hello, <span>*world*</span>, from <>{props.name}</>!
 
 <Note>
-  This _is_ **markdown**!
+  This *is* **markdown**!
 </Note>
 
-* * *
+***
 
 # Hello, from <>{props.name}</>
 
@@ -18,11 +18,11 @@ From [GitHub](https://github.com/mdx-js/mdx/issues/628#issue-466943193).
   Here's another expression: <>{props.thing}</>
 </Note>
 
-* * *
+***
 
 # Hello, <>from {props.name}</>
 
-* * *
+***
 
 # Hello, world!
 
@@ -35,41 +35,39 @@ From [GitHub](https://github.com/mdx-js/mdx/issues/628#issue-466943193).
 Editorial note: the above example had an opening tag instead of a closing tag:
 `<div>` instead of `</div>`.
 
-* * *
+***
 
 # Hello, world
 
 <SomeComponent>
-  {
-    prop => {
-      const newValue = doStuff(prop)
+  {prop => {
+    const newValue = doStuff(prop)
 
-      return <h1>{newValue}</h1>
-    }
-  }
+    return <h1>{newValue}</h1>
+    }}
 </SomeComponent>
 
-* * *
+***
 
 # Hello, world!
 
 <SomeComponent someProp={`
-    Here's a template string
+  Here's a template string
 
-    with empty lines
+  with empty lines
   `}/>
 
-* * *
+***
 
 From [GitHub](https://github.com/mdx-js/mdx/issues/628#issuecomment-510525094).
 
-# Hello, <span>_world_</span>!
+# Hello, <span>*world*</span>!
 
 <Note>
-  This _is_ **markdown**!
+  This *is* **markdown**!
 </Note>
 
-* * *
+***
 
 From [GitHub](https://github.com/mdx-js/mdx/issues/628#issuecomment-510579387).
 
@@ -77,12 +75,12 @@ From [GitHub](https://github.com/mdx-js/mdx/issues/628#issuecomment-510579387).
 
 # Hello from {props.name}
 
-* * *
+***
 
 From [GitHub](https://github.com/mdx-js/mdx/issues/628#issuecomment-510978023).
 
 <ListStyleOne>
-  -   Thing
-      -   Subthing and this word is <Red>Red</Red> right here.
-      -   Another subthing with a <Blue>colorful</Blue> word again.
+  *   Thing
+      *   Subthing and this word is <Red>Red</Red> right here.
+      *   Another subthing with a <Blue>colorful</Blue> word again.
 </ListStyleOne>
diff --git a/packages/remark-mdx/test/fixtures/list-indent.json b/packages/remark-mdx/test/fixtures/list-indent.json
index 06143eff2..26716b0f1 100644
--- a/packages/remark-mdx/test/fixtures/list-indent.json
+++ b/packages/remark-mdx/test/fixtures/list-indent.json
@@ -17,8 +17,7 @@
               "line": 1,
               "column": 68,
               "offset": 67
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -32,8 +31,7 @@
           "line": 1,
           "column": 68,
           "offset": 67
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -63,10 +61,7 @@
                       "line": 4,
                       "column": 40,
                       "offset": 158
-                    },
-                    "indent": [
-                      1
-                    ]
+                    }
                   }
                 }
               ],
@@ -80,27 +75,21 @@
                   "line": 4,
                   "column": 40,
                   "offset": 158
-                },
-                "indent": [
-                  1
-                ]
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 3,
-              "column": 1,
-              "offset": 69
+              "column": 5,
+              "offset": 73
             },
             "end": {
               "line": 4,
               "column": 40,
               "offset": 158
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         },
         {
@@ -124,8 +113,7 @@
                       "line": 5,
                       "column": 32,
                       "offset": 190
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -139,8 +127,7 @@
                   "line": 5,
                   "column": 32,
                   "offset": 190
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -170,8 +157,7 @@
                               "line": 6,
                               "column": 17,
                               "offset": 207
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -185,8 +171,7 @@
                           "line": 6,
                           "column": 17,
                           "offset": 207
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -200,8 +185,7 @@
                       "line": 6,
                       "column": 17,
                       "offset": 207
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -215,25 +199,21 @@
                   "line": 6,
                   "column": 17,
                   "offset": 207
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 5,
-              "column": 1,
-              "offset": 159
+              "column": 6,
+              "offset": 164
             },
             "end": {
               "line": 6,
               "column": 17,
               "offset": 207
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         },
         {
@@ -257,8 +237,7 @@
                       "line": 7,
                       "column": 15,
                       "offset": 222
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -272,8 +251,7 @@
                   "line": 7,
                   "column": 15,
                   "offset": 222
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -303,8 +281,7 @@
                               "line": 8,
                               "column": 24,
                               "offset": 246
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -318,76 +295,63 @@
                           "line": 8,
                           "column": 24,
                           "offset": 246
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 8,
-                      "column": 7,
-                      "offset": 229
+                      "column": 10,
+                      "offset": 232
                     },
                     "end": {
                       "line": 8,
                       "column": 24,
                       "offset": 246
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 8,
-                  "column": 7,
-                  "offset": 229
+                  "column": 10,
+                  "offset": 232
                 },
                 "end": {
                   "line": 8,
                   "column": 24,
                   "offset": 246
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 7,
-              "column": 1,
-              "offset": 208
+              "column": 5,
+              "offset": 212
             },
             "end": {
               "line": 8,
               "column": 24,
               "offset": 246
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
       "position": {
         "start": {
           "line": 3,
-          "column": 1,
-          "offset": 69
+          "column": 5,
+          "offset": 73
         },
         "end": {
           "line": 8,
           "column": 24,
           "offset": 246
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/list-indent.out b/packages/remark-mdx/test/fixtures/list-indent.out
index 11b2b8c8a..569495468 100644
--- a/packages/remark-mdx/test/fixtures/list-indent.out
+++ b/packages/remark-mdx/test/fixtures/list-indent.out
@@ -1,8 +1,8 @@
 As we don’t support indented code, lists can be indented some more.
 
--   You can start lists with extra indentation…
+*   You can start lists with extra indentation…
     …and continue them without indentation.
--   Part of the current list
-    -   Nested!
--   Or more:
-    -   Also nested!
+*   Part of the current list
+    *   Nested!
+*   Or more:
+    *   Also nested!
diff --git a/packages/remark-mdx/test/fixtures/markdown.json b/packages/remark-mdx/test/fixtures/markdown.json
index 948f88fc7..5de8faa82 100644
--- a/packages/remark-mdx/test/fixtures/markdown.json
+++ b/packages/remark-mdx/test/fixtures/markdown.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 18,
               "offset": 17
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 18,
           "offset": 17
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,8 +51,7 @@
               "line": 3,
               "column": 58,
               "offset": 76
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -68,8 +65,7 @@
           "line": 3,
           "column": 58,
           "offset": 76
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -89,8 +85,7 @@
               "line": 5,
               "column": 9,
               "offset": 86
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -104,8 +99,7 @@
           "line": 5,
           "column": 9,
           "offset": 86
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -125,8 +119,7 @@
               "line": 7,
               "column": 14,
               "offset": 101
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -140,17 +133,16 @@
           "line": 7,
           "column": 14,
           "offset": 101
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "X",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "paragraph",
+          "type": "mdxJsxTextElement",
+          "name": "X",
+          "attributes": [],
           "children": [
             {
               "type": "text",
@@ -165,12 +157,11 @@
                   "line": 9,
                   "column": 14,
                   "offset": 116
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "y",
               "attributes": [],
               "children": [
@@ -187,8 +178,7 @@
                       "line": 9,
                       "column": 23,
                       "offset": 125
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -202,8 +192,7 @@
                   "line": 9,
                   "column": 27,
                   "offset": 129
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -219,12 +208,11 @@
                   "line": 9,
                   "column": 29,
                   "offset": 131
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "z",
               "attributes": [],
               "children": [],
@@ -238,8 +226,7 @@
                   "line": 9,
                   "column": 33,
                   "offset": 135
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -255,12 +242,11 @@
                   "line": 9,
                   "column": 35,
                   "offset": 137
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "1 + 1",
               "position": {
                 "start": {
@@ -272,8 +258,59 @@
                   "line": 9,
                   "column": 42,
                   "offset": 144
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "BinaryExpression",
+                  "start": 0,
+                  "end": 5,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 5
+                    }
+                  },
+                  "left": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 1,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 1
+                      }
+                    },
+                    "value": 1,
+                    "raw": "1"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "Literal",
+                    "start": 4,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "value": 1,
+                    "raw": "1"
+                  }
+                }
               }
             },
             {
@@ -289,23 +326,21 @@
                   "line": 9,
                   "column": 43,
                   "offset": 145
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 9,
-              "column": 4,
-              "offset": 106
+              "column": 1,
+              "offset": 103
             },
             "end": {
               "line": 9,
-              "column": 43,
-              "offset": 145
-            },
-            "indent": []
+              "column": 47,
+              "offset": 149
+            }
           }
         }
       ],
@@ -319,8 +354,7 @@
           "line": 9,
           "column": 47,
           "offset": 149
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -340,12 +374,11 @@
               "line": 11,
               "column": 12,
               "offset": 162
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "x",
           "attributes": [],
           "children": [],
@@ -359,8 +392,7 @@
               "line": 11,
               "column": 16,
               "offset": 166
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -374,49 +406,45 @@
           "line": 11,
           "column": 16,
           "offset": 166
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "X",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "heading",
-          "depth": 6,
+          "type": "mdxJsxTextElement",
+          "name": "X",
+          "attributes": [],
           "children": [
             {
               "type": "text",
-              "value": "heading",
+              "value": "###### heading",
               "position": {
                 "start": {
                   "line": 13,
-                  "column": 11,
-                  "offset": 178
+                  "column": 4,
+                  "offset": 171
                 },
                 "end": {
                   "line": 13,
                   "column": 18,
                   "offset": 185
-                },
-                "indent": []
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 13,
-              "column": 4,
-              "offset": 171
+              "column": 1,
+              "offset": 168
             },
             "end": {
               "line": 13,
-              "column": 18,
-              "offset": 185
-            },
-            "indent": []
+              "column": 22,
+              "offset": 189
+            }
           }
         }
       ],
@@ -430,8 +458,7 @@
           "line": 13,
           "column": 22,
           "offset": 189
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -451,8 +478,7 @@
               "line": 15,
               "column": 16,
               "offset": 206
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -466,39 +492,20 @@
           "line": 15,
           "column": 16,
           "offset": 206
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
-      "name": "X",
-      "attributes": [],
+      "type": "paragraph",
       "children": [
         {
-          "type": "blockquote",
+          "type": "mdxJsxTextElement",
+          "name": "X",
+          "attributes": [],
           "children": [
             {
-              "type": "paragraph",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "a block quote!",
-                  "position": {
-                    "start": {
-                      "line": 17,
-                      "column": 4,
-                      "offset": 211
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 18,
-                      "offset": 225
-                    },
-                    "indent": []
-                  }
-                }
-              ],
+              "type": "text",
+              "value": "> a block quote!",
               "position": {
                 "start": {
                   "line": 17,
@@ -507,25 +514,23 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 18,
-                  "offset": 225
-                },
-                "indent": []
+                  "column": 20,
+                  "offset": 227
+                }
               }
             }
           ],
           "position": {
             "start": {
               "line": 17,
-              "column": 4,
-              "offset": 211
+              "column": 1,
+              "offset": 208
             },
             "end": {
               "line": 17,
-              "column": 20,
-              "offset": 227
-            },
-            "indent": []
+              "column": 24,
+              "offset": 231
+            }
           }
         }
       ],
@@ -539,8 +544,7 @@
           "line": 17,
           "column": 24,
           "offset": 231
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -550,7 +554,7 @@
           "type": "paragraph",
           "children": [
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "x",
               "attributes": [],
               "children": [
@@ -567,8 +571,7 @@
                       "line": 19,
                       "column": 7,
                       "offset": 239
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -582,8 +585,7 @@
                   "line": 19,
                   "column": 11,
                   "offset": 243
-                },
-                "indent": []
+                }
               }
             },
             {
@@ -599,8 +601,7 @@
                   "line": 19,
                   "column": 24,
                   "offset": 256
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -614,8 +615,7 @@
               "line": 19,
               "column": 24,
               "offset": 256
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -629,8 +629,7 @@
           "line": 19,
           "column": 24,
           "offset": 256
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -650,8 +649,7 @@
               "line": 21,
               "column": 9,
               "offset": 266
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -665,8 +663,7 @@
           "line": 21,
           "column": 9,
           "offset": 266
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -681,12 +678,12 @@
           "checked": null,
           "children": [
             {
-              "type": "mdxBlockElement",
-              "name": "X",
-              "attributes": [],
+              "type": "paragraph",
               "children": [
                 {
-                  "type": "paragraph",
+                  "type": "mdxJsxTextElement",
+                  "name": "X",
+                  "attributes": [],
                   "children": [
                     {
                       "type": "text",
@@ -701,12 +698,11 @@
                           "line": 23,
                           "column": 13,
                           "offset": 280
-                        },
-                        "indent": []
+                        }
                       }
                     },
                     {
-                      "type": "mdxSpanElement",
+                      "type": "mdxJsxTextElement",
                       "name": "y",
                       "attributes": [],
                       "children": [
@@ -723,8 +719,7 @@
                               "line": 23,
                               "column": 22,
                               "offset": 289
-                            },
-                            "indent": []
+                            }
                           }
                         }
                       ],
@@ -738,23 +733,21 @@
                           "line": 23,
                           "column": 26,
                           "offset": 293
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 23,
-                      "column": 8,
-                      "offset": 275
+                      "column": 5,
+                      "offset": 272
                     },
                     "end": {
                       "line": 23,
-                      "column": 26,
-                      "offset": 293
-                    },
-                    "indent": []
+                      "column": 30,
+                      "offset": 297
+                    }
                   }
                 }
               ],
@@ -768,8 +761,7 @@
                   "line": 23,
                   "column": 30,
                   "offset": 297
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -783,8 +775,7 @@
               "line": 23,
               "column": 30,
               "offset": 297
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -793,25 +784,93 @@
           "checked": null,
           "children": [
             {
-              "type": "mdxBlockElement",
-              "name": "X",
-              "attributes": [],
+              "type": "paragraph",
               "children": [
                 {
-                  "type": "mdxBlockExpression",
-                  "value": "1 + 1",
+                  "type": "mdxJsxTextElement",
+                  "name": "X",
+                  "attributes": [],
+                  "children": [
+                    {
+                      "type": "mdxTextExpression",
+                      "value": "1 + 1",
+                      "position": {
+                        "start": {
+                          "line": 24,
+                          "column": 8,
+                          "offset": 305
+                        },
+                        "end": {
+                          "line": 24,
+                          "column": 15,
+                          "offset": 312
+                        }
+                      },
+                      "data": {
+                        "estree": {
+                          "type": "BinaryExpression",
+                          "start": 0,
+                          "end": 5,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 0
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 5
+                            }
+                          },
+                          "left": {
+                            "type": "Literal",
+                            "start": 0,
+                            "end": 1,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 0
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 1
+                              }
+                            },
+                            "value": 1,
+                            "raw": "1"
+                          },
+                          "operator": "+",
+                          "right": {
+                            "type": "Literal",
+                            "start": 4,
+                            "end": 5,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 4
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 5
+                              }
+                            },
+                            "value": 1,
+                            "raw": "1"
+                          }
+                        }
+                      }
+                    }
+                  ],
                   "position": {
                     "start": {
                       "line": 24,
-                      "column": 8,
-                      "offset": 305
+                      "column": 5,
+                      "offset": 302
                     },
                     "end": {
                       "line": 24,
-                      "column": 15,
-                      "offset": 312
-                    },
-                    "indent": []
+                      "column": 19,
+                      "offset": 316
+                    }
                   }
                 }
               ],
@@ -825,8 +884,7 @@
                   "line": 24,
                   "column": 19,
                   "offset": 316
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -840,8 +898,7 @@
               "line": 24,
               "column": 19,
               "offset": 316
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -855,10 +912,7 @@
           "line": 24,
           "column": 19,
           "offset": 316
-        },
-        "indent": [
-          1
-        ]
+        }
       }
     },
     {
@@ -878,8 +932,7 @@
               "line": 26,
               "column": 10,
               "offset": 327
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -893,96 +946,20 @@
           "line": 26,
           "column": 10,
           "offset": 327
-        },
-        "indent": []
+        }
       }
     },
     {
-      "type": "mdxBlockElement",
+      "type": "mdxJsxFlowElement",
       "name": "X",
       "attributes": [],
       "children": [
         {
-          "type": "table",
-          "align": [
-            null,
-            null
-          ],
+          "type": "paragraph",
           "children": [
             {
-              "type": "tableRow",
-              "children": [
-                {
-                  "type": "tableCell",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "#",
-                      "position": {
-                        "start": {
-                          "line": 29,
-                          "column": 3,
-                          "offset": 335
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 4,
-                          "offset": 336
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 29,
-                      "column": 3,
-                      "offset": 335
-                    },
-                    "end": {
-                      "line": 29,
-                      "column": 4,
-                      "offset": 336
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "tableCell",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "Nato",
-                      "position": {
-                        "start": {
-                          "line": 29,
-                          "column": 7,
-                          "offset": 339
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 11,
-                          "offset": 343
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 29,
-                      "column": 7,
-                      "offset": 339
-                    },
-                    "end": {
-                      "line": 29,
-                      "column": 42,
-                      "offset": 374
-                    },
-                    "indent": []
-                  }
-                }
-              ],
+              "type": "text",
+              "value": "| # | Nato                                |\n| - | ----------------------------------- |\n| 1 | Alpha ",
               "position": {
                 "start": {
                   "line": 29,
@@ -990,259 +967,94 @@
                   "offset": 333
                 },
                 "end": {
-                  "line": 29,
-                  "column": 44,
-                  "offset": 376
-                },
-                "indent": []
+                  "line": 31,
+                  "column": 13,
+                  "offset": 433
+                }
               }
             },
             {
-              "type": "tableRow",
+              "type": "mdxJsxTextElement",
+              "name": "note",
+              "attributes": [],
               "children": [
                 {
-                  "type": "tableCell",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "1",
-                      "position": {
-                        "start": {
-                          "line": 31,
-                          "column": 3,
-                          "offset": 423
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 4,
-                          "offset": 424
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
+                  "type": "text",
+                  "value": "sometimes ",
                   "position": {
                     "start": {
                       "line": 31,
-                      "column": 3,
-                      "offset": 423
+                      "column": 19,
+                      "offset": 439
                     },
                     "end": {
                       "line": 31,
-                      "column": 4,
-                      "offset": 424
-                    },
-                    "indent": []
+                      "column": 29,
+                      "offset": 449
+                    }
                   }
                 },
                 {
-                  "type": "tableCell",
+                  "type": "emphasis",
                   "children": [
                     {
                       "type": "text",
-                      "value": "Alpha ",
+                      "value": "Alfa",
                       "position": {
                         "start": {
                           "line": 31,
-                          "column": 7,
-                          "offset": 427
+                          "column": 30,
+                          "offset": 450
                         },
                         "end": {
                           "line": 31,
-                          "column": 13,
-                          "offset": 433
-                        },
-                        "indent": []
-                      }
-                    },
-                    {
-                      "type": "mdxSpanElement",
-                      "name": "note",
-                      "attributes": [],
-                      "children": [
-                        {
-                          "type": "text",
-                          "value": "sometimes ",
-                          "position": {
-                            "start": {
-                              "line": 31,
-                              "column": 19,
-                              "offset": 439
-                            },
-                            "end": {
-                              "line": 31,
-                              "column": 29,
-                              "offset": 449
-                            },
-                            "indent": []
-                          }
-                        },
-                        {
-                          "type": "emphasis",
-                          "children": [
-                            {
-                              "type": "text",
-                              "value": "Alfa",
-                              "position": {
-                                "start": {
-                                  "line": 31,
-                                  "column": 30,
-                                  "offset": 450
-                                },
-                                "end": {
-                                  "line": 31,
-                                  "column": 34,
-                                  "offset": 454
-                                },
-                                "indent": []
-                              }
-                            }
-                          ],
-                          "position": {
-                            "start": {
-                              "line": 31,
-                              "column": 29,
-                              "offset": 449
-                            },
-                            "end": {
-                              "line": 31,
-                              "column": 35,
-                              "offset": 455
-                            },
-                            "indent": []
-                          }
+                          "column": 34,
+                          "offset": 454
                         }
-                      ],
-                      "position": {
-                        "start": {
-                          "line": 31,
-                          "column": 13,
-                          "offset": 433
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 42,
-                          "offset": 462
-                        },
-                        "indent": []
                       }
                     }
                   ],
                   "position": {
                     "start": {
                       "line": 31,
-                      "column": 7,
-                      "offset": 427
+                      "column": 29,
+                      "offset": 449
                     },
                     "end": {
                       "line": 31,
-                      "column": 42,
-                      "offset": 462
-                    },
-                    "indent": []
+                      "column": 35,
+                      "offset": 455
+                    }
                   }
                 }
               ],
               "position": {
                 "start": {
                   "line": 31,
-                  "column": 1,
-                  "offset": 421
+                  "column": 13,
+                  "offset": 433
                 },
                 "end": {
                   "line": 31,
-                  "column": 44,
-                  "offset": 464
-                },
-                "indent": []
+                  "column": 42,
+                  "offset": 462
+                }
               }
             },
             {
-              "type": "tableRow",
-              "children": [
-                {
-                  "type": "tableCell",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "2",
-                      "position": {
-                        "start": {
-                          "line": 32,
-                          "column": 3,
-                          "offset": 467
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 4,
-                          "offset": 468
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 32,
-                      "column": 3,
-                      "offset": 467
-                    },
-                    "end": {
-                      "line": 32,
-                      "column": 4,
-                      "offset": 468
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "tableCell",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "Bravo",
-                      "position": {
-                        "start": {
-                          "line": 32,
-                          "column": 7,
-                          "offset": 471
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 12,
-                          "offset": 476
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 32,
-                      "column": 7,
-                      "offset": 471
-                    },
-                    "end": {
-                      "line": 32,
-                      "column": 42,
-                      "offset": 506
-                    },
-                    "indent": []
-                  }
-                }
-              ],
+              "type": "text",
+              "value": " |\n| 2 | Bravo                               |",
               "position": {
                 "start": {
-                  "line": 32,
-                  "column": 1,
-                  "offset": 465
+                  "line": 31,
+                  "column": 42,
+                  "offset": 462
                 },
                 "end": {
                   "line": 32,
                   "column": 44,
                   "offset": 508
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1256,12 +1068,7 @@
               "line": 32,
               "column": 44,
               "offset": 508
-            },
-            "indent": [
-              1,
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -1275,14 +1082,7 @@
           "line": 33,
           "column": 5,
           "offset": 513
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -1302,8 +1102,7 @@
               "line": 35,
               "column": 16,
               "offset": 530
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1317,8 +1116,7 @@
           "line": 35,
           "column": 16,
           "offset": 530
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1337,8 +1135,7 @@
               "line": 37,
               "column": 15,
               "offset": 546
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1352,8 +1149,7 @@
           "line": 37,
           "column": 15,
           "offset": 546
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1373,8 +1169,7 @@
               "line": 39,
               "column": 18,
               "offset": 565
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1388,8 +1183,7 @@
           "line": 39,
           "column": 18,
           "offset": 565
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1408,8 +1202,7 @@
               "line": 41,
               "column": 15,
               "offset": 581
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1423,8 +1216,7 @@
           "line": 41,
           "column": 15,
           "offset": 581
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1444,8 +1236,7 @@
               "line": 43,
               "column": 15,
               "offset": 597
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1459,8 +1250,7 @@
           "line": 43,
           "column": 15,
           "offset": 597
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1479,8 +1269,7 @@
               "line": 45,
               "column": 5,
               "offset": 603
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1494,8 +1283,7 @@
           "line": 45,
           "column": 5,
           "offset": 603
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1515,8 +1303,7 @@
               "line": 47,
               "column": 8,
               "offset": 612
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1530,8 +1317,7 @@
           "line": 47,
           "column": 8,
           "offset": 612
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1551,8 +1337,7 @@
               "line": 49,
               "column": 29,
               "offset": 642
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1566,8 +1351,7 @@
           "line": 49,
           "column": 29,
           "offset": 642
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1586,15 +1370,14 @@
               "line": 51,
               "column": 23,
               "offset": 666
-            },
-            "indent": []
+            }
           }
         },
         {
           "type": "emphasis",
           "children": [
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "x",
               "attributes": [],
               "children": [
@@ -1611,8 +1394,7 @@
                       "line": 51,
                       "column": 37,
                       "offset": 680
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
@@ -1631,8 +1413,7 @@
                           "line": 51,
                           "column": 45,
                           "offset": 688
-                        },
-                        "indent": []
+                        }
                       }
                     }
                   ],
@@ -1646,60 +1427,23 @@
                       "line": 51,
                       "column": 47,
                       "offset": 690
-                    },
-                    "indent": []
+                    }
                   }
                 },
                 {
                   "type": "text",
-                  "value": ", and ",
+                  "value": ", and ~~deletions~~",
                   "position": {
                     "start": {
                       "line": 51,
                       "column": 47,
                       "offset": 690
                     },
-                    "end": {
-                      "line": 51,
-                      "column": 53,
-                      "offset": 696
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "delete",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "deletions",
-                      "position": {
-                        "start": {
-                          "line": 51,
-                          "column": 55,
-                          "offset": 698
-                        },
-                        "end": {
-                          "line": 51,
-                          "column": 64,
-                          "offset": 707
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 51,
-                      "column": 53,
-                      "offset": 696
-                    },
                     "end": {
                       "line": 51,
                       "column": 66,
                       "offset": 709
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -1713,8 +1457,7 @@
                   "line": 51,
                   "column": 70,
                   "offset": 713
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1728,8 +1471,7 @@
               "line": 51,
               "column": 71,
               "offset": 714
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -1745,8 +1487,7 @@
               "line": 51,
               "column": 72,
               "offset": 715
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1760,8 +1501,7 @@
           "line": 51,
           "column": 72,
           "offset": 715
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1781,8 +1521,7 @@
               "line": 53,
               "column": 14,
               "offset": 730
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1796,8 +1535,7 @@
           "line": 53,
           "column": 14,
           "offset": 730
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1816,8 +1554,7 @@
               "line": 55,
               "column": 15,
               "offset": 746
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1831,8 +1568,7 @@
           "line": 55,
           "column": 15,
           "offset": 746
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1852,8 +1588,7 @@
               "line": 57,
               "column": 10,
               "offset": 757
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1867,8 +1602,7 @@
           "line": 57,
           "column": 10,
           "offset": 757
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1887,8 +1621,7 @@
               "line": 59,
               "column": 5,
               "offset": 763
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1902,8 +1635,7 @@
           "line": 59,
           "column": 5,
           "offset": 763
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1923,8 +1655,7 @@
               "line": 61,
               "column": 15,
               "offset": 779
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -1938,8 +1669,7 @@
           "line": 61,
           "column": 15,
           "offset": 779
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -1951,7 +1681,7 @@
           "url": "#",
           "children": [
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "x",
               "attributes": [],
               "children": [
@@ -1968,8 +1698,7 @@
                       "line": 63,
                       "column": 10,
                       "offset": 790
-                    },
-                    "indent": []
+                    }
                   }
                 }
               ],
@@ -1983,8 +1712,7 @@
                   "line": 63,
                   "column": 14,
                   "offset": 794
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -1998,8 +1726,7 @@
               "line": 63,
               "column": 18,
               "offset": 798
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -2015,12 +1742,11 @@
               "line": 63,
               "column": 20,
               "offset": 800
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "y",
           "attributes": [],
           "children": [
@@ -2039,8 +1765,7 @@
                   "line": 63,
                   "column": 35,
                   "offset": 815
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -2054,8 +1779,7 @@
               "line": 63,
               "column": 39,
               "offset": 819
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -2071,8 +1795,7 @@
               "line": 63,
               "column": 46,
               "offset": 826
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -2081,7 +1804,7 @@
           "url": "#",
           "children": [
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "z",
               "attributes": [],
               "children": [
@@ -2100,10 +1823,7 @@
                       "line": 64,
                       "column": 10,
                       "offset": 860
-                    },
-                    "indent": [
-                      1
-                    ]
+                    }
                   }
                 }
               ],
@@ -2117,10 +1837,7 @@
                   "line": 64,
                   "column": 14,
                   "offset": 864
-                },
-                "indent": [
-                  1
-                ]
+                }
               }
             }
           ],
@@ -2134,10 +1851,7 @@
               "line": 64,
               "column": 18,
               "offset": 868
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         },
         {
@@ -2153,23 +1867,19 @@
               "line": 64,
               "column": 23,
               "offset": 873
-            },
-            "indent": []
+            }
           }
         },
         {
           "type": "linkReference",
-          "identifier": "<>{\"references\"}</>",
-          "label": "<>{\"references\"}</>",
-          "referenceType": "collapsed",
           "children": [
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": null,
               "attributes": [],
               "children": [
                 {
-                  "type": "mdxSpanExpression",
+                  "type": "mdxTextExpression",
                   "value": "\"references\"",
                   "position": {
                     "start": {
@@ -2181,8 +1891,26 @@
                       "line": 64,
                       "column": 40,
                       "offset": 890
-                    },
-                    "indent": []
+                    }
+                  },
+                  "data": {
+                    "estree": {
+                      "type": "Literal",
+                      "start": 0,
+                      "end": 12,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 12
+                        }
+                      },
+                      "value": "references",
+                      "raw": "\"references\""
+                    }
                   }
                 }
               ],
@@ -2196,8 +1924,7 @@
                   "line": 64,
                   "column": 43,
                   "offset": 893
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -2209,27 +1936,28 @@
             },
             "end": {
               "line": 64,
-              "column": 46,
-              "offset": 896
-            },
-            "indent": []
-          }
+              "column": 47,
+              "offset": 897
+            }
+          },
+          "identifier": "x",
+          "label": "x",
+          "referenceType": "full"
         },
         {
           "type": "text",
           "value": ".",
           "position": {
             "start": {
-              "line": 64,
-              "column": 46,
-              "offset": 896
-            },
-            "end": {
               "line": 64,
               "column": 47,
               "offset": 897
             },
-            "indent": []
+            "end": {
+              "line": 64,
+              "column": 48,
+              "offset": 898
+            }
           }
         }
       ],
@@ -2241,12 +1969,28 @@
         },
         "end": {
           "line": 64,
-          "column": 47,
-          "offset": 897
+          "column": 48,
+          "offset": 898
+        }
+      }
+    },
+    {
+      "type": "definition",
+      "identifier": "x",
+      "label": "x",
+      "title": null,
+      "url": "",
+      "position": {
+        "start": {
+          "line": 66,
+          "column": 1,
+          "offset": 900
         },
-        "indent": [
-          1
-        ]
+        "end": {
+          "line": 66,
+          "column": 8,
+          "offset": 907
+        }
       }
     }
   ],
@@ -2257,9 +2001,9 @@
       "offset": 0
     },
     "end": {
-      "line": 65,
+      "line": 67,
       "column": 1,
-      "offset": 898
+      "offset": 908
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/markdown.md b/packages/remark-mdx/test/fixtures/markdown.md
index bd2f3adb0..c23c70b1b 100644
--- a/packages/remark-mdx/test/fixtures/markdown.md
+++ b/packages/remark-mdx/test/fixtures/markdown.md
@@ -61,4 +61,6 @@ N/A.
 ### References
 
 [<x>links</x>](#), <y>![images](#)</y>, even [<z>![an image in jsx in
-links](#)</z>](#), or [<>{"references"}</>][].
+links](#)</z>](#), or [<>{"references"}</>][x].
+
+[x]: <>
diff --git a/packages/remark-mdx/test/fixtures/markdown.out b/packages/remark-mdx/test/fixtures/markdown.out
index 9ef38a172..10c25353b 100644
--- a/packages/remark-mdx/test/fixtures/markdown.out
+++ b/packages/remark-mdx/test/fixtures/markdown.out
@@ -6,41 +6,29 @@ Note that code is weird, it’s checked in another fixture.
 
 ### Paragraph
 
-<X>
-  Block and <y>inline</y>, <z/>, {1 + 1}.
-</X>
+<X>Block and <y>inline</y>, <z/>, {1 + 1}.</X>
 
 ### Heading<x/>
 
-<X>
-  ###### heading
-</X>
+<X>###### heading</X>
 
 ### Block quote
 
-<X>
-  > a block quote!
-</X>
+<X>> a block quote!</X>
 
 > <x>A</x> block quote.
 
 ### List
 
--   <X>
-      Item <y>inline</y>
-    </X>
--   <X>
-      {
-        1 + 1
-      }
-    </X>
+*   <X>Item <y>inline</y></X>
+*   <X>{1 + 1}</X>
 
 ### Table
 
 <X>
   | # | Nato                                |
   | - | ----------------------------------- |
-  | 1 | Alpha <note>sometimes _Alfa_</note> |
+  | 1 | Alpha <note>sometimes *Alfa*</note> |
   | 2 | Bravo                               |
 </X>
 
@@ -60,7 +48,7 @@ N/A.
 
 ### Emphasis, strong, delete
 
-You can mix and match _<x>emphasis, **strong**, and ~~deletions~~</x>_.
+You can mix and match *<x>emphasis, **strong**, and ~~deletions~~</x>*.
 
 ### Code span
 
@@ -73,4 +61,6 @@ N/A.
 ### References
 
 [<x>links</x>](#), <y>![images](#)</y>, even [<z>![an image in jsx in
-links](#)</z>](#), or [<>{"references"}</>][].
+links](#)</z>](#), or [<>{"references"}</>][x].
+
+[x]: <>
diff --git a/packages/remark-mdx/test/fixtures/origin.json b/packages/remark-mdx/test/fixtures/origin.json
index d0793c02e..7665487a4 100644
--- a/packages/remark-mdx/test/fixtures/origin.json
+++ b/packages/remark-mdx/test/fixtures/origin.json
@@ -18,8 +18,7 @@
               "line": 1,
               "column": 12,
               "offset": 11
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -33,8 +32,7 @@
           "line": 1,
           "column": 12,
           "offset": 11
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -53,10 +51,7 @@
               "line": 4,
               "column": 79,
               "offset": 167
-            },
-            "indent": [
-              1
-            ]
+            }
           }
         }
       ],
@@ -70,10 +65,7 @@
           "line": 4,
           "column": 79,
           "offset": 167
-        },
-        "indent": [
-          1
-        ]
+        }
       }
     },
     {
@@ -91,13 +83,7 @@
           "line": 10,
           "column": 4,
           "offset": 258
-        },
-        "indent": [
-          1,
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -116,8 +102,7 @@
               "line": 12,
               "column": 23,
               "offset": 282
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -131,8 +116,7 @@
           "line": 12,
           "column": 23,
           "offset": 282
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -150,11 +134,7 @@
           "line": 16,
           "column": 4,
           "offset": 336
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -173,8 +153,7 @@
               "line": 18,
               "column": 22,
               "offset": 359
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -193,8 +172,7 @@
                   "line": 18,
                   "column": 31,
                   "offset": 368
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -208,8 +186,7 @@
               "line": 18,
               "column": 33,
               "offset": 370
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -225,8 +202,7 @@
               "line": 18,
               "column": 34,
               "offset": 371
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -240,8 +216,7 @@
           "line": 18,
           "column": 34,
           "offset": 371
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -260,11 +235,7 @@
               "line": 22,
               "column": 34,
               "offset": 553
-            },
-            "indent": [
-              1,
-              1
-            ]
+            }
           }
         }
       ],
@@ -278,11 +249,7 @@
           "line": 22,
           "column": 34,
           "offset": 553
-        },
-        "indent": [
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -300,12 +267,7 @@
           "line": 27,
           "column": 4,
           "offset": 611
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -324,8 +286,7 @@
               "line": 29,
               "column": 19,
               "offset": 631
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -339,8 +300,7 @@
           "line": 29,
           "column": 19,
           "offset": 631
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -358,12 +318,7 @@
           "line": 34,
           "column": 4,
           "offset": 692
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+        }
       }
     },
     {
@@ -382,8 +337,7 @@
               "line": 36,
               "column": 17,
               "offset": 710
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -402,8 +356,7 @@
                   "line": 36,
                   "column": 29,
                   "offset": 722
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -417,8 +370,7 @@
               "line": 36,
               "column": 31,
               "offset": 724
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -434,8 +386,7 @@
               "line": 36,
               "column": 32,
               "offset": 725
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -449,8 +400,7 @@
           "line": 36,
           "column": 32,
           "offset": 725
-        },
-        "indent": []
+        }
       }
     }
   ],
diff --git a/packages/remark-mdx/test/fixtures/span.json b/packages/remark-mdx/test/fixtures/span.json
index db7b1d4d3..664f64b7a 100644
--- a/packages/remark-mdx/test/fixtures/span.json
+++ b/packages/remark-mdx/test/fixtures/span.json
@@ -17,8 +17,7 @@
               "line": 1,
               "column": 15,
               "offset": 14
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -34,8 +33,7 @@
               "line": 1,
               "column": 22,
               "offset": 21
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -51,17 +49,16 @@
               "line": 1,
               "column": 30,
               "offset": 29
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": null,
           "attributes": [],
           "children": [
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "1 + 1",
               "position": {
                 "start": {
@@ -73,8 +70,59 @@
                   "line": 1,
                   "column": 39,
                   "offset": 38
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "BinaryExpression",
+                  "start": 0,
+                  "end": 5,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 5
+                    }
+                  },
+                  "left": {
+                    "type": "Literal",
+                    "start": 0,
+                    "end": 1,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 1
+                      }
+                    },
+                    "value": 1,
+                    "raw": "1"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "Literal",
+                    "start": 4,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      }
+                    },
+                    "value": 1,
+                    "raw": "1"
+                  }
+                }
               }
             }
           ],
@@ -88,8 +136,7 @@
               "line": 1,
               "column": 42,
               "offset": 41
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -105,8 +152,7 @@
               "line": 1,
               "column": 43,
               "offset": 42
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -120,8 +166,7 @@
           "line": 1,
           "column": 43,
           "offset": 42
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -140,12 +185,11 @@
               "line": 3,
               "column": 10,
               "offset": 53
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "div",
           "attributes": [],
           "children": [
@@ -162,8 +206,7 @@
                   "line": 3,
                   "column": 27,
                   "offset": 70
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -177,8 +220,7 @@
               "line": 3,
               "column": 33,
               "offset": 76
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -194,8 +236,7 @@
               "line": 3,
               "column": 34,
               "offset": 77
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -209,8 +250,7 @@
           "line": 3,
           "column": 34,
           "offset": 77
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -229,12 +269,11 @@
               "line": 5,
               "column": 22,
               "offset": 100
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "div",
           "attributes": [],
           "children": [
@@ -251,12 +290,11 @@
                   "line": 5,
                   "column": 34,
                   "offset": 112
-                },
-                "indent": []
+                }
               }
             },
             {
-              "type": "mdxSpanExpression",
+              "type": "mdxTextExpression",
               "value": "formatName(user)",
               "position": {
                 "start": {
@@ -268,8 +306,59 @@
                   "line": 5,
                   "column": 52,
                   "offset": 130
-                },
-                "indent": []
+                }
+              },
+              "data": {
+                "estree": {
+                  "type": "CallExpression",
+                  "start": 0,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 0
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 0,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      }
+                    },
+                    "name": "formatName"
+                  },
+                  "arguments": [
+                    {
+                      "type": "Identifier",
+                      "start": 11,
+                      "end": 15,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 15
+                        }
+                      },
+                      "name": "user"
+                    }
+                  ],
+                  "optional": false
+                }
               }
             },
             {
@@ -285,8 +374,7 @@
                   "line": 5,
                   "column": 53,
                   "offset": 131
-                },
-                "indent": []
+                }
               }
             }
           ],
@@ -300,8 +388,7 @@
               "line": 5,
               "column": 59,
               "offset": 137
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -317,8 +404,7 @@
               "line": 5,
               "column": 60,
               "offset": 138
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -332,8 +418,7 @@
           "line": 5,
           "column": 60,
           "offset": 138
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -352,30 +437,17 @@
               "line": 7,
               "column": 13,
               "offset": 152
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "div",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "tabIndex",
-              "value": "0",
-              "position": {
-                "start": {
-                  "line": 7,
-                  "column": 18,
-                  "offset": 157
-                },
-                "end": {
-                  "line": 7,
-                  "column": 30,
-                  "offset": 169
-                }
-              }
+              "value": "0"
             }
           ],
           "children": [],
@@ -389,8 +461,7 @@
               "line": 7,
               "column": 37,
               "offset": 176
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -404,8 +475,7 @@
           "line": 7,
           "column": 37,
           "offset": 176
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -424,44 +494,70 @@
               "line": 9,
               "column": 30,
               "offset": 207
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "img",
           "attributes": [
             {
-              "type": "mdxAttribute",
+              "type": "mdxJsxAttribute",
               "name": "src",
               "value": {
-                "type": "mdxValueExpression",
+                "type": "mdxJsxAttributeValueExpression",
                 "value": "user.avatarUrl",
-                "position": {
-                  "start": {
-                    "line": 9,
-                    "column": 39,
-                    "offset": 216
-                  },
-                  "end": {
-                    "line": 9,
-                    "column": 55,
-                    "offset": 232
+                "data": {
+                  "estree": {
+                    "type": "MemberExpression",
+                    "start": 0,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 0
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      }
+                    },
+                    "object": {
+                      "type": "Identifier",
+                      "start": 0,
+                      "end": 4,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 0
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 4
+                        }
+                      },
+                      "name": "user"
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 5,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      },
+                      "name": "avatarUrl"
+                    },
+                    "computed": false,
+                    "optional": false
                   }
                 }
-              },
-              "position": {
-                "start": {
-                  "line": 9,
-                  "column": 35,
-                  "offset": 212
-                },
-                "end": {
-                  "line": 9,
-                  "column": 55,
-                  "offset": 232
-                }
               }
             }
           ],
@@ -476,8 +572,7 @@
               "line": 9,
               "column": 62,
               "offset": 239
-            },
-            "indent": []
+            }
           }
         },
         {
@@ -493,8 +588,7 @@
               "line": 9,
               "column": 63,
               "offset": 240
-            },
-            "indent": []
+            }
           }
         }
       ],
@@ -508,8 +602,7 @@
           "line": 9,
           "column": 63,
           "offset": 240
-        },
-        "indent": []
+        }
       }
     },
     {
@@ -528,27 +621,47 @@
               "line": 11,
               "column": 24,
               "offset": 265
-            },
-            "indent": []
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "div",
           "attributes": [
             {
-              "type": "mdxAttributeExpression",
-              "value": "props",
-              "position": {
-                "start": {
-                  "line": 11,
-                  "column": 29,
-                  "offset": 270
-                },
-                "end": {
-                  "line": 11,
-                  "column": 36,
-                  "offset": 277
+              "type": "mdxJsxExpressionAttribute",
+              "value": "...props",
+              "data": {
+                "estree": {
+                  "type": "SpreadElement",
+                  "start": 3,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 6,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "name": "props"
+                  }
                 }
               }
             }
@@ -562,10 +675,9 @@
             },
             "end": {
               "line": 11,
-              "column": 43,
-              "offset": 284
-            },
-            "indent": []
+              "column": 46,
+              "offset": 287
+            }
           }
         }
       ],
@@ -577,10 +689,9 @@
         },
         "end": {
           "line": 11,
-          "column": 43,
-          "offset": 284
-        },
-        "indent": []
+          "column": 46,
+          "offset": 287
+        }
       }
     },
     {
@@ -593,18 +704,17 @@
             "start": {
               "line": 13,
               "column": 1,
-              "offset": 286
+              "offset": 289
             },
             "end": {
               "line": 13,
               "column": 24,
-              "offset": 309
-            },
-            "indent": []
+              "offset": 312
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "img",
           "attributes": [],
           "children": [],
@@ -612,14 +722,13 @@
             "start": {
               "line": 13,
               "column": 24,
-              "offset": 309
+              "offset": 312
             },
             "end": {
               "line": 13,
               "column": 30,
-              "offset": 315
-            },
-            "indent": []
+              "offset": 318
+            }
           }
         }
       ],
@@ -627,14 +736,13 @@
         "start": {
           "line": 13,
           "column": 1,
-          "offset": 286
+          "offset": 289
         },
         "end": {
           "line": 13,
           "column": 30,
-          "offset": 315
-        },
-        "indent": []
+          "offset": 318
+        }
       }
     },
     {
@@ -647,18 +755,17 @@
             "start": {
               "line": 15,
               "column": 1,
-              "offset": 317
+              "offset": 320
             },
             "end": {
               "line": 15,
               "column": 20,
-              "offset": 336
-            },
-            "indent": []
+              "offset": 339
+            }
           }
         },
         {
-          "type": "mdxSpanElement",
+          "type": "mdxJsxTextElement",
           "name": "div",
           "attributes": [],
           "children": [
@@ -669,20 +776,17 @@
                 "start": {
                   "line": 15,
                   "column": 25,
-                  "offset": 341
+                  "offset": 344
                 },
                 "end": {
                   "line": 16,
-                  "column": 3,
-                  "offset": 344
-                },
-                "indent": [
-                  1
-                ]
+                  "column": 1,
+                  "offset": 345
+                }
               }
             },
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "h1",
               "attributes": [],
               "children": [
@@ -693,14 +797,13 @@
                     "start": {
                       "line": 16,
                       "column": 7,
-                      "offset": 348
+                      "offset": 351
                     },
                     "end": {
                       "line": 16,
                       "column": 13,
-                      "offset": 354
-                    },
-                    "indent": []
+                      "offset": 357
+                    }
                   }
                 }
               ],
@@ -708,14 +811,13 @@
                 "start": {
                   "line": 16,
                   "column": 3,
-                  "offset": 344
+                  "offset": 347
                 },
                 "end": {
                   "line": 16,
                   "column": 18,
-                  "offset": 359
-                },
-                "indent": []
+                  "offset": 362
+                }
               }
             },
             {
@@ -725,20 +827,17 @@
                 "start": {
                   "line": 16,
                   "column": 18,
-                  "offset": 359
+                  "offset": 362
                 },
                 "end": {
                   "line": 17,
-                  "column": 3,
-                  "offset": 362
-                },
-                "indent": [
-                  1
-                ]
+                  "column": 1,
+                  "offset": 363
+                }
               }
             },
             {
-              "type": "mdxSpanElement",
+              "type": "mdxJsxTextElement",
               "name": "h2",
               "attributes": [],
               "children": [
@@ -749,14 +848,13 @@
                     "start": {
                       "line": 17,
                       "column": 7,
-                      "offset": 366
+                      "offset": 369
                     },
                     "end": {
                       "line": 17,
                       "column": 28,
-                      "offset": 387
-                    },
-                    "indent": []
+                      "offset": 390
+                    }
                   }
                 }
               ],
@@ -764,14 +862,13 @@
                 "start": {
                   "line": 17,
                   "column": 3,
-                  "offset": 362
+                  "offset": 365
                 },
                 "end": {
                   "line": 17,
                   "column": 33,
-                  "offset": 392
-                },
-                "indent": []
+                  "offset": 395
+                }
               }
             },
             {
@@ -781,16 +878,13 @@
                 "start": {
                   "line": 17,
                   "column": 33,
-                  "offset": 392
+                  "offset": 395
                 },
                 "end": {
                   "line": 18,
                   "column": 1,
-                  "offset": 393
-                },
-                "indent": [
-                  1
-                ]
+                  "offset": 396
+                }
               }
             }
           ],
@@ -798,18 +892,13 @@
             "start": {
               "line": 15,
               "column": 20,
-              "offset": 336
+              "offset": 339
             },
             "end": {
               "line": 18,
               "column": 7,
-              "offset": 399
-            },
-            "indent": [
-              1,
-              1,
-              1
-            ]
+              "offset": 402
+            }
           }
         },
         {
@@ -819,14 +908,13 @@
             "start": {
               "line": 18,
               "column": 7,
-              "offset": 399
+              "offset": 402
             },
             "end": {
               "line": 18,
               "column": 8,
-              "offset": 400
-            },
-            "indent": []
+              "offset": 403
+            }
           }
         }
       ],
@@ -834,18 +922,13 @@
         "start": {
           "line": 15,
           "column": 1,
-          "offset": 317
+          "offset": 320
         },
         "end": {
           "line": 18,
           "column": 8,
-          "offset": 400
-        },
-        "indent": [
-          1,
-          1,
-          1
-        ]
+          "offset": 403
+        }
       }
     }
   ],
@@ -858,7 +941,7 @@
     "end": {
       "line": 19,
       "column": 1,
-      "offset": 401
+      "offset": 404
     }
   }
 }
diff --git a/packages/remark-mdx/test/fixtures/span.md b/packages/remark-mdx/test/fixtures/span.md
index b69d5701e..09cf61e67 100644
--- a/packages/remark-mdx/test/fixtures/span.md
+++ b/packages/remark-mdx/test/fixtures/span.md
@@ -8,7 +8,7 @@ Attributes: <div tabIndex="0"></div>
 
 Attribute value expressions: <img src={user.avatarUrl}></img>.
 
-Attribute expressions: <div {props}></div>
+Attribute expressions: <div {...props}></div>
 
 Self-closing elements: <img/>
 
diff --git a/packages/remark-mdx/test/fixtures/span.out b/packages/remark-mdx/test/fixtures/span.out
index 163f3ee84..ad5a397bd 100644
--- a/packages/remark-mdx/test/fixtures/span.out
+++ b/packages/remark-mdx/test/fixtures/span.out
@@ -8,7 +8,7 @@ Attributes: <div tabIndex="0"/>
 
 Attribute value expressions: <img src={user.avatarUrl}/>.
 
-Attribute expressions: <div {props}/>
+Attribute expressions: <div {...props}/>
 
 Self-closing elements: <img/>
 
diff --git a/packages/remark-mdx/test/index.js b/packages/remark-mdx/test/index.js
index e5aaa6062..3eddd074a 100644
--- a/packages/remark-mdx/test/index.js
+++ b/packages/remark-mdx/test/index.js
@@ -8,20 +8,41 @@ let vfile = require('to-vfile')
 let unified = require('unified')
 let parse = require('remark-parse')
 let stringify = require('remark-stringify')
+let remove = require('unist-util-remove-position')
+let visit = require('unist-util-visit')
 let mdx = require('..')
 
 let base = path.join(__dirname, 'fixtures')
 
 test('parse', function (t) {
-  let basic = unified().use(parse, {position: false}).use(mdx)
+  let basic = unified().use(parse).use(mdx)
+
+  t.test('MDX vs. MDX.js', function (t) {
+    t.deepEqual(
+      clean(unified().use(parse).use(mdx, {js: false}).parse('{1 + /* } */ 2}').children[0]),
+      u('paragraph', [
+        u('mdxTextExpression', '1 + /* '),
+        u('text', ' */ 2}')
+      ]),
+      'should count braces in agnostic mode (`js: false`)'
+    )
+
+    t.deepEqual(
+      clean(unified().use(parse).use(mdx).parse('{1 + /* } */ 2}').children[0]),
+      u('mdxFlowExpression', {data: {estree: null}}, '1 + /* } */ 2'),
+      'should parse expressions in gnostic mode (default)'
+    )
+
+    t.end()
+  })
 
   t.test('basics', function (t) {
     t.deepEqual(
-      basic.parse('Alpha <b/> charlie.'),
+      clean(basic.parse('Alpha <b/> charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'b', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'b', attributes: []}, []),
           u('text', ' charlie.')
         ])
       ]),
@@ -29,11 +50,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b></b> charlie.'),
+      clean(basic.parse('Alpha <b></b> charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'b', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'b', attributes: []}, []),
           u('text', ' charlie.')
         ])
       ]),
@@ -41,11 +62,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <></> charlie.'),
+      clean(basic.parse('Alpha <></> charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: null, attributes: []}, []),
+          u('mdxJsxTextElement', {name: null, attributes: []}, []),
           u('text', ' charlie.')
         ])
       ]),
@@ -53,11 +74,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b>*bravo*</b> charlie.'),
+      clean(basic.parse('Alpha <b>*bravo*</b> charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'b', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'b', attributes: []}, [
             u('emphasis', [u('text', 'bravo')])
           ]),
           u('text', ' charlie.')
@@ -67,11 +88,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha {1 + 1} charlie.'),
+      clean(basic.parse('Alpha {1 + 1} charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanExpression', '1 + 1'),
+          u('mdxTextExpression', {data: {estree: null}}, '1 + 1'),
           u('text', ' charlie.')
         ])
       ]),
@@ -86,7 +107,7 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <b> charlie.')
       },
-      /Unexpected end of file in element, expected a corresponding MDX closing tag for `<b>` \(1:7-1:10\)/,
+      /Cannot close `paragraph` \(1:1-1:19\): a different token \(`mdxJsxTextTag`, 1:7-1:10\) is open/,
       'should crash on an unclosed element'
     )
 
@@ -94,16 +115,16 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <> charlie.')
       },
-      /Unexpected end of file in element, expected a corresponding MDX closing tag for `<>` \(1:7-1:9\)/,
+      /Cannot close `paragraph` \(1:1-1:18\): a different token \(`mdxJsxTextTag`, 1:7-1:9\) is open/,
       'should crash on an unclosed fragment'
     )
 
     t.deepEqual(
-      basic.parse('Alpha < \t>bravo</>.'),
+      clean(basic.parse('Alpha < \t>bravo</>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: null, attributes: []}, [
+          u('mdxJsxTextElement', {name: null, attributes: []}, [
             u('text', 'bravo')
           ]),
           u('text', '.')
@@ -113,11 +134,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha < \nb\t>bravo</b>.'),
+      clean(basic.parse('Alpha < \nb\t>bravo</b>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'b', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'b', attributes: []}, [
             u('text', 'bravo')
           ]),
           u('text', '.')
@@ -143,11 +164,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <π /> bravo.'),
+      clean(basic.parse('Alpha <π /> bravo.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'π', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'π', attributes: []}, []),
           u('text', ' bravo.')
         ])
       ]),
@@ -163,11 +184,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <a\u200cb /> bravo.'),
+      clean(basic.parse('Alpha <a\u200cb /> bravo.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'a\u200cb', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'a\u200cb', attributes: []}, []),
           u('text', ' bravo.')
         ])
       ]),
@@ -183,11 +204,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <a-->bravo</a-->.'),
+      clean(basic.parse('Alpha <a-->bravo</a-->.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'a--', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'a--', attributes: []}, [
             u('text', 'bravo')
           ]),
           u('text', '.')
@@ -205,11 +226,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <abc . def.ghi>bravo</abc.def . ghi>.'),
+      clean(basic.parse('Alpha <abc . def.ghi>bravo</abc.def . ghi>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'abc.def.ghi', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'abc.def.ghi', attributes: []}, [
             u('text', 'bravo')
           ]),
           u('text', '.')
@@ -219,11 +240,11 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <svg: rect>bravo</  svg :rect>.'),
+      clean(basic.parse('Alpha <svg: rect>bravo</  svg :rect>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'svg:rect', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'svg:rect', attributes: []}, [
             u('text', 'bravo')
           ]),
           u('text', '.')
@@ -289,17 +310,25 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b {...props} {...rest}>charlie</b>.'),
+      clean(basic.parse('Alpha <b {...props} {...rest}>charlie</b>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttributeExpression', '...props'),
-                u('mdxAttributeExpression', '...rest')
+                u(
+                  'mdxJsxExpressionAttribute',
+                  {data: {estree: null}},
+                  '...props'
+                ),
+                u(
+                  'mdxJsxExpressionAttribute',
+                  {data: {estree: null}},
+                  '...rest'
+                )
               ]
             },
             [u('text', 'charlie')]
@@ -311,14 +340,16 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a{...b}/>.'),
+      clean(basic.parse('<a{...b}/>.')),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'a',
-              attributes: [u('mdxAttributeExpression', '...b')]
+              attributes: [
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...b')
+              ]
             },
             []
           ),
@@ -329,14 +360,16 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a.b{...c}/>.'),
+      clean(basic.parse('<a.b{...c}/>.')),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'a.b',
-              attributes: [u('mdxAttributeExpression', '...c')]
+              attributes: [
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...c')
+              ]
             },
             []
           ),
@@ -347,14 +380,16 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a:b{...c}/>.'),
+      clean(basic.parse('<a:b{...c}/>.')),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'a:b',
-              attributes: [u('mdxAttributeExpression', '...c')]
+              attributes: [
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...c')
+              ]
             },
             []
           ),
@@ -365,17 +400,17 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b c{...d}/>.'),
+      clean(basic.parse('Alpha <b c{...d}/>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'c', value: null}),
-                u('mdxAttributeExpression', '...d')
+                u('mdxJsxAttribute', {name: 'c', value: null}),
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...d')
               ]
             },
             []
@@ -387,17 +422,17 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b c:d{...e}/>.'),
+      clean(basic.parse('Alpha <b c:d{...e}/>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'c:d', value: null}),
-                u('mdxAttributeExpression', '...e')
+                u('mdxJsxAttribute', {name: 'c:d', value: null}),
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...e')
               ]
             },
             []
@@ -409,18 +444,22 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b alpha {...props} bravo>charlie</b>.'),
+      clean(basic.parse('Alpha <b alpha {...props} bravo>charlie</b>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'alpha', value: null}),
-                u('mdxAttributeExpression', '...props'),
-                u('mdxAttribute', {name: 'bravo', value: null})
+                u('mdxJsxAttribute', {name: 'alpha', value: null}),
+                u(
+                  'mdxJsxExpressionAttribute',
+                  {data: {estree: null}},
+                  '...props'
+                ),
+                u('mdxJsxAttribute', {name: 'bravo', value: null})
               ]
             },
             [u('text', 'charlie')]
@@ -432,18 +471,21 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b c     d="d"\t\tefg=\'e\'>charlie</b>.'),
+      clean(
+        basic.parse('Alpha <b c     d="d"\t\tefg=\'e\'>charlie</b>.'),
+        true
+      ),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'c', value: null}),
-                u('mdxAttribute', {name: 'd'}, 'd'),
-                u('mdxAttribute', {name: 'efg'}, 'e')
+                u('mdxJsxAttribute', {name: 'c', value: null}),
+                u('mdxJsxAttribute', {name: 'd'}, 'd'),
+                u('mdxJsxAttribute', {name: 'efg'}, 'e')
               ]
             },
             [u('text', 'charlie')]
@@ -466,7 +508,7 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <b {...')
       },
-      /Unexpected end of file in attribute expression, expected a corresponding closing brace for `{`/,
+      /Unexpected end of file in expression, expected a corresponding closing brace for `{`/,
       'should crash on a missing closing brace in attribute expression'
     )
 
@@ -479,17 +521,20 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b xml :\tlang\n= "de-CH" foo:bar>charlie</b>.'),
+      clean(
+        basic.parse('Alpha <b xml :\tlang\n= "de-CH" foo:bar>charlie</b>.'),
+        true
+      ),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'xml:lang'}, 'de-CH'),
-                u('mdxAttribute', {name: 'foo:bar', value: null})
+                u('mdxJsxAttribute', {name: 'xml:lang'}, 'de-CH'),
+                u('mdxJsxAttribute', {name: 'foo:bar', value: null})
               ]
             },
             [u('text', 'charlie')]
@@ -501,19 +546,19 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b a b : c d : e = "f" g/>.'),
+      clean(basic.parse('Alpha <b a b : c d : e = "f" g/>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {name: 'a', value: null}),
-                u('mdxAttribute', {name: 'b:c', value: null}),
-                u('mdxAttribute', {name: 'd:e'}, 'f'),
-                u('mdxAttribute', {name: 'g', value: null})
+                u('mdxJsxAttribute', {name: 'a', value: null}),
+                u('mdxJsxAttribute', {name: 'b:c', value: null}),
+                u('mdxJsxAttribute', {name: 'd:e'}, 'f'),
+                u('mdxJsxAttribute', {name: 'g', value: null})
               ]
             },
             []
@@ -557,18 +602,22 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <b c={1 + 1}>charlie</b>.'),
+      clean(basic.parse('Alpha <b c={1 + 1}>charlie</b>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'b',
               attributes: [
-                u('mdxAttribute', {
+                u('mdxJsxAttribute', {
                   name: 'c',
-                  value: u('mdxValueExpression', '1 + 1')
+                  value: u(
+                    'mdxJsxAttributeValueExpression',
+                    {data: {estree: null}},
+                    '1 + 1'
+                  )
                 })
               ]
             },
@@ -608,7 +657,7 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <a b={> charlie.')
       },
-      /Unexpected end of file in attribute value expression, expected a corresponding closing brace for `{`/,
+      /Unexpected end of file in expression, expected a corresponding closing brace for `{`/,
       'should crash on a missing closing brace in an attribute value expression'
     )
 
@@ -621,16 +670,16 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a b=""c/>.'),
+      clean(basic.parse('<a b=""c/>.')),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'a',
               attributes: [
-                u('mdxAttribute', {name: 'b'}, ''),
-                u('mdxAttribute', {name: 'c', value: null})
+                u('mdxJsxAttribute', {name: 'b'}, ''),
+                u('mdxJsxAttribute', {name: 'c', value: null})
               ]
             },
             []
@@ -642,16 +691,16 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a{...b}c/>.'),
+      clean(basic.parse('<a{...b}c/>.')),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'a',
               attributes: [
-                u('mdxAttributeExpression', '...b'),
-                u('mdxAttribute', {name: 'c', value: null})
+                u('mdxJsxExpressionAttribute', {data: {estree: null}}, '...b'),
+                u('mdxJsxAttribute', {name: 'c', value: null})
               ]
             },
             []
@@ -671,10 +720,10 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<a/ \t>.'),
+      clean(basic.parse('<a/ \t>.')),
       u('root', [
         u('paragraph', [
-          u('mdxSpanElement', {name: 'a', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'a', attributes: []}, []),
           u('text', '.')
         ])
       ]),
@@ -706,19 +755,19 @@ test('parse', function (t) {
     }, 'should *not* crash on opening curly in tick code in an element')
 
     t.doesNotThrow(function () {
-      basic.parse('<>```\n<\n```</>')
+      basic.parse('<>\n```\n<\n```\n</>')
     }, 'should *not* crash on opening angle in tick block code in an element')
 
     t.doesNotThrow(function () {
-      basic.parse('<>```\n{\n```</>')
-    }, 'should *not* crash on opening curly in tick code in an element')
+      basic.parse('<>\n```\n{\n```\n</>')
+    }, 'should *not* crash on opening curly in tick block code in an element')
 
     t.doesNotThrow(function () {
-      basic.parse('<>~~~\n<\n~~~</>')
+      basic.parse('<>\n~~~\n<\n~~~\n</>')
     }, 'should *not* crash on opening angle in tilde block code in an element')
 
     t.doesNotThrow(function () {
-      basic.parse('<>~~~\n{\n~~~</>')
+      basic.parse('<>\n~~~\n{\n~~~\n</>')
     }, 'should *not* crash on opening curly in tilde block code in an element')
 
     t.doesNotThrow(function () {
@@ -729,75 +778,23 @@ test('parse', function (t) {
       basic.parse('Alpha <>~~ ~~~ ~~</>')
     }, 'should *not* crash on tildes in tilde code in an element')
 
-    t.throws(
-      function () {
-        basic.parse('Alpha <>`')
-      },
-      /Unexpected end of file in code, expected a corresponding fence for `` ` ``/,
-      'should crash on unclosed tick code (eof in opening)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('Alpha <>` charlie.')
-      },
-      /Unexpected end of file in code, expected a corresponding fence for `` ` ``/,
-      'should crash on unclosed tick code (eof in content)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('Alpha <>`` `charlie`')
-      },
-      /Unexpected end of file in code, expected a corresponding fence for `` ` ``/,
-      'should crash on unclosed tick code (eof in closing)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('Alpha <>` charlie.`')
-      },
-      /Unexpected end of file in element, expected a corresponding MDX closing tag for `<>` \(1:7-1:9\)/,
-      'should crash directly after closed tick code (eof after close)'
-    )
+    t.doesNotThrow(function () {
+      basic.parse('Alpha <>`</>')
+    }, 'should *not* crash on unclosed tick code')
 
     t.throws(
       function () {
         basic.parse('<>\n~~~')
       },
-      /Unexpected end of file in code, expected a corresponding fence for `~`/,
-      'should crash on unclosed tilde code (eof in opening)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('<>\n~~~\ncharlie.')
-      },
-      /Unexpected end of file in code, expected a corresponding fence for `~`/,
-      'should crash on unclosed tilde code (eof in content)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('<>\n~~~\n~charlie~\n~')
-      },
-      /Unexpected end of file in code, expected a corresponding fence for `~`/,
-      'should crash on unclosed tilde code (eof in closing)'
-    )
-
-    t.throws(
-      function () {
-        basic.parse('<>\n~~~\ncharlie.\n~~~')
-      },
-      /Unexpected end of file in element, expected a corresponding MDX closing tag for `<>` \(1:1-1:3\)/,
-      'should crash directly after closed tilde code (eof after close)'
+      /Cannot close document, a token \(`mdxJsxFlowTag`, 1:1-1:3\) is still open/,
+      'should crash on unclosed flow after unclosed tilde code'
     )
 
     t.throws(
       function () {
         basic.parse('Alpha </> charlie.')
       },
-      /Unexpected character `\/` \(U\+002F\) before name, expected an opening tag first as there are no open elements/,
+      /Unexpected closing slash `\/` in tag, expected an open tag first/,
       'should crash on closing tag without open elements'
     )
 
@@ -805,63 +802,63 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <></b> charlie.')
       },
-      /Unexpected closing tag `<\/b>`, expected corresponding MDX closing tag for `<>`/,
+      /Unexpected closing tag `<\/b>`, expected corresponding closing tag for `<>` \(1:7-1:9\)/,
       'should crash on mismatched tags (1)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <b></> charlie.')
       },
-      /Unexpected closing tag `<\/>`, expected corresponding MDX closing tag for `<b>`/,
+      /Unexpected closing tag `<\/>`, expected corresponding closing tag for `<b>` \(1:7-1:10\)/,
       'should crash on mismatched tags (2)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a.b></a> charlie.')
       },
-      /Unexpected closing tag `<\/a>`, expected corresponding MDX closing tag for `<a.b>`/,
+      /Unexpected closing tag `<\/a>`, expected corresponding closing tag for `<a.b>` \(1:7-1:12\)/,
       'should crash on mismatched tags (3)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a></a.b> charlie.')
       },
-      /Unexpected closing tag `<\/a.b>`, expected corresponding MDX closing tag for `<a>`/,
+      /Unexpected closing tag `<\/a.b>`, expected corresponding closing tag for `<a>` \(1:7-1:10\)/,
       'should crash on mismatched tags (4)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a.b></a.c> charlie.')
       },
-      /Unexpected closing tag `<\/a.c>`, expected corresponding MDX closing tag for `<a.b>`/,
+      /Unexpected closing tag `<\/a.c>`, expected corresponding closing tag for `<a.b>` \(1:7-1:12\)/,
       'should crash on mismatched tags (5)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a:b></a> charlie.')
       },
-      /Unexpected closing tag `<\/a>`, expected corresponding MDX closing tag for `<a:b>`/,
+      /Unexpected closing tag `<\/a>`, expected corresponding closing tag for `<a:b>` \(1:7-1:12\)/,
       'should crash on mismatched tags (6)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a></a:b> charlie.')
       },
-      /Unexpected closing tag `<\/a:b>`, expected corresponding MDX closing tag for `<a>`/,
+      /Unexpected closing tag `<\/a:b>`, expected corresponding closing tag for `<a>` \(1:7-1:10\)/,
       'should crash on mismatched tags (7)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a:b></a:c> charlie.')
       },
-      /Unexpected closing tag `<\/a:c>`, expected corresponding MDX closing tag for `<a:b>`/,
+      /Unexpected closing tag `<\/a:c>`, expected corresponding closing tag for `<a:b>` \(1:7-1:12\)/,
       'should crash on mismatched tags (8)'
     )
     t.throws(
       function () {
         basic.parse('Alpha <a:b></a.b> charlie.')
       },
-      /Unexpected closing tag `<\/a.b>`, expected corresponding MDX closing tag for `<a:b>`/,
+      /Unexpected closing tag `<\/a.b>`, expected corresponding closing tag for `<a:b>` \(1:7-1:12\)/,
       'should crash on mismatched tags (9)'
     )
 
@@ -869,7 +866,7 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <a>bravo</a/> charlie.')
       },
-      /Unexpected character `\/` \(U\+002F\) on closing tag before tag end, expected the end of the tag/,
+      /Unexpected self-closing slash `\/` in closing tag, expected the end of the tag/,
       'should crash on a self-closing closing tag'
     )
 
@@ -877,18 +874,18 @@ test('parse', function (t) {
       function () {
         basic.parse('Alpha <a>bravo</a b> charlie.')
       },
-      /Unexpected character `b` \(U\+0062\) on closing tag after name, expected the end of the tag instead of attributes on a closing tag/,
+      /Unexpected attribute in closing tag, expected the end of the tag/,
       'should crash on a closing tag with attributes'
     )
 
     t.deepEqual(
-      basic.parse('Alpha <>bravo <>charlie</> delta</>.'),
+      clean(basic.parse('Alpha <>bravo <>charlie</> delta</>.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: null, attributes: []}, [
+          u('mdxJsxTextElement', {name: null, attributes: []}, [
             u('text', 'bravo '),
-            u('mdxSpanElement', {name: null, attributes: []}, [
+            u('mdxJsxTextElement', {name: null, attributes: []}, [
               u('text', 'charlie')
             ]),
             u('text', ' delta')
@@ -900,18 +897,21 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse(
-        '<x y="Character references can be used: &quot;, &apos;, &lt;, &gt;, &#x7B;, and &#x7D;, they can be named, decimal, or hexadecimal: &copy; &#8800; &#x1D306;" />.'
+      clean(
+        basic.parse(
+          '<x y="Character references can be used: &quot;, &apos;, &lt;, &gt;, &#x7B;, and &#x7D;, they can be named, decimal, or hexadecimal: &copy; &#8800; &#x1D306;" />.'
+        ),
+        true
       ),
       u('root', [
         u('paragraph', [
           u(
-            'mdxSpanElement',
+            'mdxJsxTextElement',
             {
               name: 'x',
               attributes: [
                 u(
-                  'mdxAttribute',
+                  'mdxJsxAttribute',
                   {name: 'y'},
                   'Character references can be used: ", \', <, >, {, and }, they can be named, decimal, or hexadecimal: © ≠ 𝌆'
                 )
@@ -926,31 +926,19 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse(
-        '<x>Character references can be used: &quot;, &apos;, &lt;, &gt;, &#x7B;, and &#x7D;, they can be named, decimal, or hexadecimal: &copy; &#8800; &#x1D306;</x>.'
+      clean(
+        basic.parse(
+          '<x>Character references can be used: &quot;, &apos;, &lt;, &gt;, &#x7B;, and &#x7D;, they can be named, decimal, or hexadecimal: &copy; &#8800; &#x1D306;</x>.'
+        ),
+        true
       ),
       u('root', [
         u('paragraph', [
-          u('mdxSpanElement', {name: 'x', attributes: []}, [
-            u('text', 'Character references can be used: '),
-            // Note: remark splits these up to retain positional info.
-            u('text', '"'),
-            u('text', ', '),
-            u('text', "'"),
-            u('text', ', '),
-            u('text', '<'),
-            u('text', ', '),
-            u('text', '>'),
-            u('text', ', '),
-            u('text', '{'),
-            u('text', ', and '),
-            u('text', '}'),
-            u('text', ', they can be named, decimal, or hexadecimal: '),
-            u('text', '©'),
-            u('text', ' '),
-            u('text', '≠'),
-            u('text', ' '),
-            u('text', '𝌆')
+          u('mdxJsxTextElement', {name: 'x', attributes: []}, [
+            u(
+              'text',
+              'Character references can be used: ", \', <, >, {, and }, they can be named, decimal, or hexadecimal: © ≠ 팆'
+            )
           ]),
           u('text', '.')
         ])
@@ -959,21 +947,21 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('Alpha <x />'),
+      clean(basic.parse('Alpha <x />')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'x', attributes: []}, [])
+          u('mdxJsxTextElement', {name: 'x', attributes: []}, [])
         ])
       ]),
       'should parse as inline if the opening is not the first thing'
     )
 
     t.deepEqual(
-      basic.parse('<x />.'),
+      clean(basic.parse('<x />.')),
       u('root', [
         u('paragraph', [
-          u('mdxSpanElement', {name: 'x', attributes: []}, []),
+          u('mdxJsxTextElement', {name: 'x', attributes: []}, []),
           u('text', '.')
         ])
       ]),
@@ -981,27 +969,27 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<x />'),
-      u('root', [u('mdxBlockElement', {name: 'x', attributes: []}, [])]),
+      clean(basic.parse('<x />')),
+      u('root', [u('mdxJsxFlowElement', {name: 'x', attributes: []}, [])]),
       'should parse as block if the opening is the first, and the closing the last, thing'
     )
 
     t.deepEqual(
-      basic.parse('<x />\t '),
-      u('root', [u('mdxBlockElement', {name: 'x', attributes: []}, [])]),
+      clean(basic.parse('<x />\t ')),
+      u('root', [u('mdxJsxFlowElement', {name: 'x', attributes: []}, [])]),
       'should parse as block if the opening is the first, and the closing the last, thing (ignoring final whitespace)'
     )
 
     t.deepEqual(
-      basic.parse('\t <x />'),
-      u('root', [u('mdxBlockElement', {name: 'x', attributes: []}, [])]),
+      clean(basic.parse('\t <x />')),
+      u('root', [u('mdxJsxFlowElement', {name: 'x', attributes: []}, [])]),
       'should parse as block if the opening is the first, and the closing the last, thing (ignoring initial whitespace)'
     )
 
     t.deepEqual(
-      basic.parse('<x>\n# Heading\n</x>'),
+      clean(basic.parse('<x>\n# Heading\n</x>')),
       u('root', [
-        u('mdxBlockElement', {name: 'x', attributes: []}, [
+        u('mdxJsxFlowElement', {name: 'x', attributes: []}, [
           u('heading', {depth: 1}, [u('text', 'Heading')])
         ])
       ]),
@@ -1009,46 +997,54 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<x>Paragraph</x>'),
+      clean(basic.parse('<x>Paragraph</x>')),
       u('root', [
-        u('mdxBlockElement', {name: 'x', attributes: []}, [
-          u('paragraph', [u('text', 'Paragraph')])
+        u('paragraph', [
+          u('mdxJsxTextElement', {name: 'x', attributes: []}, [
+            u('text', 'Paragraph')
+          ])
         ])
       ]),
       'should parse content in blocks as block (2)'
     )
 
     t.deepEqual(
-      basic.parse('Alpha {1 + 1}'),
+      clean(basic.parse('Alpha {1 + 1}')),
       u('root', [
-        u('paragraph', [u('text', 'Alpha '), u('mdxSpanExpression', '1 + 1')])
+        u('paragraph', [
+          u('text', 'Alpha '),
+          u('mdxTextExpression', {data: {estree: null}}, '1 + 1')
+        ])
       ]),
       'should parse expressions as inline if the opening is not the first thing'
     )
 
     t.deepEqual(
-      basic.parse('{1 + 1}.'),
+      clean(basic.parse('{1 + 1}.')),
       u('root', [
-        u('paragraph', [u('mdxSpanExpression', '1 + 1'), u('text', '.')])
+        u('paragraph', [
+          u('mdxTextExpression', {data: {estree: null}}, '1 + 1'),
+          u('text', '.')
+        ])
       ]),
       'should parse expressions as inline if the closing is not the last thing'
     )
 
     t.deepEqual(
-      basic.parse('{1 + 1}'),
-      u('root', [u('mdxBlockExpression', '1 + 1')]),
+      clean(basic.parse('{1 + 1}')),
+      u('root', [u('mdxFlowExpression', {data: {estree: null}}, '1 + 1')]),
       'should parse expressions as block if the opening is the first, and the closing the last, thing'
     )
 
     t.deepEqual(
-      basic.parse('{1 + 1}\t '),
-      u('root', [u('mdxBlockExpression', '1 + 1')]),
+      clean(basic.parse('{1 + 1}\t ')),
+      u('root', [u('mdxFlowExpression', {data: {estree: null}}, '1 + 1')]),
       'should parse expressions as block if the opening is the first, and the closing the last, thing (ignoring final whitespace)'
     )
 
     t.deepEqual(
-      basic.parse('\t {1 + 1}'),
-      u('root', [u('mdxBlockExpression', '1 + 1')]),
+      clean(basic.parse('\t {1 + 1}')),
+      u('root', [u('mdxFlowExpression', {data: {estree: null}}, '1 + 1')]),
       'should parse expressions as block if the opening is the first, and the closing the last, thing (ignoring initial whitespace)'
     )
 
@@ -1057,11 +1053,11 @@ test('parse', function (t) {
 
   t.test('interplay', function (t) {
     t.deepEqual(
-      basic.parse('Alpha <b>\nbravo\n</b> charlie.'),
+      clean(basic.parse('Alpha <b>\nbravo\n</b> charlie.')),
       u('root', [
         u('paragraph', [
           u('text', 'Alpha '),
-          u('mdxSpanElement', {name: 'b', attributes: []}, [
+          u('mdxJsxTextElement', {name: 'b', attributes: []}, [
             u('text', '\nbravo\n')
           ]),
           u('text', ' charlie.')
@@ -1071,12 +1067,14 @@ test('parse', function (t) {
     )
 
     t.deepEqual(
-      basic.parse('<x># Hello, *{name}*!</x>'),
+      clean(basic.parse('<x># Hello, *{name}*!</x>')),
       u('root', [
-        u('mdxBlockElement', {name: 'x', attributes: []}, [
-          u('heading', {depth: 1}, [
-            u('text', 'Hello, '),
-            u('emphasis', [u('mdxSpanExpression', 'name')]),
+        u('paragraph', [
+          u('mdxJsxTextElement', {name: 'x', attributes: []}, [
+            u('text', '# Hello, '),
+            u('emphasis', [
+              u('mdxTextExpression', {data: {estree: null}}, 'name')
+            ]),
             u('text', '!')
           ])
         ])
@@ -1097,13 +1095,13 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
-          {attributes: [u('mdxAttribute', {name: 'bravo'})]},
+          'mdxJsxTextElement',
+          {attributes: [u('mdxJsxAttribute', {name: 'bravo'})]},
           []
         )
       )
     },
-    /Cannot serialize fragment with attributes/,
+    /Cannot serialize fragment w\/ attributes/,
     'should crash when serializing a boolean attribute on a fragment'
   )
 
@@ -1111,13 +1109,13 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
-          {attributes: [u('mdxAttribute', {name: 'bravo'}, 'bravo')]},
+          'mdxJsxTextElement',
+          {attributes: [u('mdxJsxAttribute', {name: 'bravo'}, 'bravo')]},
           []
         )
       )
     },
-    /Cannot serialize fragment with attributes/,
+    /Cannot serialize fragment w\/ attributes/,
     'should crash when serializing an attribute on a fragment'
   )
 
@@ -1125,13 +1123,13 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
-          {attributes: [u('mdxAttribute', {name: 'br:avo'}, 'bravo')]},
+          'mdxJsxTextElement',
+          {attributes: [u('mdxJsxAttribute', {name: 'br:avo'}, 'bravo')]},
           []
         )
       )
     },
-    /Cannot serialize fragment with attributes/,
+    /Cannot serialize fragment w\/ attributes/,
     'should crash when serializing a prefixed attribute on a fragment'
   )
 
@@ -1139,13 +1137,13 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
-          {attributes: [u('mdxAttributeExpression', '...props')]},
+          'mdxJsxTextElement',
+          {attributes: [u('mdxJsxExpressionAttribute', '...props')]},
           []
         )
       )
     },
-    /Cannot serialize fragment with attributes/,
+    /Cannot serialize fragment w\/ attributes/,
     'should crash when serializing an attribute expression on a fragment'
   )
 
@@ -1153,12 +1151,16 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
+          'mdxJsxTextElement',
           {
             attributes: [
-              u('mdxAttribute', {
+              u('mdxJsxAttribute', {
                 name: 'b',
-                value: u('mdxValueExpression', '1 + 1')
+                value: u(
+                  'mdxJsxAttributeValueExpression',
+                  {data: {estree: null}},
+                  '1 + 1'
+                )
               })
             ]
           },
@@ -1166,7 +1168,7 @@ test('stringify', function (t) {
         )
       )
     },
-    /Cannot serialize fragment with attributes/,
+    /Cannot serialize fragment w\/ attributes/,
     'should crash when serializing an attribute value expression on a fragment'
   )
 
@@ -1174,13 +1176,13 @@ test('stringify', function (t) {
     function () {
       basic.stringify(
         u(
-          'mdxSpanElement',
-          {name: 'x', attributes: [u('mdxAttribute', {value: 'bravo'})]},
+          'mdxJsxTextElement',
+          {name: 'x', attributes: [u('mdxJsxAttribute', {value: 'bravo'})]},
           []
         )
       )
     },
-    /Cannot serialize attribute without name/,
+    /Cannot serialize attribute w\/o name/,
     'should crash when serializing an attribute w/o name'
   )
 
@@ -1188,11 +1190,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', []),
+        u('mdxJsxTextElement', []),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <></> charlie.',
+    'Alpha <></> charlie.\n',
     'should serialize an empty nameless fragment'
   )
 
@@ -1200,11 +1202,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', {name: 'b'}, []),
+        u('mdxJsxTextElement', {name: 'b'}, []),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b/> charlie.',
+    'Alpha <b/> charlie.\n',
     'should serialize a tag with a name'
   )
 
@@ -1213,14 +1215,14 @@ test('stringify', function (t) {
       u('paragraph', [
         u('text', 'Alpha '),
         u(
-          'mdxSpanElement',
-          {name: 'b', attributes: [u('mdxAttribute', {name: 'bravo'})]},
+          'mdxJsxTextElement',
+          {name: 'b', attributes: [u('mdxJsxAttribute', {name: 'bravo'})]},
           []
         ),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b bravo/> charlie.',
+    'Alpha <b bravo/> charlie.\n',
     'should serialize a boolean attribute (element)'
   )
 
@@ -1229,17 +1231,17 @@ test('stringify', function (t) {
       u('paragraph', [
         u('text', 'Alpha '),
         u(
-          'mdxSpanElement',
+          'mdxJsxTextElement',
           {
             name: 'b',
-            attributes: [u('mdxAttribute', {name: 'bravo'}, 'bravo')]
+            attributes: [u('mdxJsxAttribute', {name: 'bravo'}, 'bravo')]
           },
           []
         ),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b bravo="bravo"/> charlie.',
+    'Alpha <b bravo="bravo"/> charlie.\n',
     'should serialize an attribute (element)'
   )
 
@@ -1248,17 +1250,17 @@ test('stringify', function (t) {
       u('paragraph', [
         u('text', 'Alpha '),
         u(
-          'mdxSpanElement',
+          'mdxJsxTextElement',
           {
             name: 'b',
-            attributes: [u('mdxAttribute', {name: 'br:avo'}, 'bravo')]
+            attributes: [u('mdxJsxAttribute', {name: 'br:avo'}, 'bravo')]
           },
           []
         ),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b br:avo="bravo"/> charlie.',
+    'Alpha <b br:avo="bravo"/> charlie.\n',
     'should serialize a prefixed attribute (element)'
   )
 
@@ -1267,14 +1269,14 @@ test('stringify', function (t) {
       u('paragraph', [
         u('text', 'Alpha '),
         u(
-          'mdxSpanElement',
-          {name: 'b', attributes: [u('mdxAttributeExpression', '...props')]},
+          'mdxJsxTextElement',
+          {name: 'b', attributes: [u('mdxJsxExpressionAttribute', '...props')]},
           []
         ),
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b {...props}/> charlie.',
+    'Alpha <b {...props}/> charlie.\n',
     'should serialize a attribute expression (element)'
   )
 
@@ -1283,13 +1285,17 @@ test('stringify', function (t) {
       u('paragraph', [
         u('text', 'Alpha '),
         u(
-          'mdxSpanElement',
+          'mdxJsxTextElement',
           {
             name: 'b',
             attributes: [
-              u('mdxAttribute', {
+              u('mdxJsxAttribute', {
                 name: 'b',
-                value: u('mdxValueExpression', '1 + 1')
+                value: u(
+                  'mdxJsxAttributeValueExpression',
+                  {data: {estree: null}},
+                  '1 + 1'
+                )
               })
             ]
           },
@@ -1298,7 +1304,7 @@ test('stringify', function (t) {
         u('text', ' charlie.')
       ])
     ),
-    'Alpha <b b={1 + 1}/> charlie.',
+    'Alpha <b b={1 + 1}/> charlie.\n',
     'should serialize an expression attribute (element)'
   )
 
@@ -1308,7 +1314,7 @@ test('stringify', function (t) {
         u('link', {url: 'https://mdxjs.com'}, [u('text', 'https://mdxjs.com')])
       ])
     ),
-    '[https://mdxjs.com](https://mdxjs.com)',
+    '[https://mdxjs.com](https://mdxjs.com)\n',
     'should write out a url as the raw value'
   )
 
@@ -1316,13 +1322,13 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [u('link', {url: 'https://mdxjs.com'}, [])])
     ),
-    '[](https://mdxjs.com)',
+    '[](https://mdxjs.com)\n',
     'should support links w/o content'
   )
 
   t.equal(
     basic.stringify(u('paragraph', [u('link', {}, [u('text', '')])])),
-    '[](<>)',
+    '[]()\n',
     'should support links w/o url'
   )
 
@@ -1330,7 +1336,7 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [u('link', {url: 'a', title: 'b'}, [u('text', 'c')])])
     ),
-    '[c](a "b")',
+    '[c](a "b")\n',
     'should support links w/ title'
   )
 
@@ -1338,7 +1344,7 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', [
+        u('mdxJsxTextElement', [
           u('text', 'bravo '),
           u('strong', [u('text', 'charlie')]),
           u('text', ' delta')
@@ -1346,19 +1352,19 @@ test('stringify', function (t) {
         u('text', ' echo.')
       ])
     ),
-    'Alpha <>bravo **charlie** delta</> echo.',
-    'should serialize a content'
+    'Alpha <>bravo **charlie** delta</> echo.\n',
+    'should serialize content'
   )
 
   t.equal(
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', [u('text', '1 < 3')]),
+        u('mdxJsxTextElement', [u('text', '1 < 3')]),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha <>1 &lt; 3</> bravo.',
+    'Alpha <>1 \\< 3</> bravo.\n',
     'should encode `<` in text'
   )
 
@@ -1366,11 +1372,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', [u('text', '1 > 3')]),
+        u('mdxJsxTextElement', [u('text', '1 > 3')]),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha <>1 > 3</> bravo.',
+    'Alpha <>1 > 3</> bravo.\n',
     'should *not* encode `>` in text'
   )
 
@@ -1378,11 +1384,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u(
-          'mdxSpanElement',
+          'mdxJsxTextElement',
           {
             name: 'x',
             attributes: [
-              u('mdxAttribute', {
+              u('mdxJsxAttribute', {
                 name: 'y',
                 value: '", \', <, >, {, }, ©, ≠, and 𝌆.'
               })
@@ -1393,14 +1399,14 @@ test('stringify', function (t) {
         u('text', '.')
       ])
     ),
-    '<x y="&quot;, \', <, >, {, }, ©, ≠, and 𝌆."/>.',
+    '<x y="&#x22;, \', <, >, {, }, ©, ≠, and 𝌆."/>.\n',
     'should encode `"` in attribute values, but no other character references.'
   )
 
   t.deepEqual(
     basic.stringify(
       u('paragraph', [
-        u('mdxSpanElement', {name: 'x'}, [
+        u('mdxJsxTextElement', {name: 'x'}, [
           u(
             'text',
             'Character references can be used: ", \', <, >, {, and }, they can be named, decimal, or hexadecimal: © ≠ 𝌆'
@@ -1409,7 +1415,7 @@ test('stringify', function (t) {
         u('text', '.')
       ])
     ),
-    '<x>Character references can be used: ", \', &lt;, >, &#x7B;, and }, they can be named, decimal, or hexadecimal: © ≠ 𝌆</x>.',
+    '<x>Character references can be used: ", \', \\<, >, \\{, and }, they can be named, decimal, or hexadecimal: © ≠ 𝌆</x>.\n',
     'should encode `"`, `\'`, `<`, and `{` in text, but no other character references.'
   )
 
@@ -1417,11 +1423,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', [u('text', '1 { 3')]),
+        u('mdxJsxTextElement', [u('text', '1 { 3')]),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha <>1 &#x7B; 3</> bravo.',
+    'Alpha <>1 \\{ 3</> bravo.\n',
     'should encode `{` in text'
   )
 
@@ -1429,11 +1435,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanElement', [u('text', '1 } 3')]),
+        u('mdxJsxTextElement', [u('text', '1 } 3')]),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha <>1 } 3</> bravo.',
+    'Alpha <>1 } 3</> bravo.\n',
     'should *not* encode `}` in text'
   )
 
@@ -1441,11 +1447,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanExpression'),
+        u('mdxTextExpression'),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha {} bravo.',
+    'Alpha {} bravo.\n',
     'should serialize empty expressions'
   )
 
@@ -1453,11 +1459,11 @@ test('stringify', function (t) {
     basic.stringify(
       u('paragraph', [
         u('text', 'Alpha '),
-        u('mdxSpanExpression', '1 + 1'),
+        u('mdxTextExpression', '1 + 1'),
         u('text', ' bravo.')
       ])
     ),
-    'Alpha {1 + 1} bravo.',
+    'Alpha {1 + 1} bravo.\n',
     'should serialize expressions'
   )
 
@@ -1468,16 +1474,15 @@ test('fixtures', function (t) {
   fs.readdirSync(base)
     .filter((d) => /\.md$/.test(d))
     .forEach((name) => {
-      let position = unified().use(parse).use(stringify).use(mdx)
-      let noPosition = unified().use(parse, {position: false}).use(mdx)
+      console.log(name)
+      let proc = unified().use(parse).use(stringify).use(mdx)
       let fpIn = path.join(base, name)
       let fpExpected = fpIn.replace(/\.md$/, '.json')
       let fpExpectedDoc = fpIn.replace(/\.md$/, '.out')
       let input = vfile.readSync(fpIn)
-      let tree = position.parse(input)
-      let doc = position.stringify(tree)
-      let treeB = noPosition.parse(input)
-      let reparsed = noPosition.parse(doc)
+      let tree = proc.parse(input)
+      let doc = proc.stringify(tree)
+      let reparsed
       let expected
       let expectedDoc
 
@@ -1491,6 +1496,8 @@ test('fixtures', function (t) {
         })
       }
 
+      t.deepLooseEqual(tree, expected, input.stem + ' (tree)')
+
       try {
         expectedDoc = String(vfile.readSync(fpExpectedDoc))
       } catch (_) {
@@ -1505,10 +1512,51 @@ test('fixtures', function (t) {
       // Windows.
       expectedDoc = expectedDoc.replace(/\r\n/g, '\n')
 
-      t.deepLooseEqual(tree, expected, input.stem + ' (tree)')
       t.deepEqual(doc, expectedDoc, input.stem + ' (doc)')
-      t.deepEqual(reparsed, treeB, input.stem + ' (re)')
+
+      reparsed = proc.parse(doc)
+
+      t.deepEqual(clean(reparsed), clean(tree), input.stem + ' (re)')
     })
 
   t.end()
 })
+
+function clean(tree) {
+  remove(tree, true)
+  cleanEstree(tree)
+  return tree
+}
+
+function cleanEstree(tree) {
+  visit(
+    tree,
+    [
+      'mdxjsEsm',
+      'mdxTextExpression',
+      'mdxFlowExpression',
+      'mdxJsxTextElement',
+      'mdxJsxFlowElement'
+    ],
+    onvisit
+  )
+  return tree
+
+  function onvisit(node) {
+    if (node.data && node.data.estree) {
+      node.data.estree = null
+    }
+
+    if (
+      node.type === 'mdxJsxTextElement' ||
+      node.type === 'mdxJsxFlowElement'
+    ) {
+      node.attributes.forEach(onattribute)
+    }
+  }
+
+  function onattribute(node) {
+    onvisit(node)
+    if (node.value) onvisit(node.value)
+  }
+}
diff --git a/packages/remark-mdxjs/extract-imports-and-exports.js b/packages/remark-mdxjs/extract-imports-and-exports.js
deleted file mode 100644
index 45a1a03c4..000000000
--- a/packages/remark-mdxjs/extract-imports-and-exports.js
+++ /dev/null
@@ -1,105 +0,0 @@
-const {transformSync} = require('@babel/core')
-const declare = require('@babel/helper-plugin-utils').declare
-const syntaxJsxPlugin = require('@babel/plugin-syntax-jsx')
-const proposalObjectRestSpreadPlugin = require('@babel/plugin-proposal-object-rest-spread')
-
-class BabelPluginExtractImportsAndExports {
-  constructor() {
-    const nodes = []
-    this.state = {nodes}
-
-    this.plugin = declare(api => {
-      api.assertVersion(7)
-
-      return {
-        visitor: {
-          ExportDefaultDeclaration(path) {
-            const {start} = path.node
-            nodes.push({type: 'export', start, default: true})
-          },
-          ExportNamedDeclaration(path) {
-            const {start} = path.node
-            nodes.push({type: 'export', start})
-          },
-          ExportAllDeclaration(path) {
-            const {start} = path.node
-            nodes.push({type: 'export', start})
-          },
-          ImportDeclaration(path) {
-            const {start} = path.node
-
-            // Imports that are used in exports can end up as
-            // ImportDeclarations with no start/end metadata,
-            // these can be ignored
-            /* istanbul ignore if - To do: find a test to reproduce this. */
-            if (start === undefined) {
-              return
-            }
-
-            nodes.push({type: 'import', start})
-          }
-        }
-      }
-    })
-  }
-}
-
-const partitionString = (str, indices) =>
-  indices.map((val, i) => {
-    return str.slice(val, indices[i + 1])
-  })
-
-module.exports = (value, vfile) => {
-  const instance = new BabelPluginExtractImportsAndExports()
-
-  transformSync(value, {
-    plugins: [syntaxJsxPlugin, proposalObjectRestSpreadPlugin, instance.plugin],
-    filename: vfile.path,
-    configFile: false,
-    babelrc: false
-  })
-
-  const sortedNodes = instance.state.nodes.sort((a, b) => a.start - b.start)
-  const nodeStarts = sortedNodes.map(n => n.start)
-  const values = partitionString(value, nodeStarts)
-
-  const allNodes = sortedNodes.map(({start: _, ...node}, i) => {
-    const value = values[i]
-    return {...node, value}
-  })
-
-  // Group adjacent nodes of the same type so that they can be combined
-  // into a single node later, this also ensures that order is preserved
-  let currType = allNodes[0].type
-  const groupedNodes = allNodes.reduce(
-    (acc, curr) => {
-      // Default export nodes shouldn't be grouped with other exports
-      // because they're handled specially by MDX
-      if (curr.default) {
-        currType = 'default'
-        return [...acc, [curr]]
-      }
-
-      if (curr.type === currType) {
-        const lastNodes = acc.pop()
-        return [...acc, [...lastNodes, curr]]
-      }
-
-      currType = curr.type
-      return [...acc, [curr]]
-    },
-    [[]]
-  )
-
-  // Combine adjacent nodes into a single node
-  return groupedNodes
-    .filter(a => a.length)
-    .reduce((acc, curr) => {
-      const node = curr.reduce((acc, curr) => ({
-        ...acc,
-        value: acc.value + curr.value
-      }))
-
-      return [...acc, node]
-    }, [])
-}
diff --git a/packages/remark-mdxjs/index.js b/packages/remark-mdxjs/index.js
deleted file mode 100644
index d18ebac9b..000000000
--- a/packages/remark-mdxjs/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const extractImportsAndExports = require('./extract-imports-and-exports')
-
-module.exports = mdxjs
-mdxjs.default = mdxjs
-
-tokenizeEsSyntax.notInBlock = true
-
-function mdxjs() {
-  const parser = this.Parser
-  const compiler = this.Compiler
-
-  // If `remark-parse` seems to be attached.
-  if (parser && parser.prototype && parser.prototype.blockTokenizers) {
-    attachParser(parser)
-  }
-
-  // If `remark-stringify` seems to be attached.
-  if (compiler && compiler.prototype && compiler.prototype.visitors) {
-    attachCompiler(compiler)
-  }
-}
-
-function attachParser(parser) {
-  const blocks = parser.prototype.blockTokenizers
-  const methods = parser.prototype.blockMethods
-
-  blocks.esSyntax = tokenizeEsSyntax
-
-  methods.splice(methods.indexOf('paragraph'), 0, 'esSyntax')
-}
-
-function attachCompiler(compiler) {
-  const proto = compiler.prototype
-
-  proto.visitors = Object.assign({}, proto.visitors, {
-    import: stringifyEsSyntax,
-    export: stringifyEsSyntax
-  })
-}
-
-function stringifyEsSyntax(node) {
-  return node.value.trim()
-}
-
-function tokenizeEsSyntax(eat, value) {
-  const index = value.indexOf('\n\n')
-  const subvalue = index !== -1 ? value.slice(0, index) : value
-
-  if (/^(export|import)\s/.test(value)) {
-    const nodes = extractImportsAndExports(subvalue, this.file)
-    nodes.map(node => eat(node.value)(node))
-  }
-}
diff --git a/packages/remark-mdxjs/package.json b/packages/remark-mdxjs/package.json
index 67f5a9d10..f868aa733 100644
--- a/packages/remark-mdxjs/package.json
+++ b/packages/remark-mdxjs/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "remark-mdxjs",
   "version": "2.0.0-next.8",
   "description": "Support import, export, and JSX in markdown",
@@ -31,10 +32,8 @@
     "mdxast"
   ],
   "dependencies": {
-    "@babel/core": "7.10.5",
-    "@babel/helper-plugin-utils": "7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "7.10.4",
-    "@babel/plugin-syntax-jsx": "7.10.4"
+    "mdast-util-mdx": "^0.1.0",
+    "micromark-extension-mdxjs": "^0.1.0"
   },
   "scripts": {
     "test-api": "jest test",
@@ -43,10 +42,9 @@
     "test": "yarn test-coverage"
   },
   "devDependencies": {
-    "remark-parse": "^8.0.0",
-    "remark-stringify": "^8.0.0",
-    "unified": "^9.2.0",
-    "vfile": "^4.2.0"
+    "remark-parse": "^9.0.0",
+    "remark-stringify": "^9.0.1",
+    "unified": "^9.2.0"
   },
   "gitHead": "bf7deab69996449cb99c2217dff75e65855eb2c1"
 }
diff --git a/packages/remark-mdxjs/readme.md b/packages/remark-mdxjs/readme.md
index 9d0922d94..4eb51fa57 100644
--- a/packages/remark-mdxjs/readme.md
+++ b/packages/remark-mdxjs/readme.md
@@ -4,24 +4,10 @@
 [![lerna][lerna-badge]][lerna]
 [![Join the community on Spectrum][spectrum-badge]][spectrum]
 
-> :warning: This project is currently in alpha
+Deprecated!
 
-[MDX][] syntax support for [remark][].
-
-## Installation
-
-```sh
-npm install --save remark-mdxjs
-```
-
-## Contribute
-
-See the [Support][] and [Contributing][] guidelines on the MDX website for ways
-to (get) help.
-
-This project has a [Code of Conduct][coc].
-By interacting with this repository, organisation, or community you agree to
-abide by its terms.
+Created for but no longer used in the [MDX](https://mdxjs.com)@2 alpha.
+The previous behavior is now in `remark-mdx`.
 
 ## License
 
diff --git a/packages/remark-mdxjs/test/__snapshots__/test.js.snap b/packages/remark-mdxjs/test/__snapshots__/test.js.snap
deleted file mode 100644
index c19524012..000000000
--- a/packages/remark-mdxjs/test/__snapshots__/test.js.snap
+++ /dev/null
@@ -1,681 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Handles an import that is later exported 1`] = `
-Array [
-  Object {
-    "type": "import",
-    "value": "import Layout from './Foo'
-
-",
-  },
-  Object {
-    "default": true,
-    "type": "export",
-    "value": "export default Layout",
-  },
-]
-`;
-
-exports[`Handles basic usecase of default export 1`] = `
-Array [
-  Object {
-    "default": true,
-    "type": "export",
-    "value": "export default props => <article {...props} />",
-  },
-]
-`;
-
-exports[`Handles const exports 1`] = `
-Array [
-  Object {
-    "type": "export",
-    "value": "export const metadata = { some: \\"stuff\\" }",
-  },
-]
-`;
-
-exports[`Handles export all 1`] = `
-Array [
-  Object {
-    "type": "export",
-    "value": "export * from './foo'",
-  },
-]
-`;
-
-exports[`Handles multiline default exports 1`] = `
-Array [
-  Object {
-    "default": true,
-    "type": "export",
-    "value": "export default props => (
-  <main {...props} />
-)",
-  },
-]
-`;
-
-exports[`Handles multiline exports 1`] = `
-Array [
-  Object {
-    "type": "export",
-    "value": "export const metadata = {
-  some: \\"stuff\\"
-}",
-  },
-]
-`;
-
-exports[`Separates import from the default export 1`] = `
-Array [
-  Object {
-    "type": "import",
-    "value": "import Foo from './foo'
-",
-  },
-  Object {
-    "default": true,
-    "type": "export",
-    "value": "export default props => <article {...props} />",
-  },
-]
-`;
-
-exports[`should maintain the proper positional info 1`] = `
-Object {
-  "children": Array [
-    Object {
-      "position": Position {
-        "end": Object {
-          "column": 1,
-          "line": 3,
-          "offset": 25,
-        },
-        "indent": Array [
-          1,
-        ],
-        "start": Object {
-          "column": 1,
-          "line": 2,
-          "offset": 1,
-        },
-      },
-      "type": "import",
-      "value": "import Foo from './bar'
-",
-    },
-    Object {
-      "position": Position {
-        "end": Object {
-          "column": 1,
-          "line": 4,
-          "offset": 53,
-        },
-        "indent": Array [
-          1,
-        ],
-        "start": Object {
-          "column": 1,
-          "line": 3,
-          "offset": 25,
-        },
-      },
-      "type": "export",
-      "value": "export { Baz } from './foo'
-",
-    },
-    Object {
-      "default": true,
-      "position": Position {
-        "end": Object {
-          "column": 19,
-          "line": 4,
-          "offset": 71,
-        },
-        "indent": Array [],
-        "start": Object {
-          "column": 1,
-          "line": 4,
-          "offset": 53,
-        },
-      },
-      "type": "export",
-      "value": "export default Foo",
-    },
-    Object {
-      "children": Array [
-        Object {
-          "position": Position {
-            "end": Object {
-              "column": 17,
-              "line": 6,
-              "offset": 89,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 3,
-              "line": 6,
-              "offset": 75,
-            },
-          },
-          "type": "text",
-          "value": "Hello, world! ",
-        },
-        Object {
-          "attributes": Array [
-            Object {
-              "name": "bar",
-              "position": Object {
-                "end": Object {
-                  "column": 42,
-                  "line": 6,
-                  "offset": 114,
-                },
-                "start": Object {
-                  "column": 22,
-                  "line": 6,
-                  "offset": 94,
-                },
-              },
-              "type": "mdxAttribute",
-              "value": Object {
-                "position": Object {
-                  "end": Object {
-                    "column": 42,
-                    "line": 6,
-                    "offset": 114,
-                  },
-                  "start": Object {
-                    "column": 26,
-                    "line": 6,
-                    "offset": 98,
-                  },
-                },
-                "type": "mdxValueExpression",
-                "value": "{ baz: 'qux' }",
-              },
-            },
-          ],
-          "children": Array [],
-          "name": "Foo",
-          "position": Position {
-            "end": Object {
-              "column": 45,
-              "line": 6,
-              "offset": 117,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 17,
-              "line": 6,
-              "offset": 89,
-            },
-          },
-          "type": "mdxSpanElement",
-        },
-      ],
-      "depth": 1,
-      "position": Position {
-        "end": Object {
-          "column": 45,
-          "line": 6,
-          "offset": 117,
-        },
-        "indent": Array [],
-        "start": Object {
-          "column": 1,
-          "line": 6,
-          "offset": 73,
-        },
-      },
-      "type": "heading",
-    },
-    Object {
-      "attributes": Array [],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 6,
-                  "line": 9,
-                  "offset": 130,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 1,
-                  "line": 9,
-                  "offset": 125,
-                },
-              },
-              "type": "text",
-              "value": "Hi!",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 6,
-              "line": 9,
-              "offset": 130,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 1,
-              "line": 9,
-              "offset": 125,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": "Baz",
-      "position": Position {
-        "end": Object {
-          "column": 7,
-          "line": 10,
-          "offset": 137,
-        },
-        "indent": Array [
-          1,
-          1,
-        ],
-        "start": Object {
-          "column": 1,
-          "line": 8,
-          "offset": 119,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-    Object {
-      "attributes": Array [
-        Object {
-          "name": "bg",
-          "position": Object {
-            "end": Object {
-              "column": 24,
-              "line": 12,
-              "offset": 162,
-            },
-            "start": Object {
-              "column": 12,
-              "line": 12,
-              "offset": 150,
-            },
-          },
-          "type": "mdxAttribute",
-          "value": "red.500",
-        },
-        Object {
-          "name": "color",
-          "position": Object {
-            "end": Object {
-              "column": 38,
-              "line": 12,
-              "offset": 176,
-            },
-            "start": Object {
-              "column": 25,
-              "line": 12,
-              "offset": 163,
-            },
-          },
-          "type": "mdxAttribute",
-          "value": "white",
-        },
-      ],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 42,
-                  "line": 12,
-                  "offset": 180,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 39,
-                  "line": 12,
-                  "offset": 177,
-                },
-              },
-              "type": "text",
-              "value": "Foo",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 42,
-              "line": 12,
-              "offset": 180,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 39,
-              "line": 12,
-              "offset": 177,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": "Paragraph",
-      "position": Position {
-        "end": Object {
-          "column": 54,
-          "line": 12,
-          "offset": 192,
-        },
-        "indent": Array [],
-        "start": Object {
-          "column": 1,
-          "line": 12,
-          "offset": 139,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-    Object {
-      "attributes": Array [],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 6,
-                  "line": 15,
-                  "offset": 208,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 1,
-                  "line": 15,
-                  "offset": 203,
-                },
-              },
-              "type": "text",
-              "value": "Hi!",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 6,
-              "line": 15,
-              "offset": 208,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 1,
-              "line": 15,
-              "offset": 203,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": "Button",
-      "position": Position {
-        "end": Object {
-          "column": 10,
-          "line": 16,
-          "offset": 218,
-        },
-        "indent": Array [
-          1,
-          1,
-        ],
-        "start": Object {
-          "column": 1,
-          "line": 14,
-          "offset": 194,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-    Object {
-      "attributes": Array [],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 6,
-                  "line": 18,
-                  "offset": 225,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 3,
-                  "line": 18,
-                  "offset": 222,
-                },
-              },
-              "type": "text",
-              "value": "Foo",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 6,
-              "line": 18,
-              "offset": 225,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 3,
-              "line": 18,
-              "offset": 222,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": null,
-      "position": Position {
-        "end": Object {
-          "column": 9,
-          "line": 18,
-          "offset": 228,
-        },
-        "indent": Array [],
-        "start": Object {
-          "column": 1,
-          "line": 18,
-          "offset": 220,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-    Object {
-      "attributes": Array [],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 6,
-                  "line": 21,
-                  "offset": 238,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 1,
-                  "line": 21,
-                  "offset": 233,
-                },
-              },
-              "type": "text",
-              "value": "Foo",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 6,
-              "line": 21,
-              "offset": 238,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 1,
-              "line": 21,
-              "offset": 233,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": null,
-      "position": Position {
-        "end": Object {
-          "column": 4,
-          "line": 22,
-          "offset": 242,
-        },
-        "indent": Array [
-          1,
-          1,
-        ],
-        "start": Object {
-          "column": 1,
-          "line": 20,
-          "offset": 230,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-    Object {
-      "attributes": Array [],
-      "children": Array [
-        Object {
-          "children": Array [
-            Object {
-              "position": Position {
-                "end": Object {
-                  "column": 18,
-                  "line": 24,
-                  "offset": 261,
-                },
-                "indent": Array [],
-                "start": Object {
-                  "column": 5,
-                  "line": 24,
-                  "offset": 248,
-                },
-              },
-              "type": "text",
-              "value": "Hello, world!",
-            },
-          ],
-          "position": Position {
-            "end": Object {
-              "column": 18,
-              "line": 24,
-              "offset": 261,
-            },
-            "indent": Array [],
-            "start": Object {
-              "column": 5,
-              "line": 24,
-              "offset": 248,
-            },
-          },
-          "type": "paragraph",
-        },
-      ],
-      "name": "h1",
-      "position": Position {
-        "end": Object {
-          "column": 23,
-          "line": 24,
-          "offset": 266,
-        },
-        "indent": Array [],
-        "start": Object {
-          "column": 1,
-          "line": 24,
-          "offset": 244,
-        },
-      },
-      "type": "mdxBlockElement",
-    },
-  ],
-  "position": Object {
-    "end": Object {
-      "column": 1,
-      "line": 25,
-      "offset": 267,
-    },
-    "start": Object {
-      "column": 1,
-      "line": 1,
-      "offset": 0,
-    },
-  },
-  "type": "root",
-}
-`;
-
-exports[`should remove newlines between imports and exports 1`] = `
-"import Foo1 from \\"./foo\\"
-import Foo2 from \\"./foo\\"
-import Foo3 from \\"./foo\\"
-
-export const foo = \\"bar\\"
-
-export default props => <article {...props} />
-
-export const fred = \\"flintstone\\"
-"
-`;
-
-exports[`should transpile 1`] = `
-"import Foo from './bar'
-
-export { Baz } from './foo';
-const makeShortcode = name => function MDXDefaultShortcode(props) {
-  console.warn(\\"Component \\" + name + \\" was not imported, exported, or provided by MDXProvider as global scope\\")
-  return <div {...props}/>
-};
-const Paragraph = makeShortcode(\\"Paragraph\\");
-const Button = makeShortcode(\\"Button\\");
-const MDXLayout = Foo
-export default function MDXContent({
-  components,
-  ...props
-}) {
-  return <MDXLayout {...props} components={components} mdxType=\\"MDXLayout\\">
-    <h1>{\`Hello, world! \`}
-      <Foo bar={{
-        baz: 'qux'
-      }} mdxType=\\"Foo\\" /></h1>
-    <Baz mdxType=\\"Baz\\">
-      <p>{\`Hi!\`}</p>
-    </Baz>
-    <Paragraph bg=\\"red.500\\" color=\\"white\\" mdxType=\\"Paragraph\\">
-      <p>{\`Foo\`}</p>
-    </Paragraph>
-    <Button mdxType=\\"Button\\">
-      <p>{\`Hi!\`}</p>
-    </Button>
-    <>
-      <p>{\`Foo\`}</p>
-    </>
-    <>
-      <p>{\`Foo\`}</p>
-    </>
-    <h1>
-      <p>{\`Hello, world!\`}</p>
-    </h1>
-  </MDXLayout>;
-}
-
-;
-MDXContent.isMDXComponent = true;"
-`;
diff --git a/packages/remark-mdxjs/test/test.js b/packages/remark-mdxjs/test/test.js
deleted file mode 100644
index c866f7148..000000000
--- a/packages/remark-mdxjs/test/test.js
+++ /dev/null
@@ -1,161 +0,0 @@
-const vfile = require('vfile')
-const unified = require('unified')
-const remarkParse = require('remark-parse')
-const remarkStringify = require('remark-stringify')
-const remarkMdx = require('../../remark-mdx')
-const remarkMdxjs = require('..')
-const mdxAstToMdxHast = require('../../mdx/mdx-ast-to-mdx-hast')
-const mdxHastToJsx = require('../../mdx/mdx-hast-to-jsx')
-const extract = require('../extract-imports-and-exports')
-
-const FIXTURE = `
-import Foo from './bar'
-export { Baz } from './foo'
-export default Foo
-
-# Hello, world! <Foo bar={{ baz: 'qux' }} />
-
-<Baz>
-  Hi!
-</Baz>
-
-<Paragraph bg='red.500' color='white'>Foo</Paragraph>
-
-<Button>
-  Hi!
-</Button>
-
-<>Foo</>
-
-<>
-  Foo
-</>
-
-<h1>Hello, world!</h1>
-`
-
-const fixtures = [
-  {
-    description: 'Handles basic usecase of default export',
-    mdx: 'export default props => <article {...props} />'
-  },
-  {
-    description: 'Handles an import that is later exported',
-    mdx: "import Layout from './Foo'\n\nexport default Layout"
-  },
-  {
-    description: 'Separates import from the default export',
-    mdx:
-      "import Foo from './foo'\nexport default props => <article {...props} />"
-  },
-  {
-    description: 'Handles const exports',
-    mdx: 'export const metadata = { some: "stuff" }'
-  },
-  {
-    description: 'Handles multiline exports',
-    mdx: 'export const metadata = {\n  some: "stuff"\n}'
-  },
-  {
-    description: 'Handles multiline default exports',
-    mdx: 'export default props => (\n  <main {...props} />\n)'
-  },
-  {
-    description: 'Handles export all',
-    mdx: "export * from './foo'"
-  }
-]
-
-// Manually apply all mdx transformations for now
-// so we don't introduce a circular dependency.
-//
-// When remark-mdxjs is used by core we can remove
-// these integration tests
-const compiler = unified()
-  .use(remarkParse)
-  .use(remarkStringify)
-  .use(remarkMdx)
-  .use(remarkMdxjs)
-  .use(mdxAstToMdxHast)
-  .use(mdxHastToJsx)
-
-it('should transpile', () => {
-  const result = compiler.processSync(FIXTURE).toString()
-
-  expect(result).toMatchSnapshot()
-})
-
-it('should maintain the proper positional info', () => {
-  const result = unified()
-    .use(remarkParse)
-    .use(remarkStringify)
-    .use(remarkMdx)
-    .use(remarkMdxjs)
-    .parse(FIXTURE)
-
-  expect(result).toMatchSnapshot()
-})
-
-it('should remove newlines between imports and exports', () => {
-  const fixture = [
-    'import Foo1 from "./foo"',
-    'import Foo2 from "./foo"',
-    'import Foo3 from "./foo"',
-    'export const foo = "bar"',
-    'export default props => <article {...props} />',
-    'export const fred = "flintstone"'
-  ].join('\n')
-
-  const result = unified()
-    .use(remarkParse)
-    .use(remarkStringify)
-    .use(remarkMdx)
-    .use(remarkMdxjs)
-    .processSync(fixture)
-    .toString()
-
-  expect(result).toMatchSnapshot()
-})
-
-it('should extend the parser', () => {
-  expect(
-    unified().use(remarkParse).use(remarkMdxjs).parse('import a from "b"')
-  ).toEqual({
-    type: 'root',
-    children: [
-      {
-        type: 'import',
-        value: 'import a from "b"',
-        position: {
-          start: {column: 1, line: 1, offset: 0},
-          end: {column: 18, line: 1, offset: 17},
-          indent: []
-        }
-      }
-    ],
-    position: {
-      start: {column: 1, line: 1, offset: 0},
-      end: {column: 18, line: 1, offset: 17}
-    }
-  })
-})
-
-it('should extend the compiler', () => {
-  expect(
-    unified()
-      .use(remarkStringify)
-      .use(remarkMdxjs)
-      .stringify({type: 'import', value: 'import a from "b"'})
-  ).toEqual('import a from "b"')
-})
-
-fixtures.forEach(fixture => {
-  it(fixture.description, () => {
-    const result = extract(
-      fixture.mdx,
-      vfile({path: '/test', content: 'testing'})
-    )
-
-    expect(result).toMatchSnapshot()
-  })
-})
diff --git a/packages/runtime/test/index.test.js b/packages/runtime/test/index.test.js
index 735e01169..c651cbba6 100644
--- a/packages/runtime/test/index.test.js
+++ b/packages/runtime/test/index.test.js
@@ -63,20 +63,22 @@ describe('@mdx-js/runtime', () => {
     expect(() => {
       renderToString(<MDX children={'<//>'} />)
     }).toThrow(
-      'Unexpected character `/` (U+002F) before name, expected an opening tag first as there are no open elements'
+      'Unexpected character `/` (U+002F) before name, expected a character that can start a name'
     )
   })
 
   it('should crash if non-syntactical JSX in JS is used', async () => {
     expect(() => {
       renderToString(<MDX children={'{<//>}'} />)
-    }).toThrow('Unexpected token')
+    }).toThrow(
+      'Could not parse expression with acorn: SyntaxError: Unexpected token'
+    )
   })
 
   it('should crash if non-syntactical JS is used', async () => {
     expect(() => {
       renderToString(<MDX children={'{1..2}'} />)
-    }).toThrow('Unexpected token')
+    }).toThrow('Unexpected content after expression')
   })
 
   it('should crash if JS can’t be evaluated', async () => {
diff --git a/packages/vue/test/test.js b/packages/vue/test/test.js
index 14e9de38d..641ed676f 100644
--- a/packages/vue/test/test.js
+++ b/packages/vue/test/test.js
@@ -71,13 +71,13 @@ describe('@mdx-js/vue', () => {
         '  <hr>\n' +
         '  <blockquote>\n' +
         '    <p>a</p>\n' +
-        '    <ul>\n' +
-        '      <li>b</li>\n' +
-        '    </ul>\n' +
-        '    <ol>\n' +
-        '      <li>c</li>\n' +
-        '    </ol>\n' +
         '  </blockquote>\n' +
+        '  <ul>\n' +
+        '    <li>b</li>\n' +
+        '  </ul>\n' +
+        '  <ol>\n' +
+        '    <li>c</li>\n' +
+        '  </ol>\n' +
         '</div>'
     )
   })
diff --git a/yarn.lock b/yarn.lock
index 3b4bf0425..ce4923f84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@ampproject/toolbox-core@^2.6.0":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.6.1.tgz#af97ec253bf39e5fe5121b8ec28f1f35d1878446"
-  integrity sha512-hTsd9J2yy3JPMClG8BuUhUfMDtd3oDhCuRe/SyZJYQfNMN8hQHt7LNXtdOzZr0Kw7nTepHmn7GODS68fZN4OQQ==
+"@ampproject/toolbox-core@^2.6.0", "@ampproject/toolbox-core@^2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.7.1.tgz#d433a333c0dbb0bb6db7e69edd490d5694e06fc3"
+  integrity sha512-MWGmCLyBOouXTy1Vc30Jw7NkshJ5XkPlcXhhRc9Gw3dDAZJ8rUS69SIQ6cFMt2owCQnw7irMNlvZQTqdyx61rA==
   dependencies:
     cross-fetch "3.0.6"
     lru-cache "6.0.0"
@@ -35,11 +35,11 @@
     terser "4.8.0"
 
 "@ampproject/toolbox-runtime-version@^2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.6.0.tgz#c2a310840a6c60a7f5046d2ccaf45646a761bd4f"
-  integrity sha512-wT+Ehsoq2PRXqpgjebygHD01BpSlaAE4HfDEVxgPVT8oAsLzE4ywZgzI2VQZfaCdb8qLyO5+WXrLSoJXxDBo2Q==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.7.1.tgz#2ae543c97e2659be444eb389b1277ed5a70568e6"
+  integrity sha512-3LsjaOz/Aw4YpWG6ZxpVhA2N8GF0gRfvCrNm0ZspUviz/NR+MLrJ50BPoOOAmKCzoNVA2Q8xF3Y8dfamGuoblA==
   dependencies:
-    "@ampproject/toolbox-core" "^2.6.0"
+    "@ampproject/toolbox-core" "^2.7.1"
 
 "@ampproject/toolbox-script-csp@^2.5.4":
   version "2.5.4"
@@ -47,11 +47,11 @@
   integrity sha512-+knTYetI5nWllRZ9wFcj7mYxelkiiFVRAAW/hl0ad8EnKHMH82tRlk40CapEnUHhp6Er5sCYkumQ8dngs3Q4zQ==
 
 "@ampproject/toolbox-validator-rules@^2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.5.4.tgz#7dee3a3edceefea459d060571db8cc6e7bbf0dd6"
-  integrity sha512-bS7uF+h0s5aiklc/iRaujiSsiladOsZBLrJ6QImJDXvubCAQtvE7om7ShlGSXixkMAO0OVMDWyuwLlEy8V1Ing==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.7.1.tgz#5a257f2b21d1d44167769fe3eae7f587d249d9fa"
+  integrity sha512-LYkGKqFBOC39lvRX38wGjbLf4r8VXJyiCZSLRepiHjO4xbstZLyHPwxHlobQrBhD7UbHZn5TVD+qw+VMJNMSxw==
   dependencies:
-    cross-fetch "3.0.5"
+    cross-fetch "^3.0.6"
 
 "@ardatan/aggregate-error@0.0.6":
   version "0.0.6"
@@ -61,9 +61,9 @@
     tslib "~2.0.1"
 
 "@babel/cli@^7.5.5":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.8.tgz#3b24ed2fd5da353ee6f19e8935ff8c93b5fe8430"
-  integrity sha512-/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.10.tgz#67a1015b1cd505bde1696196febf910c4c339a48"
+  integrity sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
@@ -147,19 +147,19 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@7.11.6":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
-  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+"@babel/core@7.12.9":
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
+  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.6"
-    "@babel/helper-module-transforms" "^7.11.0"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/generator" "^7.12.5"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.9"
+    "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -212,42 +212,41 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.10.2", "@babel/core@^7.10.3", "@babel/core@^7.10.5", "@babel/core@^7.11.0", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.4.4", "@babel/core@^7.4.5", "@babel/core@^7.5.5", "@babel/core@^7.7.5", "@babel/core@^7.9.6":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.8.tgz#8ad76c1a7d2a6a3beecc4395fa4f7b4cb88390e6"
-  integrity sha512-ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.7"
+    "@babel/parser" "^7.12.10"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.8"
-    "@babel/types" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.3", "@babel/generator@^7.10.5", "@babel/generator@^7.11.0", "@babel/generator@^7.11.6", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.7.7", "@babel/generator@^7.9.0":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@babel/generator@^7.10.3", "@babel/generator@^7.10.5", "@babel/generator@^7.11.0", "@babel/generator@^7.12.10", "@babel/generator@^7.12.5", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.7.7", "@babel/generator@^7.9.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460"
+  integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.12.10"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
+"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
@@ -257,14 +256,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.12.4":
-  version "7.12.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
-  integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
+"@babel/helper-builder-react-jsx-experimental@^7.12.10", "@babel/helper-builder-react-jsx-experimental@^7.12.4":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz#a58cb96a793dc0fcd5c9ed3bb36d62fdc60534c2"
+  integrity sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/helper-annotate-as-pure" "^7.12.10"
+    "@babel/helper-module-imports" "^7.12.5"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-builder-react-jsx@^7.10.4":
   version "7.10.4"
@@ -329,11 +328,11 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
+  integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -372,11 +371,11 @@
     lodash "^4.17.19"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
-  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"
+  integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.12.10"
 
 "@babel/helper-plugin-utils@7.10.4", "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.3", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
@@ -461,10 +460,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.10.3", "@babel/parser@^7.10.5", "@babel/parser@^7.11.1", "@babel/parser@^7.11.5", "@babel/parser@^7.12.5", "@babel/parser@^7.12.7", "@babel/parser@^7.3.3", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.7", "@babel/parser@^7.9.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.10.3", "@babel/parser@^7.10.5", "@babel/parser@^7.11.1", "@babel/parser@^7.12.10", "@babel/parser@^7.12.5", "@babel/parser@^7.12.7", "@babel/parser@^7.3.3", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.7", "@babel/parser@^7.9.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
+  integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
 
 "@babel/plugin-proposal-async-generator-functions@^7.10.4", "@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.12.1"
@@ -621,15 +620,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0"
-  integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.4"
-
 "@babel/plugin-proposal-object-rest-spread@7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
@@ -639,7 +629,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.3", "@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
+"@babel/plugin-proposal-object-rest-spread@7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.10.3", "@babel/plugin-proposal-object-rest-spread@^7.11.0", "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
   integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
@@ -775,7 +765,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.10.1", "@babel/plugin-syntax-jsx@^7.12.0", "@babel/plugin-syntax-jsx@^7.12.1", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3":
+"@babel/plugin-syntax-jsx@7.12.1", "@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.10.1", "@babel/plugin-syntax-jsx@^7.12.0", "@babel/plugin-syntax-jsx@^7.12.1", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
   integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
@@ -928,9 +918,9 @@
     "@babel/plugin-syntax-flow" "^7.8.3"
 
 "@babel/plugin-transform-flow-strip-types@^7.10.1", "@babel/plugin-transform-flow-strip-types@^7.12.1", "@babel/plugin-transform-flow-strip-types@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz#8430decfa7eb2aea5414ed4a3fa6e1652b7d77c4"
-  integrity sha512-8hAtkmsQb36yMmEtk2JZ9JnVyDSnDOdlB+0nEGzIDLuK4yR3JcEjfuFPYkdEPSh8Id+rAMeBEn+X0iVEyho6Hg==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz#d85e30ecfa68093825773b7b857e5085bbd32c95"
+  integrity sha512-0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-flow" "^7.12.1"
@@ -1078,27 +1068,27 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
-"@babel/plugin-transform-react-jsx-self@^7.10.4", "@babel/plugin-transform-react-jsx-self@^7.12.1", "@babel/plugin-transform-react-jsx-self@^7.9.0":
+"@babel/plugin-transform-react-jsx-self@^7.10.4", "@babel/plugin-transform-react-jsx-self@^7.9.0":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
   integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-source@^7.10.4", "@babel/plugin-transform-react-jsx-source@^7.12.1", "@babel/plugin-transform-react-jsx-source@^7.9.0":
+"@babel/plugin-transform-react-jsx-source@^7.10.4", "@babel/plugin-transform-react-jsx-source@^7.9.0":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b"
   integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.10.1", "@babel/plugin-transform-react-jsx@^7.10.4", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.12.7", "@babel/plugin-transform-react-jsx@^7.3.0", "@babel/plugin-transform-react-jsx@^7.9.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
-  integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
+"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.10.1", "@babel/plugin-transform-react-jsx@^7.10.4", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.10", "@babel/plugin-transform-react-jsx@^7.12.5", "@babel/plugin-transform-react-jsx@^7.3.0", "@babel/plugin-transform-react-jsx@^7.9.1":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz#a7af3097c73479123594c8c8fe39545abebd44e3"
+  integrity sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.10"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -1145,13 +1135,12 @@
     semver "^5.5.1"
 
 "@babel/plugin-transform-runtime@^7.11.0", "@babel/plugin-transform-runtime@^7.11.5", "@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.5.5", "@babel/plugin-transform-runtime@^7.9.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
-  integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
+  integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
     semver "^5.5.1"
 
 "@babel/plugin-transform-shorthand-properties@^7.10.4", "@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.8.3":
@@ -1183,10 +1172,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.4", "@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+"@babel/plugin-transform-typeof-symbol@^7.10.4", "@babel/plugin-transform-typeof-symbol@^7.12.10", "@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -1355,9 +1344,9 @@
     semver "^5.5.0"
 
 "@babel/preset-env@^7.10.3", "@babel/preset-env@^7.10.4", "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.11.5", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.4.4", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.5.5", "@babel/preset-env@^7.9.5":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
-  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab"
+  integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==
   dependencies:
     "@babel/compat-data" "^7.12.7"
     "@babel/helper-compilation-targets" "^7.12.5"
@@ -1418,12 +1407,12 @@
     "@babel/plugin-transform-spread" "^7.12.1"
     "@babel/plugin-transform-sticky-regex" "^7.12.7"
     "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.7"
-    core-js-compat "^3.7.0"
+    "@babel/types" "^7.12.10"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
 "@babel/preset-flow@^7.10.1":
@@ -1471,16 +1460,14 @@
     "@babel/plugin-transform-react-jsx-source" "^7.9.0"
 
 "@babel/preset-react@^7.0.0", "@babel/preset-react@^7.10.1", "@babel/preset-react@^7.10.4", "@babel/preset-react@^7.12.0", "@babel/preset-react@^7.12.5", "@babel/preset-react@^7.9.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
-  integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
+  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.7"
+    "@babel/plugin-transform-react-jsx" "^7.12.10"
     "@babel/plugin-transform-react-jsx-development" "^7.12.7"
-    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/preset-stage-0@^7.0.0":
@@ -1514,9 +1501,9 @@
     "@babel/plugin-transform-typescript" "^7.12.1"
 
 "@babel/register@^7.5.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.12.1.tgz#cdb087bdfc4f7241c03231f22e15d211acf21438"
-  integrity sha512-XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.12.10.tgz#19b87143f17128af4dbe7af54c735663b3999f60"
+  integrity sha512-EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.19"
@@ -1561,11 +1548,11 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/standalone@^7.12.6":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.8.tgz#c4915f7120462b75b63a396088e14361dca86be6"
-  integrity sha512-0NPKt9h+d9ZC2bgOuh2zlM5RwaHgOol9XhMH1Jlk3oRCvHU+FSVhr7AGUtq2oRS4IDo2oULj+AKj8nj1NMKppA==
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.10.tgz#f77f6750d0ab88c7c23234dd2d2f3800f170a573"
+  integrity sha512-e3sJ7uwwjiGWv7qeATKrP+Mjltr6JEurPh3yR0dBb9ie2YDnKl52lO82f+Ha+HAtyxTHfsPIXwgFmWKsCT2zOQ==
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.7.4", "@babel/template@^7.8.6":
+"@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.7.4", "@babel/template@^7.8.6":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
   integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
@@ -1574,17 +1561,17 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.3", "@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5", "@babel/traverse@^7.11.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.8", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.9.0":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.8.tgz#c1c2983bf9ba0f4f0eaa11dff7e77fa63307b2a4"
-  integrity sha512-EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.3", "@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5", "@babel/traverse@^7.11.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.9.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+  integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/parser" "^7.12.10"
+    "@babel/types" "^7.12.10"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
@@ -1616,10 +1603,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.3", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.4", "@babel/types@^7.9.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.10.3", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.4", "@babel/types@^7.9.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
     lodash "^4.17.19"
@@ -1850,7 +1837,7 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
-"@emotion/memoize@0.7.4", "@emotion/memoize@^0.7.1":
+"@emotion/memoize@0.7.4":
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
   integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
@@ -1860,6 +1847,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b"
   integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==
 
+"@emotion/memoize@^0.7.1":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
+  integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
+
 "@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
   version "0.11.16"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
@@ -1949,10 +1941,10 @@
     ts-node "^9"
     tslib "^2"
 
-"@eslint/eslintrc@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
-  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
+"@eslint/eslintrc@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -2049,10 +2041,10 @@
     is-promise "4.0.0"
     tslib "~2.0.1"
 
-"@graphql-tools/delegate@^7.0.0", "@graphql-tools/delegate@^7.0.1":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-7.0.5.tgz#624a536255ec4adee7f237821a30003fcb41f7cb"
-  integrity sha512-wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w==
+"@graphql-tools/delegate@^7.0.1", "@graphql-tools/delegate@^7.0.7":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-7.0.7.tgz#276fd3f22183857c17ed0d37eac95f91bc982ac5"
+  integrity sha512-2sze+CJxu37b4jcQ4fyj6ap9TMnx8+NBtApSs1nWIVENzPE2510aNTsBHgSdTwSeV/tVIFkAtZZAlMEGYGXzQA==
   dependencies:
     "@ardatan/aggregate-error" "0.0.6"
     "@graphql-tools/batch-execute" "^7.0.0"
@@ -2103,37 +2095,44 @@
     valid-url "1.0.9"
 
 "@graphql-tools/merge@^6.0.0", "@graphql-tools/merge@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.5.tgz#a03d6711f2a468b8de97c0fe9092469280ca66c9"
-  integrity sha512-T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw==
+  version "6.2.6"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.6.tgz#f10b8958523687440536ecf166f2959d2f094d0f"
+  integrity sha512-G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug==
   dependencies:
     "@graphql-tools/schema" "^7.0.0"
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.0.1"
 
-"@graphql-tools/schema@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-7.0.0.tgz#f87e307d00a3d388f5c54d32f4697611396c0127"
-  integrity sha512-yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w==
+"@graphql-tools/schema@^7.0.0", "@graphql-tools/schema@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-7.1.2.tgz#5084eaef893719ad01329f77673d102e7710542e"
+  integrity sha512-GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ==
   dependencies:
-    "@graphql-tools/utils" "^7.0.0"
+    "@graphql-tools/utils" "^7.1.2"
     tslib "~2.0.1"
 
 "@graphql-tools/url-loader@^6.0.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-6.4.0.tgz#e13aa701f334aaaa73975ccf25336f1bd5fae35e"
-  integrity sha512-M3mS/VH6vpnai3b3Fa33kYcdCgZvhFh7RqFE1R3NMfhYjphQ10EWwgf31P+VQcBNB2zz+ubxttI6UcJLiGqwuQ==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-6.6.0.tgz#e825f156f0a7ca644d9140ce664f0883e4c25da3"
+  integrity sha512-iZp6bCKU0AmGKRrsDOYqehg5mVImQS1/JMBvh73VPRp9ry2I1oxsE124Q54t3lHhD2b1wrQ9AJlXxgNsuxmJtQ==
   dependencies:
     "@graphql-tools/delegate" "^7.0.1"
-    "@graphql-tools/utils" "^7.0.1"
-    "@graphql-tools/wrap" "^7.0.0"
+    "@graphql-tools/utils" "^7.1.4"
+    "@graphql-tools/wrap" "^7.0.4"
     "@types/websocket" "1.0.1"
     cross-fetch "3.0.6"
-    subscriptions-transport-ws "0.9.18"
+    eventsource "1.0.7"
+    extract-files "9.0.0"
+    graphql-upload "^11.0.0"
+    graphql-ws "2.0.1"
+    is-promise "4.0.0"
+    isomorphic-form-data "2.0.0"
+    isomorphic-ws "4.0.1"
+    sse-z "0.3.0"
     sync-fetch "0.3.0"
     tslib "~2.0.1"
     valid-url "1.0.9"
-    websocket "1.0.32"
+    ws "7.4.1"
 
 "@graphql-tools/utils@^6.0.0":
   version "6.2.4"
@@ -2144,23 +2143,23 @@
     camel-case "4.1.1"
     tslib "~2.0.1"
 
-"@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.0.1", "@graphql-tools/utils@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-7.0.2.tgz#1977d3277158bf32df792a5ff76d3fdc04647a64"
-  integrity sha512-VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA==
+"@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.0.2", "@graphql-tools/utils@^7.1.2", "@graphql-tools/utils@^7.1.4":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-7.1.4.tgz#5baf27e908aa56c44ed3992f4607718a37f186a0"
+  integrity sha512-4lxmstMpgHSM1ULD+1X5AcPFaizkdBubB7H9Rqr7Wh6L9bxUHBHFB3bhaFXT7FI0xE01Pt0IMsZadOIlhVTXrg==
   dependencies:
     "@ardatan/aggregate-error" "0.0.6"
-    camel-case "4.1.1"
+    camel-case "4.1.2"
     tslib "~2.0.1"
 
-"@graphql-tools/wrap@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-7.0.1.tgz#a93e548439d19a1be6f7a032c7561059ea589b70"
-  integrity sha512-0feqjgEJSRLm2V0kEUaV2dw7ukVPjRujYMqNdcqHsIyXmf0VO8PGF5hcva/+5U/9Yfbf3Fck+P5JTJ5MlXPlsQ==
+"@graphql-tools/wrap@^7.0.4":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-7.0.4.tgz#436fc1a8febe23e57036ae21be0476dc8e5d9984"
+  integrity sha512-txBs0W4k3WR86aEzBYXtKdGeeUXCNdRNxjQA/95T6ywNYoM8pw2mvpoXrWOvzbeaH3zwhbHY7kwii4atrC9irg==
   dependencies:
-    "@graphql-tools/delegate" "^7.0.0"
-    "@graphql-tools/schema" "^7.0.0"
-    "@graphql-tools/utils" "^7.0.0"
+    "@graphql-tools/delegate" "^7.0.7"
+    "@graphql-tools/schema" "^7.1.2"
+    "@graphql-tools/utils" "^7.1.4"
     is-promise "4.0.0"
     tslib "~2.0.1"
 
@@ -3277,32 +3276,32 @@
     loader-utils "^1.1.0"
 
 "@mdx-js/loader@^1.3.0":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.21.tgz#e5b2b5c48d182e495d36104b0c7a5da96964a2dd"
-  integrity sha512-4xNtT7oal4PrLSpZE+75nj9XMwYwc5BuoHmer1GDmer2Hhg8DCLxskk4lWpXnMv+IUg7MboK0EAtZ2fk0szt3A==
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
+  integrity sha512-9CjGwy595NaxAYp0hF9B/A0lH6C8Rms97e2JS9d3jVUtILn6pT5i5IV965ra3lIWc7Rs1GG1tBdVF7dCowYe6Q==
   dependencies:
-    "@mdx-js/mdx" "1.6.21"
-    "@mdx-js/react" "1.6.21"
+    "@mdx-js/mdx" "1.6.22"
+    "@mdx-js/react" "1.6.22"
     loader-utils "2.0.0"
 
-"@mdx-js/mdx@1.6.21", "@mdx-js/mdx@^1.5.1":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.21.tgz#d3651b4802db7bdc399270c0ffa9e2aa99dd4b00"
-  integrity sha512-z35VI6qDw9eAzR/obtgHbYVUdb/Pm+oUnlP1lLR94Oe05Xs2H7vlAgpuFBCLH5g/egzAc2wZCyoVydr25CsF+A==
+"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.5.1":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
+  integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==
   dependencies:
-    "@babel/core" "7.11.6"
-    "@babel/plugin-syntax-jsx" "7.10.4"
+    "@babel/core" "7.12.9"
+    "@babel/plugin-syntax-jsx" "7.12.1"
     "@babel/plugin-syntax-object-rest-spread" "7.8.3"
-    "@mdx-js/util" "1.6.21"
-    babel-plugin-apply-mdx-type-prop "1.6.21"
-    babel-plugin-extract-import-names "1.6.21"
+    "@mdx-js/util" "1.6.22"
+    babel-plugin-apply-mdx-type-prop "1.6.22"
+    babel-plugin-extract-import-names "1.6.22"
     camelcase-css "2.0.1"
-    detab "2.0.3"
+    detab "2.0.4"
     hast-util-raw "6.0.1"
     lodash.uniq "4.5.0"
-    mdast-util-to-hast "9.1.2"
+    mdast-util-to-hast "10.0.1"
     remark-footnotes "2.0.0"
-    remark-mdx "1.6.21"
+    remark-mdx "1.6.22"
     remark-parse "8.0.3"
     remark-squeeze-paragraphs "4.0.0"
     style-to-object "0.3.0"
@@ -3325,17 +3324,17 @@
     unist-util-visit "^1.3.0"
 
 "@mdx-js/parcel-plugin-mdx@^1.5.1":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/parcel-plugin-mdx/-/parcel-plugin-mdx-1.6.21.tgz#b1ce9ae0068b680ac7eb1fb7cea6394530f48c01"
-  integrity sha512-5ddX0UjJUaP2h/GxSnWr2/UMcwu6gMZa2aTIf+rJY3aq8r419XdPqDz0r4Wsg8k0Z6vUkbd3VmpBTXfj0YxNtQ==
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/parcel-plugin-mdx/-/parcel-plugin-mdx-1.6.22.tgz#ee6f8c105b90a10fef10bc0f821314a48d06c120"
+  integrity sha512-KDwp32pzV3RLqQlFu6ofuJddj4lbUJJZj5T8yhBQPcN9aQAOFRG/P0QfYGFOaP8oB/DZvfLUm2lLcbD6vj71Zg==
   dependencies:
-    "@mdx-js/mdx" "1.6.21"
+    "@mdx-js/mdx" "1.6.22"
     parcel-bundler "^1.12.4"
 
-"@mdx-js/react@1.6.21", "@mdx-js/react@^1.0.0":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.21.tgz#86d962471a5e160c59a6b32054aa55c0c7ca404e"
-  integrity sha512-CgSNT9sq2LAlhEbVlPg7DwUQkypz+CWaWGcJbkgmp9WCAy6vW33CQ44UbKPiH3wet9o+UbXeQOqzZd041va83g==
+"@mdx-js/react@1.6.22", "@mdx-js/react@^1.0.0":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573"
+  integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==
 
 "@mdx-js/tag@^0.15.0", "@mdx-js/tag@^0.15.6":
   version "0.15.6"
@@ -3351,10 +3350,10 @@
   resolved "https://registry.yarnpkg.com/@mdx-js/tag/-/tag-0.20.3.tgz#9e2306040b6469248c45a5f5baf44d0014db0493"
   integrity sha512-Co3gUFmNDv9z2LjuvLTpTj2NaOSHFxuoZjohcG0YK/KfECO+Ns9idzThMYjfEDe1vAf4c824rqlBYseedJdFNw==
 
-"@mdx-js/util@1.6.21":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.21.tgz#25f97a0a1b76e78c16ae5d98c6c73e1be8d89e39"
-  integrity sha512-6sANhqfEHu6gdHZSrzDjN18Y48mIon8f2Os6J+IFmMHN0IhNG/0PUIIsI07kA1sZ9t6vgZNBloVmcDa5WOSe6A==
+"@mdx-js/util@1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b"
+  integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
 
 "@mdx-js/util@2.0.0-next.1":
   version "2.0.0-next.1"
@@ -3461,21 +3460,26 @@
     mkdirp "^1.0.4"
 
 "@octokit/auth-token@^2.4.0":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.3.tgz#b868b5f2366533a7e62933eaa1181a8924228cc4"
-  integrity sha512-fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56"
+  integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q==
   dependencies:
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.0"
 
 "@octokit/endpoint@^6.0.1":
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.9.tgz#c6a772e024202b1bd19ab69f90e0536a2598b13e"
-  integrity sha512-3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw==
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.10.tgz#741ce1fa2f4fb77ce8ebe0c6eaf5ce63f565f8e8"
+  integrity sha512-9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q==
   dependencies:
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.0"
     is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
+"@octokit/openapi-types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-2.0.0.tgz#6d8f8ad9db3b75a39115f5def2654df8bed39f28"
+  integrity sha512-J4bfM7lf8oZvEAdpS71oTvC1ofKxfEZgU5vKVwzZKi4QPiL82udjpseJwxPid9Pu2FNmyRQOX4iEj6W1iOSnPw==
+
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
@@ -3511,22 +3515,22 @@
     once "^1.4.0"
 
 "@octokit/request-error@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.3.tgz#b51b200052bf483f6fa56c9e7e3aa51ead36ecd8"
-  integrity sha512-GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.4.tgz#07dd5c0521d2ee975201274c472a127917741262"
+  integrity sha512-LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA==
   dependencies:
-    "@octokit/types" "^5.0.1"
+    "@octokit/types" "^6.0.0"
     deprecation "^2.0.0"
     once "^1.4.0"
 
 "@octokit/request@^5.2.0":
-  version "5.4.10"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.10.tgz#402d2c53768bde12b99348329ba4129746aebb9c"
-  integrity sha512-egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw==
+  version "5.4.12"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc"
+  integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^5.0.0"
+    "@octokit/types" "^6.0.3"
     deprecation "^2.0.0"
     is-plain-object "^5.0.0"
     node-fetch "^2.6.1"
@@ -3562,11 +3566,12 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
-  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
+"@octokit/types@^6.0.0", "@octokit/types@^6.0.3":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.1.1.tgz#bc88b3eb5f447b025a2a1a8177a72db216e8d4ca"
+  integrity sha512-btm3D6S7VkRrgyYF31etUtVY/eQ1KzrNRqhFt25KSe2mKlXuLXJilglRC6eDA2P6ou94BUnk/Kz5MPEolXgoiw==
   dependencies:
+    "@octokit/openapi-types" "^2.0.0"
     "@types/node" ">= 8"
 
 "@parcel/fs@^1.11.0":
@@ -3720,9 +3725,9 @@
     slash "^3.0.0"
 
 "@rollup/plugin-babel@^5.0.3":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924"
-  integrity sha512-Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.2.tgz#e5623a01dd8e37e004ba87f2de218c611727d9b2"
+  integrity sha512-MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@rollup/pluginutils" "^3.1.0"
@@ -3843,13 +3848,14 @@
     "@sinonjs/commons" "^1.7.0"
 
 "@soda/friendly-errors-webpack-plugin@^1.7.1":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
-  integrity sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz#84751d82a93019d5c92c0cf0e45ac59087cd2240"
+  integrity sha512-RLotfx6k1+nfLacwNCenj7VnTMPxVwYKoGOcffMFoJDKM8tXzBiCN0hMHFJNnoAojduYAsxuiMm0EOMixgiRow==
   dependencies:
-    chalk "^1.1.3"
-    error-stack-parser "^2.0.0"
+    chalk "^2.4.2"
+    error-stack-parser "^2.0.2"
     string-width "^2.0.0"
+    strip-ansi "^5"
 
 "@soda/get-current-script@^1.0.0":
   version "1.0.2"
@@ -4174,9 +4180,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
-  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
+  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -4207,9 +4213,9 @@
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.33"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
-  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   dependencies:
     "@types/node" "*"
 
@@ -4239,9 +4245,9 @@
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/express-serve-static-core@*":
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz#cabf91debeeb3cb04b798e2cff908864e89b6106"
-  integrity sha512-uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA==
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.15.tgz#7c3d37829a991da9a507c1efd44d97532e8909e3"
+  integrity sha512-pb71P0BrBAx7cQE+/7QnA1HTQUkdBKMlkPY7lHUMn0YvPJkL2UA+KW3BdWQ309IT+i9En/qm45ZxpjIcpgEhNQ==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -4409,14 +4415,14 @@
     form-data "^3.0.0"
 
 "@types/node@*", "@types/node@>= 8":
-  version "14.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6"
-  integrity sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==
+  version "14.14.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.12.tgz#0b1d86f8c40141091285dea02e4940df73bba43f"
+  integrity sha512-ASH8OPHMNlkdjrEdmoILmzFfsJICvhBsFfAum4aKZ/9U4B6M6tTmTPh+f3ttWdD74CEGV5XvXWkbyfSdXaTd7g==
 
 "@types/node@^12.12.29":
-  version "12.19.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.6.tgz#fbf249fa46487dd8c7386d785231368b92a33a53"
-  integrity sha512-U2VopDdmBoYBmtm8Rz340mvvSz34VgX/K9+XCuckvcLGMkt3rbMX8soqFOikIPlPBc5lmw8By9NUK7bEFSBFlQ==
+  version "12.19.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.8.tgz#efd6d1a90525519fc608c9db16c8a78f7693a978"
+  integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==
 
 "@types/node@^8.5.7":
   version "8.10.66"
@@ -4439,9 +4445,9 @@
   integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
 
 "@types/parsimmon@^1.10.1":
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.4.tgz#7639e16015440d9baf622f83c12dae47787226b7"
-  integrity sha512-M56NfQHfaWuaj6daSgCVs7jh8fXLI3LmxjRoQxmOvYesgIkI+9HPsDLO0vd7wX7cwA0D0ZWFEJdp0VPwLdS+bQ==
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.6.tgz#8fcf95990514d2a7624aa5f630c13bf2427f9cdd"
+  integrity sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==
 
 "@types/prettier@^2.0.0":
   version "2.1.5"
@@ -4577,9 +4583,9 @@
     "@types/webpack" "*"
 
 "@types/webpack-sources@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7"
-  integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
+  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -4617,9 +4623,9 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^15.0.0":
-  version "15.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz#0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"
-  integrity sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==
+  version "15.0.11"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c"
+  integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -4742,12 +4748,13 @@
   integrity sha512-1+7CwjQ0Kasml6rHoNQUmbISwqLNNfFVBUcZl6QBremUl296ZmLrVQPqJP5pyAAWjZke5bpI1hlj+LVVuT7Jcg==
 
 "@vue/babel-plugin-jsx@^1.0.0-0":
-  version "1.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.3.tgz#ab477ee95c764fbe68842a2eddd474f122e70ac6"
-  integrity sha512-/Ibq0hoKsidnHWPhgRpjcjYhYcHpqEm2fiKVAPO88OXZNHGwaGgS4yXkC6TDEvlZep4mBDo+2S5T81wpbVh90Q==
+  version "1.0.0-rc.4"
+  resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.4.tgz#02c9ba2e01dc5251fd69a89afd49e9a1963331ba"
+  integrity sha512-ifzYc0jfLqiQebfqzKrJGfmQFE1lIgFlE9Ive8hQMJS/GC9Y+mNtHpqmWyqljbFGsqmsxmMRNFdAUgz0HZN1rg==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/template" "^7.0.0"
     "@babel/traverse" "^7.0.0"
     "@babel/types" "^7.0.0"
     "@vue/babel-helper-vue-transform-on" "^1.0.0-rc.2"
@@ -5484,7 +5491,7 @@ acorn-jsx@^4.1.1:
   dependencies:
     acorn "^5.0.3"
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.0.1, acorn-jsx@^5.2.0:
+acorn-jsx@^5.0.0, acorn-jsx@^5.0.1, acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
@@ -5514,6 +5521,11 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.2.0, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.0.0:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz#7a3ae4191466a6984eee0fe3407a4f3aa9db8354"
+  integrity sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==
+
 adaptive-gradient@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/adaptive-gradient/-/adaptive-gradient-1.0.6.tgz#fe5af8e023b79912f832f5b4fda458b1518e31fb"
@@ -5646,6 +5658,11 @@ anser@1.4.9:
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
   integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
 
+anser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/anser/-/anser-2.0.1.tgz#8d9069291fee18306ffaf2e364a690dcc8ed78ad"
+  integrity sha512-4g5Np4CVD3c5c/36Mj0jllEA5bQcuXF0dqakZcuHGeubBzw93EAhwRuQCzgFm4/ZwvyBMzFdtn9BcihOjnxIdQ==
+
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
@@ -5910,12 +5927,14 @@ array-ify@^1.0.0:
   integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-includes@^3.0.3, array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"
+  integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.1"
+    get-intrinsic "^1.0.1"
     is-string "^1.0.5"
 
 array-iterate@^1.0.0:
@@ -6039,16 +6058,6 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
-  dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
-
 assets-webpack-plugin@3.9.12:
   version "3.9.12"
   resolved "https://registry.yarnpkg.com/assets-webpack-plugin/-/assets-webpack-plugin-3.9.12.tgz#9f3c165b37bedfadc9e47d2f7073768c0df883a8"
@@ -6074,6 +6083,13 @@ ast-types@0.13.2:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
   integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
 
+ast-types@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
+  dependencies:
+    tslib "^2.0.1"
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -6161,7 +6177,7 @@ autoprefixer@^9.6.1, autoprefixer@^9.7.4, autoprefixer@^9.8.0, autoprefixer@^9.8
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
+available-typed-arrays@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
   integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
@@ -6468,14 +6484,13 @@ babel-loader@^7.1.4:
     mkdirp "^0.5.1"
 
 babel-loader@^8.0.6, babel-loader@^8.1.0, babel-loader@^8.2.0:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00"
-  integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    make-dir "^2.1.0"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-messages@^6.23.0:
@@ -6492,13 +6507,13 @@ babel-plugin-add-module-exports@^0.3.3:
   optionalDependencies:
     chokidar "^2.0.4"
 
-babel-plugin-apply-mdx-type-prop@1.6.21:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.21.tgz#0c8600c965ca4203e3c026ed971ed5b7e810aeba"
-  integrity sha512-+vQarmm+g+kePH4CMp2iEN/HOx1oEvZeSKCdKCEZlnJOthXzkpaRAbM3ZNCiKqVr9WuoqPNfoXQ0EVppYpIwfg==
+babel-plugin-apply-mdx-type-prop@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b"
+  integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
-    "@mdx-js/util" "1.6.21"
+    "@mdx-js/util" "1.6.22"
 
 babel-plugin-check-es2015-constants@^6.22.0:
   version "6.22.0"
@@ -6555,10 +6570,10 @@ babel-plugin-emotion@^9.2.11:
     source-map "^0.5.7"
     touch "^2.0.1"
 
-babel-plugin-extract-import-names@1.6.21:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.21.tgz#94efffee4ea79982491573e5f67d9957ab77596a"
-  integrity sha512-mCjTry00HB/4xHGunxQNMOGZ7JEGJdEScNh7C1WJBto7nePyn9wCdYAZP61pGC6+z3ETH5btY20mqg0plcxZGA==
+babel-plugin-extract-import-names@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc"
+  integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
 
@@ -6625,10 +6640,10 @@ babel-plugin-named-asset-import@^0.3.6:
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
   integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
 
-babel-plugin-remove-graphql-queries@^2.11.0, babel-plugin-remove-graphql-queries@^2.9.14:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.11.0.tgz#0d90f7c3e66033eebccf69b5c2618f1239e89ff0"
-  integrity sha512-JJiC1JdMubakyCAppYnFqdXqX1sNRIYomoRQ1tH2xzXHrsmhk3lRUSozsEGWxsL7r9D7zacuhi6fF4vukIyo0w==
+babel-plugin-remove-graphql-queries@^2.12.0, babel-plugin-remove-graphql-queries@^2.9.14:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-remove-graphql-queries/-/babel-plugin-remove-graphql-queries-2.12.0.tgz#8ecf08ce9a90b81ec54aeb69c8bb1fbacdbc92c0"
+  integrity sha512-oF1XC0+FfeBBE8FbcLD0Rf4EZUIrUEI2comT+DaX27U34tKByuCPQSkLKgcirCd/h5kfJd9LLIr1Sjv3dU4NGw==
 
 "babel-plugin-styled-components@>= 1":
   version "1.12.0"
@@ -7171,10 +7186,10 @@ babel-preset-gatsby@^0.5.2:
     gatsby-core-utils "^1.3.24"
     gatsby-legacy-polyfills "^0.0.6"
 
-babel-preset-gatsby@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-0.7.0.tgz#7ca7e6d798e84483fb2589eb29f8ccacee53d141"
-  integrity sha512-zxI75j1Ub5HTOBhCJ48mR8OSGx4o4lK+ce2yfD62eWEAckwilsNUEQx943xBPDQCR/MdFx7uDkVKDTwt3mer4w==
+babel-preset-gatsby@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-gatsby/-/babel-preset-gatsby-0.8.0.tgz#3dc69d55b771c850f1c35a0a796430509738ed61"
+  integrity sha512-ea4qjDiqo6LJ4PISIEajpcrRH7kAbgDNKox8bDEdWT6xtWl1oEN760lby0oPQ5SWTbZf1D+U8xT7s0KEzrcA2w==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
@@ -7188,8 +7203,8 @@ babel-preset-gatsby@^0.7.0:
     babel-plugin-dynamic-import-node "^2.3.3"
     babel-plugin-macros "^2.8.0"
     babel-plugin-transform-react-remove-prop-types "^0.4.24"
-    gatsby-core-utils "^1.5.0"
-    gatsby-legacy-polyfills "^0.2.0"
+    gatsby-core-utils "^1.6.0"
+    gatsby-legacy-polyfills "^0.3.0"
 
 babel-preset-jest@^24.9.0:
   version "24.9.0"
@@ -7208,9 +7223,9 @@ babel-preset-jest@^26.6.2:
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-preset-razzle@latest:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/babel-preset-razzle/-/babel-preset-razzle-3.3.7.tgz#0e04632e2cecc68cdc0e321476fde2cc464e407c"
-  integrity sha512-C26dJ1tuA0YhfZzXPVyPn+xdTWG31ykh0Qb3w8Nfby07VNgsk+hJ+GKQBwo/BwzrQNkDqQThWLzgdOeuaazd1w==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/babel-preset-razzle/-/babel-preset-razzle-3.3.8.tgz#c572be11794f762faca466c360c477eff65bee98"
+  integrity sha512-73JVmiGrgf8OzA0KvrdfhRAa4Nb2DakYMNHkbdoX3D2mbXT+UTBAaM99i1Rc8Rgd8lOXU5BCRtblOZI/KLybTQ==
   dependencies:
     "@babel/core" "7.11.1"
     "@babel/plugin-proposal-class-properties" "^7.8.3"
@@ -7373,7 +7388,7 @@ babylon@^6.15.0, babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-backo2@1.0.2, backo2@^1.0.2:
+backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
@@ -7805,16 +7820,16 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.12.0, browserslist@^4.12.2, browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.12.0, browserslist@^4.12.2, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.9.1:
+  version "4.16.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b"
+  integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==
   dependencies:
-    caniuse-lite "^1.0.30001157"
+    caniuse-lite "^1.0.30001165"
     colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
+    electron-to-chromium "^1.3.621"
     escalade "^3.1.1"
-    node-releases "^1.1.66"
+    node-releases "^1.1.67"
 
 bser@2.1.1:
   version "2.1.1"
@@ -7975,13 +7990,6 @@ buffer@^5.2.1, buffer@^5.5.0, buffer@^5.7.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-bufferutil@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5"
-  integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA==
-  dependencies:
-    node-gyp-build "^4.2.0"
-
 builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -8002,6 +8010,13 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
+busboy@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b"
+  integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==
+  dependencies:
+    dicer "0.3.0"
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
@@ -8227,7 +8242,7 @@ camel-case@3.0.x, camel-case@^3.0.0:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
-camel-case@4.1.1, camel-case@^4.1.1:
+camel-case@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
   integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==
@@ -8235,6 +8250,14 @@ camel-case@4.1.1, camel-case@^4.1.1:
     pascal-case "^3.1.1"
     tslib "^1.10.0"
 
+camel-case@4.1.2, camel-case@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
+  dependencies:
+    pascal-case "^3.1.2"
+    tslib "^2.0.3"
+
 camelcase-css@2.0.1, camelcase-css@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
@@ -8311,10 +8334,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001023, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001113, caniuse-lite@^1.0.30001157:
-  version "1.0.30001161"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz#64f7ffe79ee780b8c92843ff34feb36cea4651e0"
-  integrity sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001023, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001113, caniuse-lite@^1.0.30001165:
+  version "1.0.30001165"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f"
+  integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -8657,9 +8680,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-highlight@^2.1.4:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.8.tgz#aa3130b481649d631ab913ae60becf81c69c3887"
-  integrity sha512-mFuTW5UOV3/S0wZE9/1b0EcAM0XOJIhoAWPhWm5voiJ6ugVBkvYBIEL7sbHo9sEtWdEmwDIWab32qpaRI3cfqQ==
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.9.tgz#4f4ecb05326d70d56d4b4249fabf9a70fb002497"
+  integrity sha512-t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ==
   dependencies:
     chalk "^4.0.0"
     highlight.js "^10.0.0"
@@ -8759,6 +8782,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
@@ -9226,12 +9258,12 @@ contentful-management@^5.26.3:
     type-fest "0.15.1"
 
 contentful-sdk-core@^6.4.0:
-  version "6.4.6"
-  resolved "https://registry.yarnpkg.com/contentful-sdk-core/-/contentful-sdk-core-6.4.6.tgz#a94b1355afd292dfddb0cdc16b565980f9a03c47"
-  integrity sha512-6KVLeCdn1akqjGvVMUgMxQ3B+zNIYeq3MUlqWsSLLJozr++0ZYWU76XmHf4n5MPTMoX9RGbRSR8hJAaKcUNDFw==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/contentful-sdk-core/-/contentful-sdk-core-6.7.0.tgz#c014f12d7a716548c248e905dd8e095a6dbf7a0f"
+  integrity sha512-+b8UXVE249Z6WzMLXvsu3CIvN/s5xXRZ9o+zY7zDdPkIYBMW15xcs9N2ATI6ncmc+s1uj4XZij/2skflletHiw==
   dependencies:
-    lodash "^4.17.10"
-    qs "^6.5.2"
+    fast-copy "^2.1.0"
+    qs "^6.9.4"
 
 conventional-changelog-angular@^5.0.3:
   version "5.0.12"
@@ -9422,9 +9454,9 @@ copy-webpack-plugin@5.1.2, copy-webpack-plugin@^5.1.1:
     webpack-log "^2.0.0"
 
 copyfiles@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.0.tgz#fcac72a4f2b882f021dd156b4bcf6d71315487bd"
-  integrity sha512-yGjpR3yjQdxccW8EcJ4a7ZCA6wGER6/Q2Y+b7bXbVxGeSHBf93i9d7MzTsx+VV1CpMKQa3v4ThZfXBcltMzl0w==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5"
+  integrity sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==
   dependencies:
     glob "^7.0.5"
     minimatch "^3.0.3"
@@ -9432,7 +9464,7 @@ copyfiles@^2.3.0:
     noms "0.0.0"
     through2 "^2.0.1"
     untildify "^4.0.0"
-    yargs "^15.3.1"
+    yargs "^16.1.0"
 
 core-assert@^0.2.0:
   version "0.2.1"
@@ -9442,18 +9474,18 @@ core-assert@^0.2.0:
     buf-compare "^1.0.0"
     is-error "^2.2.0"
 
-core-js-compat@^3.6.2, core-js-compat@^3.6.5, core-js-compat@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
-  integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
+core-js-compat@^3.6.2, core-js-compat@^3.6.5, core-js-compat@^3.8.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e"
+  integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==
   dependencies:
-    browserslist "^4.14.6"
+    browserslist "^4.15.0"
     semver "7.0.0"
 
 core-js-pure@^3.0.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz#28a57c861d5698e053f0ff36905f7a3301b4191e"
-  integrity sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.8.1.tgz#23f84048f366fdfcf52d3fd1c68fec349177d119"
+  integrity sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g==
 
 core-js@^1.0.0:
   version "1.2.7"
@@ -9461,14 +9493,14 @@ core-js@^1.0.0:
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.6.5:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.5.0, core-js@^3.6.5:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
-  integrity sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
+  integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -9559,10 +9591,10 @@ create-error-class@^3.0.0:
   dependencies:
     capture-stack-trace "^1.0.0"
 
-create-gatsby@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-0.0.1.tgz#919e130742bc17795a983b13c6c9f30c13bc989a"
-  integrity sha512-3OSmzjY45HgUaSrs8YK8sSipTkDnyrjS7upCzXUQsJttx4sF3zfkGY5DtPqHR5WzT0q5ZN9Hdm5pQJ1kuwY3YQ==
+create-gatsby@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/create-gatsby/-/create-gatsby-0.1.0.tgz#66beb1776f9fa8403b182bba4b51a57b577fe8e5"
+  integrity sha512-kgsvPCWOVxiUXFUV66hC6q8QaBOqQeneaQi5u6YbVk1eELxjglAi8PgoUOswZsrHkVOjypjKbuVtHkaanJ3F2A==
 
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
@@ -9611,6 +9643,11 @@ create-react-context@^0.2.2, create-react-context@^0.2.3:
     fbjs "^0.8.0"
     gud "^1.0.0"
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-fetch@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723"
@@ -9626,7 +9663,7 @@ cross-fetch@3.0.5:
   dependencies:
     node-fetch "2.6.0"
 
-cross-fetch@3.0.6:
+cross-fetch@3.0.6, cross-fetch@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
   integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==
@@ -9931,10 +9968,10 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-tree@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz#30b8c0161d9fb4e9e2141d762589b6ec2faebd2e"
-  integrity sha512-NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w==
+css-tree@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"
+  integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==
   dependencies:
     mdn-data "2.0.14"
     source-map "^0.6.1"
@@ -10084,11 +10121,11 @@ cssnano@^4.0.0, cssnano@^4.1.10:
     postcss "^7.0.0"
 
 csso@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz#e0cb02d6eb3af1df719222048e4359efd662af13"
-  integrity sha512-Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
-    css-tree "^1.0.0"
+    css-tree "^1.1.2"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@^0.3.4, cssom@~0.3.6:
   version "0.3.8"
@@ -10362,19 +10399,20 @@ deep-equal@^1.0.1, deep-equal@^1.1.0:
     regexp.prototype.flags "^1.2.0"
 
 deep-equal@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.4.tgz#6b0b407a074666033169df3acaf128e1c6f3eab6"
-  integrity sha512-BUfaXrVoCfgkOQY/b09QdO9L3XNoF2XH0A3aY9IQwQL/ZjLOe8FQgCNVl1wiolhsFo8kFdO9zdPViCPbmaJA5w==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9"
+  integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==
   dependencies:
-    es-abstract "^1.18.0-next.1"
-    es-get-iterator "^1.1.0"
+    call-bind "^1.0.0"
+    es-get-iterator "^1.1.1"
+    get-intrinsic "^1.0.1"
     is-arguments "^1.0.4"
     is-date-object "^1.0.2"
     is-regex "^1.1.1"
     isarray "^2.0.5"
-    object-is "^1.1.3"
+    object-is "^1.1.4"
     object-keys "^1.1.1"
-    object.assign "^4.1.1"
+    object.assign "^4.1.2"
     regexp.prototype.flags "^1.3.0"
     side-channel "^1.0.3"
     which-boxed-primitive "^1.0.1"
@@ -10575,7 +10613,7 @@ detab@2.0.3:
   dependencies:
     repeat-string "^1.5.4"
 
-detab@^2.0.0:
+detab@2.0.4, detab@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43"
   integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==
@@ -10687,6 +10725,13 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
+dicer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872"
+  integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==
+  dependencies:
+    streamsearch "0.1.2"
+
 diff-sequences@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
@@ -10721,13 +10766,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dimport@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dimport/-/dimport-1.0.0.tgz#d5c09564f621e7b24b2e333cccdf9b2303011644"
-  integrity sha512-r5Cb8jvJ9YOTKQje2wrD6ncjpyDM4l94+OqgatYNzTb0viKS0/XomCjty1+F827u1pBiPt1ubSYdowZfE1L5Tw==
-  dependencies:
-    rewrite-imports "^2.0.3"
-
 dir-glob@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
@@ -10838,12 +10876,12 @@ dom-serializer@1.0.1:
     entities "^2.0.0"
 
 dom-serializer@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz#5f7c828f1bfc44887dc2a315ab5c45691d544b58"
-  integrity sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
+  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^3.0.0"
+    domhandler "^4.0.0"
     entities "^2.0.0"
 
 dom-serializer@~0.1.0:
@@ -10869,10 +10907,10 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
-  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
+domelementtype@^2.0.1, domelementtype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -10902,13 +10940,20 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^3.0.0, domhandler@^3.3.0:
+domhandler@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
   integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
   dependencies:
     domelementtype "^2.0.1"
 
+domhandler@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
+  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
+  dependencies:
+    domelementtype "^2.1.0"
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -10935,13 +10980,13 @@ domutils@^1.5.1, domutils@^1.7.0:
     domelementtype "1"
 
 domutils@^2.0.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz#7ee5be261944e1ad487d9aa0616720010123922b"
-  integrity sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
+  integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.0.1"
-    domhandler "^3.3.0"
+    domhandler "^4.0.0"
 
 dot-case@^2.1.0:
   version "2.1.1"
@@ -10950,13 +10995,13 @@ dot-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
-dot-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
-  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 dot-prop@^4.2.0, dot-prop@^4.2.1:
   version "4.2.1"
@@ -11123,10 +11168,10 @@ ejs@^2.5.7, ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.341, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.591:
-  version "1.3.606"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.606.tgz#6ef2655d9a7c1b447dfdd6344657d00461a65e26"
-  integrity sha512-+/2yPHwtNf6NWKpaYt0KoqdSZ6Qddt6nDfH/pnhcrHq9hSb23e5LFy06Mlf0vF2ykXvj7avJ597psqcbKnG5YQ==
+electron-to-chromium@^1.3.341, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.621:
+  version "1.3.622"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.622.tgz#9726bd2e67a5462154750ce9701ca6af07d07877"
+  integrity sha512-AJT0Fm1W0uZlMVVkkJrcCVvczDuF8tPm3bwzQf5WO8AaASB2hwTRP7B8pU5rqjireH+ib6am8+hH5/QkXzzYKw==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -11328,14 +11373,15 @@ enzyme-adapter-react-16@^1.11.0:
     semver "^5.7.0"
 
 enzyme-adapter-utils@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz#59c1b734b0927543e3d8dc477299ec957feb312d"
-  integrity sha512-5A9MXXgmh/Tkvee3bL/9RCAAgleHqFnsurTYCbymecO4ohvtNO5zqIhHxV370t7nJAwaCfkgtffarKpC0GPt0g==
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz#afbb0485e8033aa50c744efb5f5711e64fbf1ad0"
+  integrity sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==
   dependencies:
     airbnb-prop-types "^2.16.0"
-    function.prototype.name "^1.1.2"
-    object.assign "^4.1.0"
-    object.fromentries "^2.0.2"
+    function.prototype.name "^1.1.3"
+    has "^1.0.3"
+    object.assign "^4.1.2"
+    object.fromentries "^2.0.3"
     prop-types "^15.7.2"
     semver "^5.7.1"
 
@@ -11371,14 +11417,14 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.0, error-stack-parser@^2.0.6:
+error-stack-parser@^2.0.0, error-stack-parser@^2.0.2, error-stack-parser@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8"
   integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -11413,7 +11459,7 @@ es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-get-iterator@^1.1.0:
+es-get-iterator@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9"
   integrity sha512-qorBw8Y7B15DVLaJWy6WdEV/ZkieBcu6QCq/xzWzGOKJqgG1j754vXRfZ3NY7HSShneqU43mPB4OkQBTkvHhFw==
@@ -11459,11 +11505,6 @@ es6-iterator@2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
-
 es6-promise@3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4"
@@ -11887,9 +11928,9 @@ eslint-plugin-node@^11.1.0:
     semver "^6.1.0"
 
 eslint-plugin-prettier@^3.1.3, eslint-plugin-prettier@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
-  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.2.0.tgz#af391b2226fa0e15c96f36c733f6e9035dbd952c"
+  integrity sha512-kOUSJnFjAUFKwVxuzy6sA5yyMx6+o9ino4gCdShzBNx4eyFRudWRYKCFolKjoM40PEiuU6Cn7wBLfq3WsGg7qg==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -11963,9 +12004,9 @@ eslint-rule-composer@^0.3.0:
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
 eslint-rule-docs@^1.1.5:
-  version "1.1.215"
-  resolved "https://registry.yarnpkg.com/eslint-rule-docs/-/eslint-rule-docs-1.1.215.tgz#21efe592d319216a67787b20be45247c39cf4c70"
-  integrity sha512-lADlvFuceJvlU/NhD9gpnCt2lfdfpkz2BizeJNy7bkTr0VQA4w+vW3Nh4G569w6a8SPQczKL4PDB83s6j5i++A==
+  version "1.1.216"
+  resolved "https://registry.yarnpkg.com/eslint-rule-docs/-/eslint-rule-docs-1.1.216.tgz#7791ca5695c00c536694f9eceb176a0dfe71e8a5"
+  integrity sha512-+Gs6G41O/A/aBj3JJWI2CwFZZ5XxkOPdlz2NRGujEqfYtAnZIIQHdVn7mw6wIZ0nGefLXpBqAekJkW8LbSsqvg==
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -12103,12 +12144,12 @@ eslint@^6.6.0, eslint@^6.8.0:
     v8-compile-cache "^2.0.3"
 
 eslint@^7.1.0, eslint@^7.13.0:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
-  integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
+  integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.2.1"
+    "@eslint/eslintrc" "^0.2.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -12118,10 +12159,10 @@ eslint@^7.1.0, eslint@^7.13.0:
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
-    espree "^7.3.0"
+    espree "^7.3.1"
     esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
@@ -12163,13 +12204,13 @@ espree@^6.1.2:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
-espree@^7.1.0, espree@^7.2.0, espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
+espree@^7.1.0, espree@^7.2.0, espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
     acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^3.1.3:
@@ -12177,7 +12218,7 @@ esprima@^3.1.3:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
   integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -12244,9 +12285,9 @@ event-pubsub@4.3.0:
   integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==
 
 event-source-polyfill@^1.0.15:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-1.0.21.tgz#6b11b1299517a48e04540748b7c23f5a7620155b"
-  integrity sha512-Mz8LO8hPgg2X6VcSXmq7gvgFU3kUnTZb4zU3tTYDx8cJHRXP15tjdpGUiP2IUUwOqAGZ1TEfe+KagjMXfFgwLA==
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-1.0.22.tgz#cb381d6c4409097095da53e01852c1a8fbb6d7fc"
+  integrity sha512-Fnk9E2p4rkZ3eJGBn2HDeZoBTpyjPxj8RX/whdr4Pm5622xYgYo1k48SUD649Xlo6nnoKRr2WwcUlneil/AZ8g==
 
 event-target-shim@^5.0.0:
   version "5.0.1"
@@ -12275,7 +12316,7 @@ eventsource@0.1.6:
   dependencies:
     original ">=0.0.5"
 
-eventsource@^1.0.7:
+eventsource@1.0.7, eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
   integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
@@ -12554,16 +12595,20 @@ extglob@^2.0.4:
     to-regex "^3.0.1"
 
 extract-css-chunks-webpack-plugin@^4.6.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-4.8.0.tgz#4a9cf9888a07abf4a86e9305f784cf12d46425c5"
-  integrity sha512-dt0W0oouL0xjS51xkJQGc7ezNOl/ax3y8x/3EqYvoiGotYyTTFskt257r1yV3gExm4wqs1q95tOJ5vyQwhi2MA==
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-4.9.0.tgz#da5e6b1d8b39a398c817ffc98550f4ccb6d795e1"
+  integrity sha512-HNuNPCXRMqJDQ1OHAUehoY+0JVCnw9Y/H22FQzYVwo8Ulgew98AGDu0grnY5c7xwiXHjQa6yJ/1dxLCI/xqTyQ==
   dependencies:
     loader-utils "^2.0.0"
     normalize-url "1.9.1"
     schema-utils "^1.0.0"
-    webpack-external-import "^2.2.4"
     webpack-sources "^1.1.0"
 
+extract-files@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
+  integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -12584,6 +12629,11 @@ falafel@^2.1.0:
     isarray "^2.0.1"
     object-keys "^1.0.6"
 
+fast-copy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-2.1.0.tgz#99c1b842aee063f8212d6f749080c196a822b293"
+  integrity sha512-j4VxAVJsu9NHveYrIj0+nJxXe2lOlibKTlyy0jH8DBwcuV6QyXTy0zTqZhmMKo7EYvuaUk/BFj/o6NU6grE5ag==
+
 fast-deep-equal@3.1.3, fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -12744,6 +12794,13 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
+file-entry-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
+  dependencies:
+    flat-cache "^3.0.4"
+
 file-loader@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
@@ -12964,11 +13021,24 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
 flatted@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
+flatted@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
+  integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
+
 flatten@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
@@ -13050,6 +13120,15 @@ fork-ts-checker-webpack-plugin@3.1.1:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
+form-data@^2.3.2:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -13103,6 +13182,11 @@ fromentries@^1.2.0:
   resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
   integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==
 
+fs-capacitor@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-6.2.0.tgz#fa79ac6576629163cb84561995602d8999afb7f5"
+  integrity sha512-nKcE1UduoSKX27NSZlg879LdQc94OtbOsEmKMN2MBNudXREvijRKx2GEBsTMTfws+BrbkJoEuynbGSVRSpauvw==
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -13231,29 +13315,30 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45"
-  integrity sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==
+function.prototype.name@^1.1.2, function.prototype.name@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.3.tgz#0bb034bb308e7682826f215eb6b2ae64918847fe"
+  integrity sha512-H51qkbNSp8mtkJt+nyW1gyStBiKZxfRqySNUR99ylq6BPXHKI4SEvIlTKp4odLfjRKJV04DFWMU3G/YRlQOsag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    functions-have-names "^1.2.0"
+    es-abstract "^1.18.0-next.1"
+    functions-have-names "^1.2.1"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.0:
+functions-have-names@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91"
   integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA==
 
-gatsby-cli@^2.12.61, gatsby-cli@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-2.14.0.tgz#c8569bbf3c9fb4cda927a7e0b5fe3408d08ee39e"
-  integrity sha512-IZ8KMMgo/gsdyYpawTIqhwsVkQaLJAcyLbtO8Tjts3sF4j45z2S1hcE7xX5RX2HtTwl8OpViMkOag3Fq7KQ+NA==
+gatsby-cli@^2.12.61, gatsby-cli@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-2.15.1.tgz#f51465db7772f9855346a585a82e82a977e95361"
+  integrity sha512-VSgnjdCmP0pBbpf5zk0CrsyQ7iE8O0NyLpBRZUqAi0xHP53JdKEsYeJB3QKZon6MH/oc6j+pxSBMUHqGzzhyhg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@hapi/joi" "^15.1.1"
@@ -13264,14 +13349,14 @@ gatsby-cli@^2.12.61, gatsby-cli@^2.14.0:
     common-tags "^1.8.0"
     configstore "^5.0.1"
     convert-hrtime "^3.0.0"
-    create-gatsby "^0.0.1"
+    create-gatsby "^0.1.0"
     envinfo "^7.7.3"
     execa "^3.4.0"
     fs-exists-cached "^1.0.0"
     fs-extra "^8.1.0"
-    gatsby-core-utils "^1.5.0"
-    gatsby-recipes "^0.4.0"
-    gatsby-telemetry "^1.5.0"
+    gatsby-core-utils "^1.6.0"
+    gatsby-recipes "^0.5.1"
+    gatsby-telemetry "^1.6.0"
     hosted-git-info "^3.0.6"
     is-valid-path "^0.1.1"
     lodash "^4.17.20"
@@ -13288,16 +13373,16 @@ gatsby-cli@^2.12.61, gatsby-cli@^2.14.0:
     source-map "0.7.3"
     stack-trace "^0.0.10"
     strip-ansi "^5.2.0"
-    update-notifier "^4.1.3"
+    update-notifier "^5.0.1"
     uuid "3.4.0"
     yargs "^15.4.1"
     yoga-layout-prebuilt "^1.9.6"
     yurnalist "^1.1.2"
 
-gatsby-core-utils@^1.3.12, gatsby-core-utils@^1.3.24, gatsby-core-utils@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-1.5.0.tgz#0834b561ab32b8b93db2ddb3ee695188f8d2eea9"
-  integrity sha512-hCt44m7I9Kmra/iVJwrmHXK8WFK9I1JwXQZquIVZ/JaG8UgqroxW1wpsY7ColbHGMATOmp13Efqn02VNPnms5Q==
+gatsby-core-utils@^1.3.12, gatsby-core-utils@^1.3.24, gatsby-core-utils@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/gatsby-core-utils/-/gatsby-core-utils-1.6.0.tgz#ec719e1a1d409ce69f89883e4334922f3b5c720e"
+  integrity sha512-jGaXDPbXOkP5Ct7pcOTsx0C0WTvIjSBVlHp0oBIv6rTw7DP498G9RAytqOT8z3uAf1PzWjAcUEMGNdicVucrxg==
   dependencies:
     ci-info "2.0.0"
     configstore "^5.0.1"
@@ -13314,10 +13399,10 @@ gatsby-graphiql-explorer@^0.4.11:
   dependencies:
     "@babel/runtime" "^7.11.2"
 
-gatsby-graphiql-explorer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.6.0.tgz#76098561eccee26198780546ec57db99452f5622"
-  integrity sha512-U4VXQvEFzRNteZFG4VzWPipCs0onnNHLpATiszcq/cC3+hFE6fPnBsF0Nm/gUgjdjctkBXW56tgJbPb10UoJsg==
+gatsby-graphiql-explorer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-0.7.0.tgz#7b98c51f4fc2b66064ce16aa107b8e34dc664fa0"
+  integrity sha512-CRgxnfxVHgWe2VmGdBC1E4ctXGP54215rIQ8/wTqClkGiRuKOg98h70vuekVdWQJnicbpJI05Ms1zPLlj9ckgg==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -13335,17 +13420,17 @@ gatsby-legacy-polyfills@^0.0.6:
   dependencies:
     core-js-compat "^3.6.5"
 
-gatsby-legacy-polyfills@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-0.2.0.tgz#fd05d510a96a23c4048f8df016424418d8404f46"
-  integrity sha512-tNXE3ZXjrev9Ak8KhqeyuzMI1Q0h6BLTtghqMGZmIad+nULpPTH0REsf+/cKY0Y6k9aQY6vbMr1Ns28lnmz9XA==
+gatsby-legacy-polyfills@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/gatsby-legacy-polyfills/-/gatsby-legacy-polyfills-0.3.0.tgz#515e1d57416c87fe9a107baf63b53b37752d4193"
+  integrity sha512-bNXUzTAqGQq01zba4W00+XXxdu2uqYABytLZJv3HBJAIKUk/e9eO8KR9GEh3zIVIC8HQ++PSZapl9Afu0i4G1w==
   dependencies:
     core-js-compat "^3.6.5"
 
-gatsby-link@^2.4.13, gatsby-link@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-2.6.0.tgz#e530f636acf2ae8ce0adf85b78f0cc60b24da762"
-  integrity sha512-oZofSTo1Z4mzer4TlIFzhmYdtjSw+78+j4QXZFaGFUPpR1jnrA/P4eEnXf4LjvkURwYzZo8JkwZK58CyzPTxtQ==
+gatsby-link@^2.4.13, gatsby-link@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-2.7.0.tgz#918f2aa6c8779522ec15185bf815d7df5a091bcc"
+  integrity sha512-ilr8X/cTRBZ3OpENP4K3h62aMtXFfLwA0TtAA/4Lg3Qf+jPsSVRKp4+rV8zjLvYmEEV8gNLv4NWr+CI4w0jsZQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@types/reach__router" "^1.3.6"
@@ -13365,16 +13450,16 @@ gatsby-page-utils@^0.2.17:
     lodash "^4.17.20"
     micromatch "^4.0.2"
 
-gatsby-page-utils@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-0.4.0.tgz#1a0364a8c26dc4585ac9999dab4e4458a4cf0466"
-  integrity sha512-wYUoMZ7a0fOKnoHW3R0CE+9Nh0dPoOvK2WEydEVt65K0WFkirha/aThXEvKI0iI3PJsMAxhqH0BS4Ygxhe2Pug==
+gatsby-page-utils@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/gatsby-page-utils/-/gatsby-page-utils-0.5.0.tgz#526dc7e42e5e2446060a84094902d9fca65e55ec"
+  integrity sha512-htixEbQh03tdL4VEfTmErxLNDeaJRLHKY8ndOp7bd/UOp24y/U5spjjght2cNTkqkP8dUPmMAhgoYj25QiBMaw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     bluebird "^3.7.2"
     chokidar "^3.4.3"
     fs-exists-cached "^1.0.0"
-    gatsby-core-utils "^1.5.0"
+    gatsby-core-utils "^1.6.0"
     glob "^7.1.6"
     lodash "^4.17.20"
     micromatch "^4.0.2"
@@ -13458,9 +13543,9 @@ gatsby-plugin-mdx@1.2.26:
     unist-util-visit "^1.4.1"
 
 gatsby-plugin-mdx@^1.2.26, gatsby-plugin-mdx@^1.2.27:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.5.0.tgz#6f09beaf9ea8815f4ff31592161b0c2dd12bd12f"
-  integrity sha512-Fh1q+py7RwekM0Ls6rdrtGSv6oTBsVLeRnBB1UPmhThB/AAKeZKN9GpHxB1m5nLlMGSXmfgTKTefvCR9kEklIQ==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-mdx/-/gatsby-plugin-mdx-1.6.0.tgz#2f64b044342b4cdfd9abc11595a1dca8338e8126"
+  integrity sha512-d57DZiR9/uGt0qDYbY3RKrNFIeEQHA8e4yeku7GC/0kmoSN/ZLb1mRMy+0oFhNmIOvGqVEXpHClv8cilF9OqIg==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/generator" "^7.12.5"
@@ -13477,7 +13562,7 @@ gatsby-plugin-mdx@^1.2.26, gatsby-plugin-mdx@^1.2.27:
     escape-string-regexp "^1.0.5"
     eval "^0.1.4"
     fs-extra "^8.1.0"
-    gatsby-core-utils "^1.5.0"
+    gatsby-core-utils "^1.6.0"
     gray-matter "^4.0.2"
     json5 "^2.1.3"
     loader-utils "^1.4.0"
@@ -13512,18 +13597,17 @@ gatsby-plugin-page-creator@2.3.17:
     lodash "^4.17.15"
     micromatch "^3.1.10"
 
-gatsby-plugin-page-creator@^2.3.17, gatsby-plugin-page-creator@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.5.0.tgz#0a9f4a3ae2f45f18e9dfdebe02b0f5d218004605"
-  integrity sha512-MXr3jrvvPACtbRv6UXSyeMVk+HRf1DVpZL9v9ultcZLA4ql1j0p+srLJ2c3hHhdQSOZrrGm7sgFTZo9fyQ8jKw==
+gatsby-plugin-page-creator@^2.3.17, gatsby-plugin-page-creator@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-page-creator/-/gatsby-plugin-page-creator-2.6.0.tgz#d58ffdf92a42998154518dcbb44bd8737f91e5ac"
+  integrity sha512-1pzJGgXNgCo+zJpkIqH2FuSSflApkHqF1ffsLGHkRFCcibn/MLACfhOgwnwYcYO6FoxWSTs9oZNH+EKKfIKO4A==
   dependencies:
     "@babel/traverse" "^7.12.5"
     "@sindresorhus/slugify" "^1.1.0"
     chokidar "^3.4.2"
     fs-exists-cached "^1.0.0"
-    gatsby-page-utils "^0.4.0"
+    gatsby-page-utils "^0.5.0"
     globby "^11.0.1"
-    graphql "^14.7.0"
     lodash "^4.17.20"
 
 gatsby-plugin-react-helmet@3.3.10:
@@ -13538,10 +13622,10 @@ gatsby-plugin-theme-ui@0.3.0:
   resolved "https://registry.yarnpkg.com/gatsby-plugin-theme-ui/-/gatsby-plugin-theme-ui-0.3.0.tgz#ab84216536ae45abe09a6edf24156b9dbf50d6a5"
   integrity sha512-Q2tS8EeYMy7AAtt6hvDtEsd1uwrLMjkDNqabyXhAo38AFoWQ0oKtq9u1YqbiRvp1TK06pAMPQQ3to48LAqc9Cw==
 
-gatsby-plugin-typescript@^2.4.15, gatsby-plugin-typescript@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.7.0.tgz#a21820a6e115f919a04229c526cc76a622c86cf4"
-  integrity sha512-IZ2t+bWcUEGdnrlGI5lDnuP8y/AkS1YJ/jqPmpXPUnNty8OCM6IC8r1W5ecjbqzSOkZg7UHkABZ60iUzZ/h2Yg==
+gatsby-plugin-typescript@^2.4.15, gatsby-plugin-typescript@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.8.0.tgz#898d10bf7dcbd3b9dd7ad62dd2058082774581f8"
+  integrity sha512-Xe39rI83fPHu0rjyexQglEuasKYelM0Sklau9pj7gAFOzYYtuALChqNYADcM/D9Ot18T0bFlhuN/nxREpLE+eQ==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
@@ -13549,26 +13633,26 @@ gatsby-plugin-typescript@^2.4.15, gatsby-plugin-typescript@^2.7.0:
     "@babel/plugin-proposal-optional-chaining" "^7.12.1"
     "@babel/preset-typescript" "^7.12.1"
     "@babel/runtime" "^7.12.5"
-    babel-plugin-remove-graphql-queries "^2.11.0"
+    babel-plugin-remove-graphql-queries "^2.12.0"
 
-gatsby-plugin-utils@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-0.4.0.tgz#ab3ac9910b9a8397fab54c3b73b2debd4b67a281"
-  integrity sha512-yxDzKcEmZc0whi/d+2appWVhqhrpWfFAPRO0pjIszCEgaeqybUB2lSL6Hx5r36W4Ff1INQ0A/WfPOJETLY+O2A==
+gatsby-plugin-utils@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-utils/-/gatsby-plugin-utils-0.5.0.tgz#5d0c0b9589b673f422e09e3e2e80bafbe3457505"
+  integrity sha512-Wvzt970TWr+cDdFdXjFmJ5rQEk9CbbbHzGo5GHOwfphXOTwp7/oKbTZoiGBm9M9Tf9Rdz6ph18j2ixdC0fy2Jw==
   dependencies:
     joi "^17.2.1"
 
-gatsby-react-router-scroll@^3.0.12, gatsby-react-router-scroll@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-3.2.0.tgz#81998c1634eb8d7593100ead09358c12e75da701"
-  integrity sha512-icmNo6Evev5lGJ19mfkUDmzot8UK8Y7bPjZsdarWX4ClNpEzTVb7JReLTdsmy0w3eJFJDbGrAxWvtLw2FZGyxw==
+gatsby-react-router-scroll@^3.0.12, gatsby-react-router-scroll@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-3.3.0.tgz#8711df0ab4e21169cdca8de682bd55dc3972dc03"
+  integrity sha512-bFAXOgxPgIhae2DQzcBY8XOH7RK0TSBco8k5vgxfAt+FYYco+4CRyzmXGQ6EMHefj7jF/425Z6l1D87GuVTbuA==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-gatsby-recipes@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/gatsby-recipes/-/gatsby-recipes-0.4.0.tgz#d2cf1b4df275c3139aef327f87352750bf27958d"
-  integrity sha512-gjbqj0B2WuQ7QX035GKE25MWoB9SEIelGI2V42oDgYOjmG4c2zvNqhbUnDC6meZBxV51DuyZx7jlf5hHfbKLuQ==
+gatsby-recipes@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/gatsby-recipes/-/gatsby-recipes-0.5.1.tgz#d6e3d07cc7d0dc0b073e5522e4c3c3d67686e0b0"
+  integrity sha512-6bKV8/vyWNG9mQQUL3XP/ZbiugDQTNxZT+Rs61qDU+0drzMjpIs4YqP1gj9PExp86mqnGlezEyvSK9gEPZjb+g==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/generator" "^7.12.5"
@@ -13593,8 +13677,8 @@ gatsby-recipes@^0.4.0:
     express "^4.17.1"
     express-graphql "^0.9.0"
     fs-extra "^8.1.0"
-    gatsby-core-utils "^1.5.0"
-    gatsby-telemetry "^1.5.0"
+    gatsby-core-utils "^1.6.0"
+    gatsby-telemetry "^1.6.0"
     glob "^7.1.6"
     graphql "^14.6.0"
     graphql-compose "^6.3.8"
@@ -13650,10 +13734,10 @@ gatsby-source-filesystem@2.3.19:
     valid-url "^1.0.9"
     xstate "^4.11.0"
 
-gatsby-telemetry@^1.3.19, gatsby-telemetry@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/gatsby-telemetry/-/gatsby-telemetry-1.5.0.tgz#e0a1e924d94d8b6056747419f5c5836dfd0bcb05"
-  integrity sha512-Ny2zHNwTzypB726GSyFpmWJ6F3QtgLdPAPRWXwLGLP5RjEFuEwzd4H4CEQRirAFZgulQxDR6YH226Ky4yFVYiA==
+gatsby-telemetry@^1.3.19, gatsby-telemetry@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/gatsby-telemetry/-/gatsby-telemetry-1.6.0.tgz#bd924b0f0b255ad3cd16142864b839ce0b4f043c"
+  integrity sha512-9bT40EqFU+oKJD0QUK6+MEwel7r8t9uI/9wlM5xU7P4qx2Ji66KJ1L0aCNgeZAHsdBF84K+J8tHnghr5A/7s7g==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
@@ -13662,9 +13746,8 @@ gatsby-telemetry@^1.3.19, gatsby-telemetry@^1.5.0:
     async-retry-ng "^2.0.1"
     boxen "^4.2.0"
     configstore "^5.0.1"
-    envinfo "^7.7.3"
     fs-extra "^8.1.0"
-    gatsby-core-utils "^1.5.0"
+    gatsby-core-utils "^1.6.0"
     git-up "^4.0.2"
     is-docker "^2.1.1"
     lodash "^4.17.20"
@@ -13819,9 +13902,9 @@ gatsby@2.24.3:
     yaml-loader "^0.6.0"
 
 gatsby@^2.24.3:
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.27.1.tgz#f3b781db8949b47ad6a4c0dedd839195e7e24a4e"
-  integrity sha512-KUBLQ+M3fERq69SxoFTTI/eUMQeMYUredI52mgqsMfvi9T828KQ8s9E9hhG/ML5aTbZ6eGvfi8aOqCao0UZQVw==
+  version "2.28.2"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.28.2.tgz#2ca533900f8d4ad983f97981e7b17025d3f1c454"
+  integrity sha512-NnsXUD/u51ykNkOuqt8aAqIXWY9asP0nh0Jcum+pAZ+BBhOQu5cr4nnB6h1NS93ZlEyJxlH6gfle1nN2GoUFDA==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/core" "^7.12.3"
@@ -13839,6 +13922,7 @@ gatsby@^2.24.3:
     "@typescript-eslint/eslint-plugin" "^2.24.0"
     "@typescript-eslint/parser" "^2.24.0"
     address "1.1.2"
+    anser "^2.0.1"
     ansi-html "^0.0.7"
     autoprefixer "^9.8.4"
     axios "^0.20.0"
@@ -13848,8 +13932,8 @@ gatsby@^2.24.3:
     babel-plugin-add-module-exports "^0.3.3"
     babel-plugin-dynamic-import-node "^2.3.3"
     babel-plugin-lodash "3.3.4"
-    babel-plugin-remove-graphql-queries "^2.11.0"
-    babel-preset-gatsby "^0.7.0"
+    babel-plugin-remove-graphql-queries "^2.12.0"
+    babel-preset-gatsby "^0.8.0"
     better-opn "^2.0.0"
     better-queue "^3.8.10"
     bluebird "^3.7.2"
@@ -13889,16 +13973,16 @@ gatsby@^2.24.3:
     find-cache-dir "^3.3.1"
     fs-exists-cached "1.0.0"
     fs-extra "^8.1.0"
-    gatsby-cli "^2.14.0"
-    gatsby-core-utils "^1.5.0"
-    gatsby-graphiql-explorer "^0.6.0"
-    gatsby-legacy-polyfills "^0.2.0"
-    gatsby-link "^2.6.0"
-    gatsby-plugin-page-creator "^2.5.0"
-    gatsby-plugin-typescript "^2.7.0"
-    gatsby-plugin-utils "^0.4.0"
-    gatsby-react-router-scroll "^3.2.0"
-    gatsby-telemetry "^1.5.0"
+    gatsby-cli "^2.15.1"
+    gatsby-core-utils "^1.6.0"
+    gatsby-graphiql-explorer "^0.7.0"
+    gatsby-legacy-polyfills "^0.3.0"
+    gatsby-link "^2.7.0"
+    gatsby-plugin-page-creator "^2.6.0"
+    gatsby-plugin-typescript "^2.8.0"
+    gatsby-plugin-utils "^0.5.0"
+    gatsby-react-router-scroll "^3.3.0"
+    gatsby-telemetry "^1.6.0"
     glob "^7.1.6"
     got "8.3.2"
     graphql "^14.6.0"
@@ -13950,11 +14034,14 @@ gatsby@^2.24.3:
     slugify "^1.4.4"
     socket.io "^2.3.0"
     socket.io-client "2.3.0"
+    source-map "^0.7.3"
     source-map-support "^0.5.19"
     st "^2.0.0"
     stack-trace "^0.0.10"
     string-similarity "^1.2.2"
+    strip-ansi "^5.2.0"
     style-loader "^0.23.1"
+    terminal-link "^2.1.1"
     terser-webpack-plugin "^2.3.8"
     tmp "^0.2.1"
     "true-case-path" "^2.2.1"
@@ -14009,7 +14096,7 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -14563,7 +14650,23 @@ graphql-type-json@^0.3.2:
   resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115"
   integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
 
-graphql@^14.6.0, graphql@^14.7.0:
+graphql-upload@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-11.0.0.tgz#24b245ff18f353bab6715e8a055db9fd73035e10"
+  integrity sha512-zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA==
+  dependencies:
+    busboy "^0.3.1"
+    fs-capacitor "^6.1.0"
+    http-errors "^1.7.3"
+    isobject "^4.0.0"
+    object-path "^0.11.4"
+
+graphql-ws@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-2.0.1.tgz#36971e5453dbf0a59c5674460f7067011e7d6cd7"
+  integrity sha512-K8eaR00TZHFMVw2viZfjDxLWdF1hUIR8xY9Zow6tLI2CLT3E4homJ4XZNRrxEoQjAXEQoUHPcmGkDDynWivNrQ==
+
+graphql@^14.6.0:
   version "14.7.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72"
   integrity sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA==
@@ -14958,9 +15061,9 @@ hicat@^0.7.0:
     minimist "^0.2.0"
 
 highlight.js@^10.0.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.0.tgz#ef3ce475e5dfa7a48484260b49ea242ddab823a0"
-  integrity sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA==
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
+  integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
 highlight.js@^8.1.0:
   version "8.9.1"
@@ -15357,9 +15460,9 @@ humanize-ms@^1.2.1:
     ms "^2.0.0"
 
 husky@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
-  integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.5.tgz#ab8d2a0eb6b62fef2853ee3d442c927d89290902"
+  integrity sha512-E5S/1HMoDDaqsH8kDF5zeKEQbYqe3wL9zJDyqyYqc8I4vHBtAoxkDBGXox0lZ9RI+k5GyB728vZdmnM4bYap+g==
   dependencies:
     chalk "^4.0.0"
     ci-info "^2.0.0"
@@ -15613,9 +15716,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 init-package-json@^1.10.3:
   version "1.10.3"
@@ -15883,9 +15986,11 @@ is-alphanumerical@^1.0.0:
     is-decimal "^1.0.0"
 
 is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -15898,9 +16003,9 @@ is-arrayish@^0.3.1:
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
-  integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
@@ -15917,9 +16022,11 @@ is-binary-path@^2.1.0, is-binary-path@~2.1.0:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
-  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^1.0.0"
 
 is-buffer@^1.0.2, is-buffer@^1.1.4, is-buffer@^1.1.5:
   version "1.1.6"
@@ -15970,9 +16077,9 @@ is-color-stop@^1.0.0:
     rgba-regex "^1.0.0"
 
 is-core-module@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
   dependencies:
     has "^1.0.3"
 
@@ -16093,9 +16200,9 @@ is-generator-fn@^2.0.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
-  integrity sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
+  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
 
 is-get-set-prop@^1.0.0:
   version "1.0.0"
@@ -16151,7 +16258,7 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
-is-installed-globally@^0.3.1:
+is-installed-globally@^0.3.1, is-installed-globally@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
   integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
@@ -16190,13 +16297,6 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-nan@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.0.tgz#85d1f5482f7051c2019f5673ccebdb06f3b0db03"
-  integrity sha512-z7bbREymOqt2CCaZVly8aC4ML3Xhfi0ekuOnjO2L8vKdl+CttdVoGZQhd4adMFAsxQ5VeRVwORs4tU8RH+HFtQ==
-  dependencies:
-    define-properties "^1.1.3"
-
 is-natural-number@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
@@ -16208,9 +16308,9 @@ is-negated-glob@^1.0.0:
   integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
 is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-npm@^1.0.0:
   version "1.0.0"
@@ -16222,6 +16322,11 @@ is-npm@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
+is-npm@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
+  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
+
 is-number-object@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
@@ -16258,9 +16363,9 @@ is-obj@^2.0.0:
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
+  integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
@@ -16452,12 +16557,13 @@ is-text-path@^1.0.1:
     text-extensions "^1.0.0"
 
 is-typed-array@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
-  integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.4.tgz#1f66f34a283a3c94a4335434661ca53fff801120"
+  integrity sha512-ILaRgn4zaSrVNXNGtON6iFNotXW3hAPF3+0fB1usg2jFlWqo5fEDdmJkz0zBfoi7Dgskr8Khi2xZ8cXqZEfXNA==
   dependencies:
-    available-typed-arrays "^1.0.0"
-    es-abstract "^1.17.4"
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.0"
+    es-abstract "^1.18.0-next.1"
     foreach "^2.0.5"
     has-symbols "^1.0.1"
 
@@ -16586,6 +16692,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
@@ -16594,6 +16705,18 @@ isomorphic-fetch@^2.1.1:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
 
+isomorphic-form-data@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz#9f6adf1c4c61ae3aefd8f110ab60fb9b143d6cec"
+  integrity sha512-TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg==
+  dependencies:
+    form-data "^2.3.2"
+
+isomorphic-ws@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
+  integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -17553,9 +17676,9 @@ js-types@^1.0.0:
   integrity sha1-0kLmSU7Vcq08koCfyL7X92h8vwM=
 
 js-yaml@^3.10.0, js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.6.1, js-yaml@^3.7.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -18003,7 +18126,7 @@ last-call-webpack-plugin@^3.0.0:
     lodash "^4.17.5"
     webpack-sources "^1.1.0"
 
-latest-version@5.1.0, latest-version@^5.0.0:
+latest-version@5.1.0, latest-version@^5.0.0, latest-version@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
   integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
@@ -18133,9 +18256,9 @@ lines-and-columns@^1.1.6:
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 lint-staged@^10.5.0:
-  version "10.5.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.2.tgz#acfaa0093af3262aee3130b2e22438941530bdd1"
-  integrity sha512-e8AYR1TDlzwB8VVd38Xu2lXDZf6BcshVqKVuBQThDJRaJLobqKnpbm4dkwJ2puypQNbLr9KF/9mfA649mAGvjA==
+  version "10.5.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.3.tgz#c682838b3eadd4c864d1022da05daa0912fb1da5"
+  integrity sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg==
   dependencies:
     chalk "^4.1.0"
     cli-truncate "^2.1.0"
@@ -18154,9 +18277,9 @@ lint-staged@^10.5.0:
     stringify-object "^3.3.0"
 
 listr2@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.2.tgz#d20feb75015e506992b55af40722ba1af168b8f1"
-  integrity sha512-AajqcZEUikF2ioph6PfH3dIuxJclhr3i3kHgTOP0xeXdWQohrvJAAmqVcV43/GI987HFY/vzT73jYXoa4esDHg==
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.2.3.tgz#ef9e0d790862f038dde8a9837be552b1adfd1c07"
+  integrity sha512-vUb80S2dSUi8YxXahO8/I/s29GqnOL8ozgHVLjfWQXa03BNEeS1TpBLjh2ruaqq5ufx46BRGvfymdBSuoXET5w==
   dependencies:
     chalk "^4.1.0"
     cli-truncate "^2.1.0"
@@ -18272,11 +18395,6 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
-loadjs@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6"
-  integrity sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -18563,9 +18681,9 @@ log-update@^4.0.0:
     wrap-ansi "^6.2.0"
 
 loglevel@^1.6.6, loglevel@^1.6.8:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
-  integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
 loglevelnext@^1.0.1, loglevelnext@^1.0.2:
   version "1.0.5"
@@ -18575,7 +18693,7 @@ loglevelnext@^1.0.1, loglevelnext@^1.0.2:
     es6-symbol "^3.1.1"
     object.assign "^4.1.0"
 
-longest-streak@^2.0.1:
+longest-streak@^2.0.0, longest-streak@^2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
   integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
@@ -18615,12 +18733,12 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lower-case@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
-  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
   dependencies:
-    tslib "^1.10.0"
+    tslib "^2.0.3"
 
 lowercase-keys@1.0.0:
   version "1.0.0"
@@ -18701,7 +18819,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -18742,7 +18860,7 @@ mamacro@^0.0.3:
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
   integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
 
-map-age-cleaner@^0.1.1, map-age-cleaner@^0.1.3:
+map-age-cleaner@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
   integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
@@ -18881,43 +18999,134 @@ mdast-util-definitions@^1.2.0:
   dependencies:
     unist-util-visit "^1.0.0"
 
-mdast-util-definitions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz#06af6c49865fc63d6d7d30125569e2f7ae3d0a86"
-  integrity sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==
+mdast-util-definitions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
+  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
   dependencies:
     unist-util-visit "^2.0.0"
 
+mdast-util-find-and-replace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.0.0.tgz#ce33ca0e720ce6ba16cf49dea441cd5f277270a1"
+  integrity sha512-3ArHEP8jGEtgcAyM1kUDhsuZwEVfabBjAQz9ohRWKHkheaBFdOElA0uzHKYVpuh6flnDTkg7cqWBs0pHSfPLqQ==
+  dependencies:
+    escape-string-regexp "^4.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
+mdast-util-footnote@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/mdast-util-footnote/-/mdast-util-footnote-0.1.7.tgz#4b226caeab4613a3362c144c94af0fdd6f7e0ef0"
+  integrity sha512-QxNdO8qSxqbO2e3m09KwDKfWiLgqyCurdWTQ198NpbZ2hxntdc+VKS4fDJCmNWbAroUdYnSthu+XbZ8ovh8C3w==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+    micromark "~2.11.0"
+
+mdast-util-from-markdown@^0.8.0:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz#2882100c1b9fc967d3f83806802f303666682d32"
+  integrity sha512-jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-gfm-autolink-literal@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.1.tgz#94675074d725ed7254b3172fa7e7c3252960de39"
+  integrity sha512-gJ2xSpqKCetSr22GEWpZH3f5ffb4pPn/72m4piY0v7T/S+O7n7rw+sfoPLhb2b4O7WdnERoYdALRcmD68FMtlw==
+
+mdast-util-gfm-strikethrough@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz#45eea337b7fff0755a291844fbea79996c322890"
+  integrity sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
+mdast-util-gfm-table@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.5.tgz#63776d512c71c3c200e222d035fcd0a3154ddb57"
+  integrity sha512-DSlFt1ZAlOqTUk+C9zSTOg8Y3skE4R2tcW/a7/DUvIOFxR6qcKshZLne6GemhqdHGncKWRKva91PG4BsakgT6g==
+  dependencies:
+    markdown-table "^2.0.0"
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm-task-list-item@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz#70c885e6b9f543ddd7e6b41f9703ee55b084af10"
+  integrity sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==
+  dependencies:
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.1.tgz#105095ae3e33bd489852579a205a9060414d35a5"
+  integrity sha512-oE1W1zSXU2L2LHg91V22HC3Z1fbsOZTBYUQq+kpM29f9297TbRm0C1l3bQ88RREl0WaUQaB49G7trvwy5utUKQ==
+  dependencies:
+    mdast-util-gfm-autolink-literal "^0.1.0"
+    mdast-util-gfm-strikethrough "^0.2.0"
+    mdast-util-gfm-table "^0.1.0"
+    mdast-util-gfm-task-list-item "^0.1.0"
+    mdast-util-to-markdown "^0.6.1"
+
 mdast-util-heading-style@^1.0.2:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz#6410418926fd5673d40f519406b35d17da10e3c5"
   integrity sha512-8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw==
 
-mdast-util-to-hast@9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.0.tgz#6ef121dd3cd3b006bf8650b1b9454da0faf79ffe"
-  integrity sha512-Akl2Vi9y9cSdr19/Dfu58PVwifPXuFt1IrHe7l+Crme1KvgUT+5z+cHLVcQVGCiNTZZcdqjnuv9vPkGsqWytWA==
+mdast-util-math@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-math/-/mdast-util-math-0.1.2.tgz#629a0793bd8822432917e5ddda5279492390cc2b"
+  integrity sha512-fogAitds+wH+QRas78Yr1TwmQGN4cW/G2WRw5ePuNoJbBSPJCxIOCE8MTzHgWHVSpgkRaPQTgfzXRE1CrwWSlg==
   dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.3"
-    collapse-white-space "^1.0.0"
-    detab "^2.0.0"
-    mdast-util-definitions "^3.0.0"
-    mdurl "^1.0.0"
-    trim-lines "^1.0.0"
-    unist-builder "^2.0.0"
-    unist-util-generated "^1.0.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-markdown "^0.6.0"
+    repeat-string "^1.0.0"
 
-mdast-util-to-hast@9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.2.tgz#10fa5ed9d45bf3755891e5801d0f32e2584a9423"
-  integrity sha512-OpkFLBC2VnNAb2FNKcKWu9FMbJhQKog+FCT8nuKmQNIKXyT1n3SIskE7uWDep6x+cA20QXlK5AETHQtYmQmxtQ==
+mdast-util-mdx-expression@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-0.1.1.tgz#fa1a04a5ea6777b0e8db6c120adf03088595df95"
+  integrity sha512-SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA==
+  dependencies:
+    strip-indent "^3.0.0"
+
+mdast-util-mdx-jsx@~0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.2.tgz#d47132db0c6d47b3a9e92d224c4d56c5eaa775e6"
+  integrity sha512-mMLb2NZ2LbKQ5ZH6CnJv9nCKFCqf3+GFwkMYU63ZHbR6KaBRKZmerkx6dNc5fhxPKDuEqTUk6DSHjKUP2OGfEg==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+    parse-entities "^2.0.0"
+    stringify-entities "^3.1.0"
+    unist-util-remove-position "^3.0.0"
+    vfile-message "^2.0.0"
+
+mdast-util-mdx@^0.1.0, mdast-util-mdx@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-0.1.1.tgz#16acbc6cabe33f4cebeb63fa9cf8be5da1d56fbf"
+  integrity sha512-9nncdnHNYSb4HNxY3AwE6gU632jhbXsDGXe9PkkJoEawYWJ8tTwmEOHGlGa2TCRidtkd6FF5I8ogDU9pTDlQyA==
+  dependencies:
+    mdast-util-mdx-expression "~0.1.0"
+    mdast-util-mdx-jsx "~0.1.0"
+    mdast-util-mdxjs-esm "~0.1.0"
+    mdast-util-to-markdown "^0.6.1"
+
+mdast-util-mdxjs-esm@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-0.1.0.tgz#34469361746510df24b47958a64f6497377f4467"
+  integrity sha512-iwVVTfUzG53Gpf/P2TRzONa2CFL4PGSq3p0Winuh//pGFyKzYwpo4zFEgn7QzZPG86HYqqUb3dMkNVeUu91k6Q==
+
+mdast-util-to-hast@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
+  integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.0"
-    mdast-util-definitions "^3.0.0"
+    mdast-util-definitions "^4.0.0"
     mdurl "^1.0.0"
     unist-builder "^2.0.0"
     unist-util-generated "^1.0.0"
@@ -18941,6 +19150,18 @@ mdast-util-to-hast@^3.0.0:
     unist-util-visit "^1.1.0"
     xtend "^4.0.1"
 
+mdast-util-to-markdown@^0.6.0, mdast-util-to-markdown@^0.6.1, mdast-util-to-markdown@~0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.1.tgz#0e07d3f871e056bffc38a0cf50c7298b56d9e0d6"
+  integrity sha512-4qJtZ0qdyYeexAXoOZiU0uHIFVncJAmCkHkSluAsvDaVWODtPyNEo9I1ns0T4ulxu2EHRH5u/bt1cV0pdHCX+A==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
 mdast-util-to-nlcst@^3.2.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.3.tgz#dcd0f51b59515b11a0700aeb40f168ed7ba9ed3d"
@@ -19044,14 +19265,6 @@ mem@^4.0.0:
     mimic-fn "^2.0.0"
     p-is-promise "^2.0.0"
 
-mem@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-6.1.1.tgz#ea110c2ebc079eca3022e6b08c85a795e77f6318"
-  integrity sha512-Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==
-  dependencies:
-    map-age-cleaner "^0.1.3"
-    mimic-fn "^3.0.0"
-
 memoize-one@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
@@ -19273,6 +19486,127 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
+micromark-extension-footnote@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-footnote/-/micromark-extension-footnote-0.3.2.tgz#129b74ef4920ce96719b2c06102ee7abb2b88a20"
+  integrity sha512-gr/BeIxbIWQoUm02cIfK7mdMZ/fbroRpLsck4kvFtjbzP4yi+OPVbnukTc/zy0i7spC2xYE/dbX1Sur8BEDJsQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-autolink-literal@~0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.2.tgz#ca5278ef661ca6ddc01b8aeee3f6c20d4fd1da76"
+  integrity sha512-1XjEGCUJCcmPGsG3QcOI2UkppkkN6IOO15PLEe3ZHB9bSOWEGmvrbGBw7jNxC1/KZb+wRHHEbIwJoTFfHOeAMQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-strikethrough@~0.6.0:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.3.tgz#b46cc7ee6c21940dd35e46aa49a11a24f92aedd5"
+  integrity sha512-MKMoP9x2dsr1aeX46ibBwVf4Q6nJsi5aaUFTOMOID5VOLSxwl4CrqUV4OGFQd6AqhtzBJAxaV+N2trlTBtZDNQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-table@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.2.tgz#24384ee9f9af1575295a0adf106d2e93f967a71f"
+  integrity sha512-AAzmj85XO1ydHYX0Lz52HGhcH2sZLm2AVvkwzELXWgZF6vGdq5yZ3CTByFRsqNUPyQBSIYFKLDAtc6KlnO42aw==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-tagfilter@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
+  integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
+
+micromark-extension-gfm-task-list-item@~0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz#d90c755f2533ed55a718129cee11257f136283b8"
+  integrity sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.2.tgz#def1fa3b743baee88a140a6821e12b09ed832563"
+  integrity sha512-ToQEpLkRgg7Tp8D3GM/SjZFPV0cCwWNxZmoEVIOQivOswRtPg7gg2WlCrtHhUWFNX+DgDjbq0iLOPGp4Y15oug==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-gfm-autolink-literal "~0.5.0"
+    micromark-extension-gfm-strikethrough "~0.6.0"
+    micromark-extension-gfm-table "~0.4.0"
+    micromark-extension-gfm-tagfilter "~0.3.0"
+    micromark-extension-gfm-task-list-item "~0.3.0"
+
+micromark-extension-math@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/micromark-extension-math/-/micromark-extension-math-0.1.2.tgz#5d7bb2b86018da4a758c05f3991664430ee4d711"
+  integrity sha512-ZJXsT2eVPM8VTmcw0CPSDeyonOn9SziGK3Z+nkf9Vb6xMPeU+4JMEnO6vzDL10562Favw8Vste74f54rxJ/i6Q==
+  dependencies:
+    katex "^0.12.0"
+    micromark "~2.11.0"
+
+micromark-extension-mdx-expression@^0.1.1, micromark-extension-mdx-expression@~0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-0.1.3.tgz#5c95f5cc758956dc370152e34a1fefc2b8f44455"
+  integrity sha512-5TjrySLizQ8iF7Zj24Uc0oOyj2WtYirxLtTuOYT9639UlsfJj0IcdQ0iX3TsgIIxcj/wO4rvIToLGTADFRDe/A==
+  dependencies:
+    micromark "~2.11.0"
+    vfile-message "^2.0.0"
+
+micromark-extension-mdx-jsx@~0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-0.1.3.tgz#cbbc9357b021ccfa31c204fe66dc61f9211c26c2"
+  integrity sha512-3+z0hP8AkNwzPTSGV2V0Iw57zrsJs0CxpeqfS2tmjq49rm0/kb07xPYuAYq26G488Oo8Quav5fopeieNEnesGg==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-mdx-expression "^0.1.1"
+    vfile-message "^2.0.0"
+
+micromark-extension-mdx-md@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-0.1.1.tgz#277b4e82ada37bfdf222f6c3530e20563d73e064"
+  integrity sha512-emlFQEyfx/2aPhwyEqeNDfKE6jPH1cvLTb5ANRo4qZBjaUObnzjLRdzK8RJ4Xc8+/dOmKN8TTRxFnOYF5/EAwQ==
+
+micromark-extension-mdx@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx/-/micromark-extension-mdx-0.1.0.tgz#1c20c6a9aa0fa484d481502c4de8cc4d49e13d44"
+  integrity sha512-DNki8rRlbAeB9C2MmUfftZtVUz85QA6VrW9Fub99bToBrK4eSEM1t/de5xDDW95nUooAaoW3dcSWMql/g59wsQ==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-mdx-expression "~0.1.0"
+    micromark-extension-mdx-jsx "~0.1.0"
+    micromark-extension-mdx-md "~0.1.0"
+
+micromark-extension-mdxjs-esm@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-0.1.1.tgz#bc3155d207884864a9d5c1ddabf13ac7c4879806"
+  integrity sha512-pi16emGX5FXA2zlclTnyPz+xQ2jJ2NGrYZBLFszaUznSP+gsYjzE97QDNYIR1be/bLx9axWwAJsp83VFHBDRXg==
+  dependencies:
+    micromark "~2.11.0"
+    vfile-message "^2.0.0"
+
+micromark-extension-mdxjs@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-0.1.0.tgz#53d35be8ae9f74c97dc7931aafbda6b6442a856d"
+  integrity sha512-RwCnrN+JQCbUXUDWZLJVMpHzzZ27uR89b17xV+dYkffu967XepfszwsDD9a5L0Ww86X3+iHFei+V+wOH8j2zww==
+  dependencies:
+    acorn "^8.0.0"
+    acorn-jsx "^5.0.0"
+    micromark "~2.11.0"
+    micromark-extension-mdx-expression "~0.1.0"
+    micromark-extension-mdx-jsx "~0.1.0"
+    micromark-extension-mdx-md "~0.1.0"
+    micromark-extension-mdxjs-esm "~0.1.0"
+
+micromark@~2.11.0:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.2.tgz#e8b6a05f54697d2d3d27fc89600c6bc40dd05f35"
+  integrity sha512-IXuP76p2uj8uMg4FQc1cRE7lPCLsfAXuEfdjtdO55VRiFO1asrCSQ5g43NmPqFtRwzEnEhafRVzn2jg0UiKArQ==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -19357,11 +19691,6 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-fn@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
-  integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
-
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -19652,11 +19981,16 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -19694,9 +20028,9 @@ multipipe@^1.0.2:
     object-assign "^4.1.0"
 
 mustache@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2"
-  integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.1.0.tgz#8c1b042238a982d2eb2d30efc6c14296ae3f699d"
+  integrity sha512-0FsgP/WVq4mKyjolIyX+Z9Bd+3WS8GOwoUTyKXT5cTYMGeauNTi2HPCwERqseC1IHAy0Z7MDZnJBfjabd4O8GQ==
 
 mutation-observer@^1.0.3:
   version "1.0.3"
@@ -19911,6 +20245,15 @@ nlcst-search@^1.0.0:
     nlcst-normalize "^2.1.0"
     unist-util-visit "^1.0.0"
 
+nlcst-search@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nlcst-search/-/nlcst-search-2.0.0.tgz#d5f3b8509b0ecfb1d39760122c2acd84f71bd94d"
+  integrity sha512-+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw==
+  dependencies:
+    nlcst-is-literal "^1.0.0"
+    nlcst-normalize "^2.0.0"
+    unist-util-visit "^2.0.0"
+
 nlcst-to-string@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz#9315dfab80882bbfd86ddf1b706f53622dc400cc"
@@ -19923,13 +20266,13 @@ no-case@^2.2.0, no-case@^2.3.2:
   dependencies:
     lower-case "^1.1.1"
 
-no-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
-  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
   dependencies:
-    lower-case "^2.0.1"
-    tslib "^1.10.0"
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
 
 node-addon-api@^1.7.1:
   version "1.7.2"
@@ -19990,11 +20333,6 @@ node-forge@^0.7.1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
   integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
 
-node-gyp-build@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
-  integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
-
 node-gyp@^5.0.2:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
@@ -20102,7 +20440,7 @@ node-preload@^0.2.1:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^1.1.47, node-releases@^1.1.52, node-releases@^1.1.58, node-releases@^1.1.66:
+node-releases@^1.1.47, node-releases@^1.1.52, node-releases@^1.1.58, node-releases@^1.1.67:
   version "1.1.67"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
   integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
@@ -20426,22 +20764,22 @@ object-hash@^2.0.1:
   integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
 object-inspect@^1.7.0, object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
 
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
-object-is@^1.0.1, object-is@^1.1.2, object-is@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
-  integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
+object-is@^1.0.1, object-is@^1.1.2, object-is@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
+  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
 
 object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
   version "1.1.1"
@@ -20470,7 +20808,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1:
+object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -20481,31 +20819,33 @@ object.assign@^4.1.0, object.assign@^4.1.1:
     object-keys "^1.1.1"
 
 object.entries@^1.0.4, object.entries@^1.1.0, object.entries@^1.1.1, object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
+  integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
+object.fromentries@^2.0.2, object.fromentries@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.3.tgz#13cefcffa702dc67750314a3305e8cb3fad1d072"
+  integrity sha512-IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544"
+  integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -20515,13 +20855,13 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
+  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
 obuf@^1.0.0, obuf@^1.1.2:
@@ -21012,12 +21352,12 @@ param-case@2.1.x, param-case@^2.1.0:
     no-case "^2.2.0"
 
 param-case@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
-  integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
   dependencies:
-    dot-case "^3.0.3"
-    tslib "^1.10.0"
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
 
 parcel-bundler@^1.12.3, parcel-bundler@^1.12.4:
   version "1.12.4"
@@ -21277,13 +21617,13 @@ pascal-case@^2.0.0:
     camel-case "^3.0.0"
     upper-case-first "^1.1.0"
 
-pascal-case@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
-  integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
+pascal-case@^3.1.1, pascal-case@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
   dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -22465,9 +22805,9 @@ prettier@^1.18.2:
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 prettier@^2.0.5, prettier@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
-  integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-bytes@^3.0.0:
   version "3.0.1"
@@ -22772,7 +23112,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pupa@^2.0.1:
+pupa@^2.0.1, pupa@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
   integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
@@ -22804,7 +23144,7 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.5.2:
+qs@^6.9.4:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
   integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
@@ -22955,9 +23295,9 @@ raw-loader@^3.1.0:
     schema-utils "^2.0.1"
 
 razzle-dev-utils@latest:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/razzle-dev-utils/-/razzle-dev-utils-3.3.7.tgz#ad69efb628224643002ac070fae1578aabe2051c"
-  integrity sha512-pXUuwOfU2UdQ9CpJHbqbjRt6BF6FDmeyzfv9U60yFTEDnbsM1SBhYxNu0IIkHrj7PWjFxnsAXT+fQejNdTHQfg==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/razzle-dev-utils/-/razzle-dev-utils-3.3.8.tgz#1a2cbfd3685526fd773109bb23ebe7d79197306f"
+  integrity sha512-gw++mONgoLdYwBEIgW6Qm9EwBbeiLWxI/bF36rRzuySMHa5yKp8E4BoWRD4EtV/9jEVh0/pp2TO3ArCG02EuQw==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     chalk "3.0.0"
@@ -22970,18 +23310,18 @@ razzle-dev-utils@latest:
     webpack-dev-server "~3.10.3"
 
 razzle-plugin-mdx@^3.1.5:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/razzle-plugin-mdx/-/razzle-plugin-mdx-3.3.7.tgz#e78e26355be4f905ff1a6ac606de688c779cfcd1"
-  integrity sha512-b7Irqxhj+CGkoYjnY2hIW/KbIoWfyt3w7ohGOn5hu03sgoQtyLLe2ckj6VtUG8YPC9b12mrR0YtQB5pgwwIdIA==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/razzle-plugin-mdx/-/razzle-plugin-mdx-3.3.8.tgz#d3726579bc99367a5334e00d6fb1f1e84c9e355f"
+  integrity sha512-/c5gEXvdiNINCnmeGIKE2me5f2FLrGjwVgsHbLnTKTYyHf/Z/Qk6EpZ9vZNsPBL0aRvml/36SOzdAaFlDfiwIA==
   dependencies:
     "@mdx-js/loader" "^0.15.0-0"
     "@mdx-js/mdx" "^0.15.0-0"
     razzle-dev-utils latest
 
 razzle@^3.1.5:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/razzle/-/razzle-3.3.7.tgz#aca0ee4f50729f904f39208cedc43e00fd0d60a7"
-  integrity sha512-R9P50/Hgi3wEpBERskSAx1u13uBSimtxg7xWX/de57PMMLoQhr4fDwxUZxLBGHIe1sN1xm+jp7zcx9Y70EU/Og==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/razzle/-/razzle-3.3.8.tgz#42e5f5413efa4561be1487cc67ca9ccde2e1bd9d"
+  integrity sha512-uQrGF699HFy/3i7zlbGFREwEUFVvfmw99xmwvGDSsivUa+/oUe6jfzclnHF9RSIVyDKC0DgxQqTrvdSN9V3UKQ==
   dependencies:
     "@babel/core" "7.11.1"
     "@pmmmwh/react-refresh-webpack-plugin" "0.3.0"
@@ -23790,6 +24130,16 @@ rebass@^4.0.7:
   dependencies:
     reflexbox "^4.0.6"
 
+recast@^0.20.4:
+  version "0.20.4"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.4.tgz#db55983eac70c46b3fff96c8e467d65ffb4a7abc"
+  integrity sha512-6qLIBGGRcwjrTZGIiBpJVC/NeuXpogXNyRQpqU1zWPUigCphvApoCs9KIwDYh1eDuJ6dAFlQoi/QUyE5KQ6RBQ==
+  dependencies:
+    ast-types "0.14.2"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tslib "^2.0.1"
+
 recursive-readdir@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99"
@@ -24102,13 +24452,13 @@ remark-autolink-headings@^6.0.0:
     extend "^3.0.0"
     unist-util-visit "^2.0.0"
 
-remark-cli@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-8.0.1.tgz#093e9f27c1d56a591f4c44c017de5749d4e79a08"
-  integrity sha512-UaYeFI5qUAzkthUd8/MLBQD5OKM6jLN8GRvF6v+KF7xO/i1jQ+X2VqUSQAxWFYxZ8R25gM56GVjeoKOZ0EIr8A==
+remark-cli@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-9.0.0.tgz#6f7951e7a72217535f2e32b7a6d3f638fe182f86"
+  integrity sha512-y6kCXdwZoMoh0Wo4Och1tDW50PmMc86gW6GpF08v9d+xUCEJE2wwXdQ+TnTaUamRnfFdU+fE+eNf2PJ53cyq8g==
   dependencies:
     markdown-extensions "^1.1.0"
-    remark "^12.0.0"
+    remark "^13.0.0"
     unified-args "^8.0.0"
 
 remark-comment-config@^5.0.0:
@@ -24118,6 +24468,13 @@ remark-comment-config@^5.0.0:
   dependencies:
     mdast-comment-marker "^1.0.1"
 
+remark-comment-config@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/remark-comment-config/-/remark-comment-config-6.0.0.tgz#057f780a3cc3afd9572912575e6948941ba956ba"
+  integrity sha512-hpv4RS6AASn+ah+j9k+3+RsQmtAfRbt2evXCEoW/9W93CJ7PLkxCgeoNnkssGjQ6mLNV6vS5vNflSVIJALn29Q==
+  dependencies:
+    mdast-comment-marker "^1.0.1"
+
 remark-emoji@2.1.0, remark-emoji@^2.0.1, remark-emoji@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.1.0.tgz#69165d1181b98a54ad5d9ef811003d53d7ebc7db"
@@ -24127,16 +24484,36 @@ remark-emoji@2.1.0, remark-emoji@^2.0.1, remark-emoji@^2.1.0:
     node-emoji "^1.10.0"
     unist-util-visit "^2.0.2"
 
-remark-footnotes@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-1.0.0.tgz#9c7a97f9a89397858a50033373020b1ea2aad011"
-  integrity sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g==
-
 remark-footnotes@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
+remark-footnotes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-3.0.0.tgz#5756b56f8464fa7ed80dbba0c966136305d8cb8d"
+  integrity sha512-ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==
+  dependencies:
+    mdast-util-footnote "^0.1.0"
+    micromark-extension-footnote "^0.3.0"
+
+remark-gfm@1.0.0, remark-gfm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
+  integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
+  dependencies:
+    mdast-util-gfm "^0.1.0"
+    micromark-extension-gfm "^0.3.0"
+
+remark-github@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/remark-github/-/remark-github-10.0.1.tgz#d258d73fb6bf33a9d42e5a8f04931d684bec06cf"
+  integrity sha512-iPF467c+bs4vi+vFyDjZCLlKNmHbWF5uo6IIILsHMbbP3dEqsI+m40zMmxY978Z2dUdl6YKiyf07uZad9bFMmw==
+  dependencies:
+    mdast-util-find-and-replace "^1.0.0"
+    mdast-util-to-string "^1.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-github@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/remark-github/-/remark-github-9.0.1.tgz#82d05783754b9756ae63984a4afd5282318fbab1"
@@ -24188,6 +24565,16 @@ remark-lint-checkbox-character-style@^2.0.0:
     unist-util-visit "^2.0.0"
     vfile-location "^3.0.0"
 
+remark-lint-checkbox-character-style@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-checkbox-character-style/-/remark-lint-checkbox-character-style-3.0.0.tgz#3a982c7318ea86f80fe5ee5d6d8711b5b3cad0a2"
+  integrity sha512-691OJ5RdBRXVpvnOEiBhMB4uhHJSHVttw83O4qyAkNBiqxa1Axqhsz8FgmzYgRLQbOGd2ncVUcXG1LOJt6C0DQ==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-checkbox-content-indent@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-2.0.1.tgz#6730ff34aad5d8f389c02e6371b03cb9885aeb09"
@@ -24199,6 +24586,17 @@ remark-lint-checkbox-content-indent@^2.0.0:
     unist-util-visit "^2.0.0"
     vfile-location "^3.0.0"
 
+remark-lint-checkbox-content-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-checkbox-content-indent/-/remark-lint-checkbox-content-indent-3.0.0.tgz#fa2b74b81cbac9db23e2d3e5954421cabc78072e"
+  integrity sha512-+T4+hoY85qZE2drD2rCe14vF7fAgD3Kv2fkFd1HRvv3M5Riy148w/4YeoBI5U5BpybGTVUeEUYLCeJ8zbJLjkw==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+    vfile-location "^3.0.0"
+
 remark-lint-code-block-style@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz#448b0f2660acfcdfff2138d125ff5b1c1279c0cb"
@@ -24334,6 +24732,16 @@ remark-lint-list-item-bullet-indent@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-list-item-bullet-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-list-item-bullet-indent/-/remark-lint-list-item-bullet-indent-3.0.0.tgz#3c902e75e841850da8b37126da45fc1fe850d7d6"
+  integrity sha512-X2rleWP8XReC4LXKF7Qi5vYiPJkA4Grx5zxsjHofFrVRz6j0PYOCuz7vsO+ZzMunFMfom6FODnscSWz4zouDVw==
+  dependencies:
+    pluralize "^8.0.0"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-list-item-indent@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz#c6472514e17bc02136ca87936260407ada90bf8d"
@@ -24387,6 +24795,17 @@ remark-lint-no-blockquote-without-marker@^3.0.0:
     unist-util-visit "^2.0.0"
     vfile-location "^3.0.0"
 
+remark-lint-no-blockquote-without-marker@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-4.0.0.tgz#856fb64dd038fa8fc27928163caa24a30ff4d790"
+  integrity sha512-Y59fMqdygRVFLk1gpx2Qhhaw5IKOR9T38Wf7pjR07bEFBGUNfcoNVIFMd1TCJfCPQxUyJzzSqfZz/KT7KdUuiQ==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+    vfile-location "^3.0.0"
+
 remark-lint-no-consecutive-blank-lines@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-2.0.1.tgz#4163fa21619fe69325333f83eed8a933ed32e7ec"
@@ -24398,6 +24817,17 @@ remark-lint-no-consecutive-blank-lines@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-consecutive-blank-lines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-3.0.0.tgz#c8fe11095b8f031a1406da273722bd4a9174bf41"
+  integrity sha512-kmzLlOLrapBKEngwYFTdCZDmeOaze6adFPB7G0EdymD9V1mpAlnneINuOshRLEDKK5fAhXKiZXxdGIaMPkiXrA==
+  dependencies:
+    pluralize "^8.0.0"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-no-duplicate-defined-urls@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-defined-urls/-/remark-lint-no-duplicate-defined-urls-1.0.1.tgz#c1c8da32979f6e109f9254f407ea6d25a9d28504"
@@ -24497,6 +24927,18 @@ remark-lint-no-heading-content-indent@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-heading-content-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-heading-content-indent/-/remark-lint-no-heading-content-indent-3.0.0.tgz#faa323a52fcb5db9b3ce16cb8e417e43ab433af1"
+  integrity sha512-yULDoVSIqKylLDfW6mVUbrHlyEWUSFtVFiKc+/BA412xDIhm8HZLUnP+FsuBC0OzbIZ+bO9Txy52WtO3LGnK1A==
+  dependencies:
+    mdast-util-heading-style "^1.0.2"
+    pluralize "^8.0.0"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-no-heading-indent@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-2.0.1.tgz#0dcf741e120bf5c59e34554d6a5ac030b931777d"
@@ -24508,6 +24950,17 @@ remark-lint-no-heading-indent@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-heading-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-heading-indent/-/remark-lint-no-heading-indent-3.0.0.tgz#2304b8525929c7eb189d34aaaa59871ae480d1b3"
+  integrity sha512-b8ImhLv2AnRDxtYUODplzsl/7IwQ+lqRmD1bwbZgSerEP9MLaULW3SjH37EyA6z+8rCDjvEyppKKU6zec0TCjg==
+  dependencies:
+    pluralize "^8.0.0"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-no-heading-like-paragraph@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-heading-like-paragraph/-/remark-lint-no-heading-like-paragraph-2.0.1.tgz#f16fa95a928aa580a46052913921d455f54d1fcf"
@@ -24546,6 +24999,16 @@ remark-lint-no-inline-padding@^2.0.0:
     unist-util-generated "^1.1.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-inline-padding@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-3.0.0.tgz#14c2722bcddc648297a54298107a922171faf6eb"
+  integrity sha512-3s9uW3Yux9RFC0xV81MQX3bsYs+UY7nPnRuMxeIxgcVwxQ4E/mTJd9QjXUwBhU9kdPtJ5AalngdmOW2Tgar8Cg==
+  dependencies:
+    mdast-util-to-string "^1.0.2"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-no-literal-urls@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz#731908f9866c1880e6024dcee1269fb0f40335d6"
@@ -24587,6 +25050,16 @@ remark-lint-no-paragraph-content-indent@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-paragraph-content-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-paragraph-content-indent/-/remark-lint-no-paragraph-content-indent-3.0.0.tgz#405ffd75b16c00e816c11178569ae692f84143e1"
+  integrity sha512-breI0QSFAxvs2osc8yAzPqWoi4VfY9ccyV+/WQKOIIU8yTj8swN/kFFqnP7wdeY4O9BSmUJ7bPdWCsmrVworXA==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+    vfile-location "^3.0.0"
+
 remark-lint-no-reference-like-url@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-reference-like-url/-/remark-lint-no-reference-like-url-2.0.1.tgz#e44a1c5026b7b90a98dd6d66fffda14dd32529dd"
@@ -24633,6 +25106,16 @@ remark-lint-no-table-indentation@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-table-indentation@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-3.0.0.tgz#f3c3fc24375069ec8e510f43050600fb22436731"
+  integrity sha512-+l7GovI6T+3LhnTtz/SmSRyOb6Fxy6tmaObKHrwb/GAebI/4MhFS1LVo3vbiP/RpPYtyQoFbbuXI55hqBG4ibQ==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+    vfile-location "^3.0.0"
+
 remark-lint-no-tabs@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-tabs/-/remark-lint-no-tabs-2.0.1.tgz#abb30e6d61a6add664a1e26325ef9febc65c1528"
@@ -24651,6 +25134,18 @@ remark-lint-no-undefined-references@^2.0.0:
     unist-util-generated "^1.1.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-no-undefined-references@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-no-undefined-references/-/remark-lint-no-undefined-references-3.0.0.tgz#59dab8f815f8de9f1dcbd69e7cc705978e931cb0"
+  integrity sha512-0hzaJS9GuzSQVOeeNdJr/s66LRQOzp618xuOQPYWHcJdd+SCaRTyWbjMrTM/cCI5L1sYjgurp410NkIBQ32Vqg==
+  dependencies:
+    collapse-white-space "^1.0.4"
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.1.0"
+    unist-util-visit "^2.0.0"
+    vfile-location "^3.1.0"
+
 remark-lint-no-unneeded-full-reference-image@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-no-unneeded-full-reference-image/-/remark-lint-no-unneeded-full-reference-image-2.0.1.tgz#55bb158c2743f08fe03ad194f24fa729cf1736cf"
@@ -24730,6 +25225,16 @@ remark-lint-table-cell-padding@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-table-cell-padding@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-3.0.0.tgz#a769ba1999984ff5f90294fb6ccb8aead7e8a12f"
+  integrity sha512-sEKrbyFZPZpxI39R8/r+CwUrin9YtyRwVn0SQkNQEZWZcIpylK+bvoKIldvLIXQPob+ZxklL0GPVRzotQMwuWQ==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-table-pipe-alignment@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz#12b7e4c54473d69c9866cb33439c718d09cffcc5"
@@ -24750,6 +25255,16 @@ remark-lint-table-pipes@^2.0.0:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+remark-lint-table-pipes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-3.0.0.tgz#b30b055d594cae782667eec91c6c5b35928ab259"
+  integrity sha512-QPokSazEdl0Y8ayUV9UB0Ggn3Jos/RAQwIo0z1KDGnJlGDiF80Jc6iU9RgDNUOjlpQffSLIfSVxH5VVYF/K3uQ==
+  dependencies:
+    unified-lint-rule "^1.0.0"
+    unist-util-generated "^1.1.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 remark-lint-unordered-list-marker-style@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz#e64692aa9594dbe7e945ae76ab2218949cd92477"
@@ -24767,21 +25282,31 @@ remark-lint@^7.0.0:
   dependencies:
     remark-message-control "^6.0.0"
 
-remark-math@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-3.0.1.tgz#85a02a15b15cad34b89a27244d4887b3a95185bb"
-  integrity sha512-epT77R/HK0x7NqrWHdSV75uNLwn8g9qTyMqCRCDujL0vj/6T6+yhdrR7mjELWtkse+Fw02kijAaBuVcHBor1+Q==
+remark-lint@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-8.0.0.tgz#6e40894f4a39eaea31fc4dd45abfaba948bf9a09"
+  integrity sha512-ESI8qJQ/TIRjABDnqoFsTiZntu+FRifZ5fJ77yX63eIDijl/arvmDvT+tAf75/Nm5BFL4R2JFUtkHRGVjzYUsg==
+  dependencies:
+    remark-message-control "^6.0.0"
 
-remark-mdx@1.6.21, remark-mdx@^1.6.16:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.21.tgz#0c1a7e042e50938ff89ad8dd7e8e219d4b0404ce"
-  integrity sha512-IGb3l46a6NFi62egT+WXeTT3T8wYTunmPCEGTfDO6oRAfuss9VAb/3InVCKKGXXoiNi0mTuplI0EFusdCLGk3A==
+remark-math@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-4.0.0.tgz#494ddd50766555ad2332e3afca7796a76452256f"
+  integrity sha512-lH7SoQenXtQrvL0bm+mjZbvOk//YWNuyR+MxV18Qyv8rgFmMEGNuB0TSCQDkoDaiJ40FCnG8lxErc/zhcedYbw==
   dependencies:
-    "@babel/core" "7.11.6"
+    mdast-util-math "^0.1.0"
+    micromark-extension-math "^0.1.0"
+
+remark-mdx@1.6.22, remark-mdx@^1.6.16:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
+  integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==
+  dependencies:
+    "@babel/core" "7.12.9"
     "@babel/helper-plugin-utils" "7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "7.11.0"
-    "@babel/plugin-syntax-jsx" "7.10.4"
-    "@mdx-js/util" "1.6.21"
+    "@babel/plugin-proposal-object-rest-spread" "7.12.1"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@mdx-js/util" "1.6.22"
     is-alphabetical "1.0.4"
     remark-parse "8.0.3"
     unified "9.2.0"
@@ -24794,29 +25319,7 @@ remark-message-control@^6.0.0:
     mdast-comment-marker "^1.0.0"
     unified-message-control "^3.0.0"
 
-remark-parse@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.2.tgz#5999bc0b9c2e3edc038800a64ff103d0890b318b"
-  integrity sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==
-  dependencies:
-    ccount "^1.0.0"
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^2.0.0"
-    vfile-location "^3.0.0"
-    xtend "^4.0.1"
-
-remark-parse@8.0.3, remark-parse@^8.0.0, remark-parse@^8.0.2, remark-parse@^8.0.3:
+remark-parse@8.0.3, remark-parse@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
   integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
@@ -24838,6 +25341,13 @@ remark-parse@8.0.3, remark-parse@^8.0.0, remark-parse@^8.0.2, remark-parse@^8.0.
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
+remark-parse@9.0.0, remark-parse@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
+  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
+  dependencies:
+    mdast-util-from-markdown "^0.8.0"
+
 remark-parse@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
@@ -24902,6 +25412,28 @@ remark-preset-lint-recommended@^4.0.0:
     remark-lint-no-unused-definitions "^2.0.0"
     remark-lint-ordered-list-marker-style "^2.0.0"
 
+remark-preset-lint-recommended@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/remark-preset-lint-recommended/-/remark-preset-lint-recommended-5.0.0.tgz#cc0da5bf532a47392e01ad2ee34c8076edad1207"
+  integrity sha512-uu+Ab8JCwMMaKvvB0LOWTWtM3uAvJbKQM/oyWCEJqj7lUVNTKZS575Ro5rKM3Dx7kQjjR1iw0e99bpAYTc5xNA==
+  dependencies:
+    remark-lint "^8.0.0"
+    remark-lint-final-newline "^1.0.0"
+    remark-lint-hard-break-spaces "^2.0.0"
+    remark-lint-list-item-bullet-indent "^3.0.0"
+    remark-lint-list-item-indent "^2.0.0"
+    remark-lint-no-auto-link-without-protocol "^2.0.0"
+    remark-lint-no-blockquote-without-marker "^4.0.0"
+    remark-lint-no-duplicate-definitions "^2.0.0"
+    remark-lint-no-heading-content-indent "^3.0.0"
+    remark-lint-no-inline-padding "^3.0.0"
+    remark-lint-no-literal-urls "^2.0.0"
+    remark-lint-no-shortcut-reference-image "^2.0.0"
+    remark-lint-no-shortcut-reference-link "^2.0.0"
+    remark-lint-no-undefined-references "^3.0.0"
+    remark-lint-no-unused-definitions "^2.0.0"
+    remark-lint-ordered-list-marker-style "^2.0.0"
+
 remark-preset-prettier@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/remark-preset-prettier/-/remark-preset-prettier-0.4.0.tgz#b0edae6b46286c255ca897d44901145867585ab3"
@@ -24970,6 +25502,70 @@ remark-preset-wooorm@^7.0.0:
     retext-preset-wooorm "^2.0.0"
     unified "^9.0.0"
 
+remark-preset-wooorm@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/remark-preset-wooorm/-/remark-preset-wooorm-8.0.1.tgz#0cd2560177e2bff24f6b782577c2d241fa58b360"
+  integrity sha512-Dk1eduxMSgyfPTSWMMGhuDlbeoQbx+yjwitrVE+gYmCo1EBn+oKpsTjYbF0jKhDIEMKOfCqMJgH5gfa5UnLByA==
+  dependencies:
+    remark-comment-config "^6.0.0"
+    remark-gfm "^1.0.0"
+    remark-github "^10.0.0"
+    remark-lint-blockquote-indentation "^2.0.0"
+    remark-lint-checkbox-character-style "^3.0.0"
+    remark-lint-checkbox-content-indent "^3.0.0"
+    remark-lint-code-block-style "^2.0.0"
+    remark-lint-definition-case "^2.0.0"
+    remark-lint-definition-spacing "^2.0.0"
+    remark-lint-emphasis-marker "^2.0.0"
+    remark-lint-fenced-code-flag "^2.0.0"
+    remark-lint-fenced-code-marker "^2.0.0"
+    remark-lint-file-extension "^1.0.0"
+    remark-lint-final-definition "^2.0.0"
+    remark-lint-first-heading-level "^2.0.0"
+    remark-lint-heading-style "^2.0.0"
+    remark-lint-link-title-style "^2.0.0"
+    remark-lint-maximum-heading-length "^2.0.0"
+    remark-lint-maximum-line-length "^2.0.0"
+    remark-lint-no-consecutive-blank-lines "^3.0.0"
+    remark-lint-no-duplicate-defined-urls "^1.0.0"
+    remark-lint-no-duplicate-definitions "^2.0.0"
+    remark-lint-no-duplicate-headings-in-section "^2.0.0"
+    remark-lint-no-emphasis-as-heading "^2.0.0"
+    remark-lint-no-empty-url "^2.0.0"
+    remark-lint-no-file-name-articles "^1.0.0"
+    remark-lint-no-file-name-consecutive-dashes "^1.0.0"
+    remark-lint-no-file-name-irregular-characters "^1.0.0"
+    remark-lint-no-file-name-mixed-case "^1.0.0"
+    remark-lint-no-file-name-outer-dashes "^1.0.0"
+    remark-lint-no-heading-content-indent "^3.0.0"
+    remark-lint-no-heading-indent "^3.0.0"
+    remark-lint-no-heading-like-paragraph "^2.0.0"
+    remark-lint-no-heading-punctuation "^2.0.0"
+    remark-lint-no-html "^2.0.0"
+    remark-lint-no-missing-blank-lines "^2.0.0"
+    remark-lint-no-multiple-toplevel-headings "^2.0.0"
+    remark-lint-no-paragraph-content-indent "^3.0.0"
+    remark-lint-no-reference-like-url "^2.0.0"
+    remark-lint-no-shell-dollars "^2.0.0"
+    remark-lint-no-table-indentation "^3.0.0"
+    remark-lint-no-tabs "^2.0.0"
+    remark-lint-no-unneeded-full-reference-image "^2.0.0"
+    remark-lint-no-unneeded-full-reference-link "^2.0.0"
+    remark-lint-ordered-list-marker-value "^2.0.0"
+    remark-lint-rule-style "^2.0.0"
+    remark-lint-strong-marker "^2.0.0"
+    remark-lint-table-cell-padding "^3.0.0"
+    remark-lint-table-pipe-alignment "^2.0.0"
+    remark-lint-table-pipes "^3.0.0"
+    remark-lint-unordered-list-marker-style "^2.0.0"
+    remark-preset-lint-recommended "^5.0.0"
+    remark-retext "^4.0.0"
+    remark-toc "^7.0.0"
+    remark-validate-links "^10.0.0"
+    retext-english "^3.0.0"
+    retext-preset-wooorm "^3.0.0"
+    unified "^9.0.0"
+
 remark-retext@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/remark-retext/-/remark-retext-3.1.3.tgz#77173b1d9d13dab15ce5b38d996195fea522ee7f"
@@ -25036,7 +25632,7 @@ remark-stringify@^6.0.0:
     unherit "^1.0.4"
     xtend "^4.0.1"
 
-remark-stringify@^8.0.0, remark-stringify@^8.1.0, remark-stringify@^8.1.1:
+remark-stringify@^8.1.0, remark-stringify@^8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz#e2a9dc7a7bf44e46a155ec78996db896780d8ce5"
   integrity sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==
@@ -25056,6 +25652,13 @@ remark-stringify@^8.0.0, remark-stringify@^8.1.0, remark-stringify@^8.1.1:
     unherit "^1.0.4"
     xtend "^4.0.1"
 
+remark-stringify@^9.0.0, remark-stringify@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
+  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
 remark-toc@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/remark-toc/-/remark-toc-7.0.0.tgz#d0f455b63fed00cccfe08050d75c2abef4508e38"
@@ -25087,14 +25690,14 @@ remark@^10.0.1:
     remark-stringify "^6.0.0"
     unified "^7.0.0"
 
-remark@^12.0.0:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz#f1ddf68db7be71ca2bad0a33cd3678b86b9c709f"
-  integrity sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==
+remark@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
+  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
   dependencies:
-    remark-parse "^8.0.0"
-    remark-stringify "^8.0.0"
-    unified "^9.0.0"
+    remark-parse "^9.0.0"
+    remark-stringify "^9.0.0"
+    unified "^9.1.0"
 
 remove-accents@0.4.2:
   version "0.4.2"
@@ -25383,6 +25986,15 @@ retext-contractions@^3.0.0:
     nlcst-to-string "^2.0.0"
     unist-util-visit "^1.1.0"
 
+retext-contractions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retext-contractions/-/retext-contractions-4.0.0.tgz#cef6b7f7949a87e17e073fa7e0f8f9a29db61f74"
+  integrity sha512-0T+QE+mFBfYiZHqD+86yM19PjEN3w6Z2boTWpYZb4L6JyzMN4luHUzNHwaL8HtkbxHEe0j8yqLrYnTD+qoOEyw==
+  dependencies:
+    nlcst-is-literal "^1.0.0"
+    nlcst-to-string "^2.0.0"
+    unist-util-visit "^2.0.0"
+
 retext-diacritics@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/retext-diacritics/-/retext-diacritics-2.0.0.tgz#db4f6da81d42acae34fb149500421dec1f26af78"
@@ -25394,6 +26006,17 @@ retext-diacritics@^2.0.0:
     quotation "^1.0.1"
     unist-util-position "^3.0.0"
 
+retext-diacritics@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/retext-diacritics/-/retext-diacritics-3.0.0.tgz#d98046f55d5864f53e7f1b59dcafe3352ecac71b"
+  integrity sha512-QayeY2hpQ1UEsPlderfl6k90sA+mSxnlOMqiA3N5teDPyKo3REwkm+o/fClCxjLSm6NJgqNthOZjjSBUgQvSSw==
+  dependencies:
+    match-casing "^1.0.0"
+    nlcst-search "^2.0.0"
+    nlcst-to-string "^2.0.0"
+    quotation "^1.0.1"
+    unist-util-position "^3.0.0"
+
 retext-english@^3.0.0, retext-english@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/retext-english/-/retext-english-3.0.4.tgz#f978828d51fbcee842bc3807a45b7f709822ea8d"
@@ -25413,6 +26036,17 @@ retext-indefinite-article@^1.1.0:
     unist-util-is "^3.0.0"
     unist-util-visit "^1.1.0"
 
+retext-indefinite-article@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/retext-indefinite-article/-/retext-indefinite-article-2.0.1.tgz#8a51a2fa05fcefa63783026de4a51365db2c0dfd"
+  integrity sha512-rOaVwz24DHR8v7/RtX8b0ZvSXjw4071YxoLrFWAk54Lx/yB5EKLxVFjQtbeE5IroX+2w+3Uizk68731ra0cNCw==
+  dependencies:
+    format "^0.2.2"
+    nlcst-to-string "^2.0.0"
+    number-to-words "^1.2.3"
+    unist-util-is "^4.0.0"
+    unist-util-visit "^2.0.0"
+
 retext-preset-wooorm@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/retext-preset-wooorm/-/retext-preset-wooorm-2.0.0.tgz#dd174d634945192704122284f6fcf192b7210179"
@@ -25426,6 +26060,19 @@ retext-preset-wooorm@^2.0.0:
     retext-repeated-words "^2.0.0"
     retext-sentence-spacing "^3.0.0"
 
+retext-preset-wooorm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/retext-preset-wooorm/-/retext-preset-wooorm-3.0.0.tgz#659a1730a2f2b795a029c78d6195d94f1ef061dd"
+  integrity sha512-mzxzW+V0iF4ygunqoukVBtjpgNX2cB7eCZ7IF5GNQA3QExqJF40bVQeCkW3fI/c1vC3OitNlpjz3R66i58sslA==
+  dependencies:
+    retext-contractions "^4.0.0"
+    retext-diacritics "^3.0.0"
+    retext-indefinite-article "^2.0.0"
+    retext-quotes "^4.0.0"
+    retext-redundant-acronyms "^3.0.0"
+    retext-repeated-words "^3.0.0"
+    retext-sentence-spacing "^4.0.0"
+
 retext-quotes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/retext-quotes/-/retext-quotes-3.0.0.tgz#47f772e886b9b513dc6f1b97c482e15b1446b84a"
@@ -25435,6 +26082,15 @@ retext-quotes@^3.0.0:
     unist-util-is "^3.0.0"
     unist-util-visit "^1.1.0"
 
+retext-quotes@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retext-quotes/-/retext-quotes-4.0.0.tgz#c2adb2e2582825ab65a25b8b8f81ae2f950b82c8"
+  integrity sha512-YtHJ3Yw0yk8sGp0FMAVWe2a/q0DaHjSKfrAYkO5rZXLofGYYG+LCoqzqlX0tbfae1ImlsqhsLVCuZ0fkUO087g==
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit "^2.0.0"
+
 retext-redundant-acronyms@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/retext-redundant-acronyms/-/retext-redundant-acronyms-2.0.0.tgz#e4fb92a97b0db76dfa20192e0d3915470458e80c"
@@ -25448,6 +26104,19 @@ retext-redundant-acronyms@^2.0.0:
     unist-util-find-after "^2.0.0"
     unist-util-position "^3.0.0"
 
+retext-redundant-acronyms@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/retext-redundant-acronyms/-/retext-redundant-acronyms-3.0.0.tgz#778271064fb55ce6aac06ffe77ac2f12f3682efe"
+  integrity sha512-pu5um9ObH+j/AguHPVm+u23DK43zey2Jim0dmzccczvilbIRiYh7ZQMSOIuLNpE+7jNP0quX3oe/ommrLlwECQ==
+  dependencies:
+    nlcst-normalize "^2.0.0"
+    nlcst-search "^2.0.0"
+    nlcst-to-string "^2.0.0"
+    pluralize "^8.0.0"
+    quotation "^1.0.0"
+    unist-util-find-after "^3.0.0"
+    unist-util-position "^3.0.0"
+
 retext-repeated-words@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/retext-repeated-words/-/retext-repeated-words-2.0.0.tgz#93e8f5b81b76388910b1453a0d9c527460e95637"
@@ -25457,6 +26126,15 @@ retext-repeated-words@^2.0.0:
     unist-util-is "^3.0.0"
     unist-util-visit "^1.1.0"
 
+retext-repeated-words@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/retext-repeated-words/-/retext-repeated-words-3.0.0.tgz#741fa9ff82a8c900d52e2697649813740aaa11f7"
+  integrity sha512-c9awbCxn3h+SVVYwEeJA+rcWWFiOvxrcD8MVFpyVpWu0q1cXG7NIyWclEzXDV12SkqKgR/vmBJh3tIJCfxmDAA==
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit "^2.0.0"
+
 retext-sentence-spacing@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/retext-sentence-spacing/-/retext-sentence-spacing-3.0.0.tgz#bfdfc4fc5990f816cc79a6caa335046878208300"
@@ -25466,6 +26144,15 @@ retext-sentence-spacing@^3.0.0:
     unist-util-is "^3.0.0"
     unist-util-visit "^1.1.0"
 
+retext-sentence-spacing@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retext-sentence-spacing/-/retext-sentence-spacing-4.0.0.tgz#d2c9d1923015aacf0ec92031f7167c19f9d7492a"
+  integrity sha512-CKdHlVBbZDkdjxZ1IctBQ1u4/sHQraGoTuI8qvB2C4jSaM0MEY0hxpMdVjnznWAWm4VOqwSXZDkR71Pv6Yw0TA==
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit "^2.0.0"
+
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
@@ -25499,11 +26186,6 @@ rework@1.0.1:
     convert-source-map "^0.3.3"
     css "^2.0.0"
 
-rewrite-imports@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/rewrite-imports/-/rewrite-imports-2.0.3.tgz#210fc05ebda6a6c6a2e396608b0146003d510dda"
-  integrity sha512-R7ICJEeP3y+d/q4C8YEJj9nRP0JyiSqG07uc0oQh8JvAe706dDFVL95GBZYCjADqmhArZWWjfM/5EcmVu4/B+g==
-
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -25890,9 +26572,11 @@ semver@7.0.0:
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
 semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 send@0.17.1:
   version "0.17.1"
@@ -26541,9 +27225,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
-  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -26609,6 +27293,11 @@ srcset@^3.0.0:
   resolved "https://registry.yarnpkg.com/srcset/-/srcset-3.0.0.tgz#8afd8b971362dfc129ae9c1a99b3897301ce6441"
   integrity sha512-D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ==
 
+sse-z@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/sse-z/-/sse-z-0.3.0.tgz#e215db7c303d6c4a4199d80cb63811cc28fa55b9"
+  integrity sha512-jfcXynl9oAOS9YJ7iqS2JMUEHOlvrRAD+54CENiWnc4xsuVLQVSgmwf7cwOTcBd/uq3XkQKBGojgvEtVXcJ/8w==
+
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -26677,9 +27366,9 @@ stack-trace@0.0.10, stack-trace@^0.0.10:
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 stack-utils@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz#db7a475733b5b8bf6521907b18891d29006f7751"
-  integrity sha512-WldO+YmqhEpjp23eHZRhOT1NQF51STsbxZ+/AdpFD+EhheFxAe5d0WoK4DQVJkSHacPrJJX3OqRAl9CgHf78pg==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz#4b600971dcfc6aed0cbdf2a8268177cc916c87c8"
+  integrity sha512-IPDJfugEGbfizBwBZRZ3xpccMdRyP5lqsBWXGQWimVjua/ccLCeMOAVjlc1R7LxFjo5sEDhyNIXd8mo/AiDS9w==
   dependencies:
     escape-string-regexp "^2.0.0"
 
@@ -26815,6 +27504,11 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
+streamsearch@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+  integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -26984,7 +27678,7 @@ stringify-entities@^1.0.1:
     is-alphanumerical "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-stringify-entities@^3.0.0, stringify-entities@^3.0.1:
+stringify-entities@^3.0.0, stringify-entities@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903"
   integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==
@@ -27009,7 +27703,7 @@ strip-ansi@3.0.1, strip-ansi@^3, strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@5.2.0, strip-ansi@^5, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -27268,17 +27962,6 @@ stylis@3.5.4, stylis@^3.5.0:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
   integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
 
-subscriptions-transport-ws@0.9.18:
-  version "0.9.18"
-  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz#bcf02320c911fbadb054f7f928e51c6041a37b97"
-  integrity sha512-tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA==
-  dependencies:
-    backo2 "^1.0.2"
-    eventemitter3 "^3.1.0"
-    iterall "^1.2.1"
-    symbol-observable "^1.0.4"
-    ws "^5.2.0"
-
 sudo-prompt@^8.2.0:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-8.2.5.tgz#cc5ef3769a134bb94b24a631cc09628d4d53603e"
@@ -27326,9 +28009,9 @@ supports-hyperlinks@^2.0.0:
     supports-color "^7.0.0"
 
 svelte@^3.15.0:
-  version "3.29.7"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.29.7.tgz#e254eb2d0d609ce0fd60f052d444ac4a66d90f7d"
-  integrity sha512-rx0g311kBODvEWUU01DFBUl3MJuJven04bvTVFUG/w0On/wuj0PajQY/QlXcJndFxG+W1s8iXKaB418tdHWc3A==
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.31.0.tgz#13966e5f55b975bc86675469bb2c58dd0e558d97"
+  integrity sha512-r+n8UJkDqoQm1b+3tA3Lh6mHXKpcfOSOuEuIo5gE2W9wQYi64RYX/qE6CZBDDsP/H4M+N426JwY7XGH4xASvGQ==
 
 svg-parser@^2.0.0:
   version "2.0.4"
@@ -27374,7 +28057,7 @@ swimmer@^1.4.0:
   dependencies:
     babel-runtime "^6.26.0"
 
-symbol-observable@^1.0.4, symbol-observable@^1.2.0:
+symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -27532,7 +28215,7 @@ term-size@^2.1.0:
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
-terminal-link@^2.0.0:
+terminal-link@^2.0.0, terminal-link@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
   integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
@@ -28015,11 +28698,12 @@ tryer@^1.0.0, tryer@^1.0.1:
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
 ts-node@^9:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3"
-  integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg==
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
+  integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
   dependencies:
     arg "^4.1.0"
+    create-require "^1.1.0"
     diff "^4.0.1"
     make-error "^1.1.1"
     source-map-support "^0.5.17"
@@ -28055,7 +28739,7 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@~2.0.1:
+tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
   integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
@@ -28243,9 +28927,9 @@ typography@^0.16.19:
     typography-normalize "^0.16.19"
 
 ua-parser-js@^0.7.18:
-  version "0.7.22"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
-  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+  version "0.7.23"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
+  integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==
 
 uglify-js@3.4.x:
   version "3.4.10"
@@ -28256,9 +28940,9 @@ uglify-js@3.4.x:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.0.tgz#b943f129275c41d435eb54b643bbffee71dccf57"
-  integrity sha512-8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA==
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.1.tgz#78307f539f7b9ca5557babb186ea78ad30cc0375"
+  integrity sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -28584,9 +29268,9 @@ unist-util-is@^3.0.0:
   integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
 
 unist-util-is@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d"
-  integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.4.tgz#3e9e8de6af2eb0039a59f50c9b3e99698a924f50"
+  integrity sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==
 
 unist-util-map@^1.0.5:
   version "1.0.5"
@@ -28602,7 +29286,7 @@ unist-util-modify-children@^2.0.0:
   dependencies:
     array-iterate "^1.0.0"
 
-unist-util-position@^3.0.0:
+unist-util-position@^3.0.0, unist-util-position@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
   integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
@@ -28621,6 +29305,13 @@ unist-util-remove-position@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+unist-util-remove-position@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-3.0.0.tgz#4cd19e82c8e665f462b6acfcfd0a8353235a88e9"
+  integrity sha512-17kIOuolVuK16LMb9KyMJlqdfCtlfQY5FjY3Sdo9iC7F5wqdXhNjMq0PBvMpkVNNnAmHxXssUW+rZ9T2zbP0Rg==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
 unist-util-remove@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488"
@@ -28647,7 +29338,7 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
   integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
 
-unist-util-stringify-position@^2.0.0, unist-util-stringify-position@^2.0.3:
+unist-util-stringify-position@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
   integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
@@ -28781,7 +29472,7 @@ update-notifier@^2.3.0, update-notifier@^2.5.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-update-notifier@^4.1.0, update-notifier@^4.1.3:
+update-notifier@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
   integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==
@@ -28800,6 +29491,26 @@ update-notifier@^4.1.0, update-notifier@^4.1.3:
     semver-diff "^3.1.1"
     xdg-basedir "^4.0.0"
 
+update-notifier@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.0.1.tgz#1f92d45fb1f70b9e33880a72dd262bc12d22c20d"
+  integrity sha512-BuVpRdlwxeIOvmc32AGYvO1KVdPlsmqSh8KDDBxS6kDE5VR7R8OMP1d8MdhaVBvxl4H3551k9akXr0Y1iIB2Wg==
+  dependencies:
+    boxen "^4.2.0"
+    chalk "^4.1.0"
+    configstore "^5.0.1"
+    has-yarn "^2.1.0"
+    import-lazy "^2.1.0"
+    is-ci "^2.0.0"
+    is-installed-globally "^0.3.2"
+    is-npm "^5.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.1.0"
+    pupa "^2.1.1"
+    semver "^7.3.2"
+    semver-diff "^3.1.1"
+    xdg-basedir "^4.0.0"
+
 upper-case-first@^1.1.0, upper-case-first@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115"
@@ -28894,13 +29605,6 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-utf-8-validate@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27"
-  integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A==
-  dependencies:
-    node-gyp-build "^4.2.0"
-
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -28945,18 +29649,6 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-util@^0.12.0:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
-  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    safe-buffer "^5.1.2"
-    which-typed-array "^1.1.2"
-
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -28973,9 +29665,9 @@ uuid@3.4.0, uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.3.3, uui
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.0:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 v8-compile-cache@^1.1.2:
   version "1.1.2"
@@ -29066,9 +29758,9 @@ vfile-message@^1.0.0:
     unist-util-stringify-position "^1.1.1"
 
 vfile-reporter@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz#45d4dc11df2e312196ea2ceb95e42a67fc8ce814"
-  integrity sha512-0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz#cbddaea2eec560f27574ce7b7b269822c191a676"
+  integrity sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA==
   dependencies:
     repeat-string "^1.5.0"
     string-width "^4.0.0"
@@ -29107,14 +29799,13 @@ vfile@^3.0.0:
     unist-util-stringify-position "^1.0.0"
     vfile-message "^1.0.0"
 
-vfile@^4.0.0, vfile@^4.1.1, vfile@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
-  integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==
+vfile@^4.0.0, vfile@^4.1.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
   dependencies:
     "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
-    replace-ext "1.0.0"
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
@@ -29139,9 +29830,9 @@ vue-hot-reload-api@^2.3.0:
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 "vue-loader-v16@npm:vue-loader@^16.0.0-beta.7":
-  version "16.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.0.0-rc.2.tgz#b6a7e7f30d28f35659a83de41f4a1831a4232a04"
-  integrity sha512-cz8GK4dgIf1UTC+do80pGvh8BHcCRHLIQVHV9ONVQ8wtoqS9t/+H02rKcQP+TVNg7khgLyQV2+8eHUq7/AFq3g==
+  version "16.1.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.1.1.tgz#f5b286d60ac6886684c63a17a184391cc9e0199a"
+  integrity sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==
   dependencies:
     chalk "^4.1.0"
     hash-sum "^2.0.0"
@@ -29460,19 +30151,6 @@ webpack-dev-server@^3.11.0, webpack-dev-server@^3.8.0:
     ws "^6.2.1"
     yargs "^13.3.2"
 
-webpack-external-import@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/webpack-external-import/-/webpack-external-import-2.2.4.tgz#954c0a43f27af5e01db0c6454eee8232cebce8a5"
-  integrity sha512-yJUHeu/UaZ8o0gCQyor6nsjEVdgc3ao8w7E6j28Dh1BanMxnqm0PumdElh2C5z/DMTcw1knQbpEArRo6/knNog==
-  dependencies:
-    assert "^2.0.0"
-    dimport "^1.0.0"
-    fs-extra "^8.1.0"
-    loadjs "^4.2.0"
-    mem "^6.0.1"
-    pkg-up "^3.1.0"
-    tapable "^1.1.3"
-
 webpack-flush-chunks@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/webpack-flush-chunks/-/webpack-flush-chunks-2.0.3.tgz#77a4f18d101f889ec33456a0c64a8c0f8b4600db"
@@ -29749,18 +30427,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-websocket@1.0.32:
-  version "1.0.32"
-  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.32.tgz#1f16ddab3a21a2d929dec1687ab21cfdc6d3dbb1"
-  integrity sha512-i4yhcllSP4wrpoPMU2N0TQ/q0O94LRG/eUQjEAamRltjQ1oT1PFFKOG4i877OlJgCG8rw6LrrowJp+TYCEWF7Q==
-  dependencies:
-    bufferutil "^4.0.1"
-    debug "^2.2.0"
-    es5-ext "^0.10.50"
-    typedarray-to-buffer "^3.1.5"
-    utf-8-validate "^5.0.2"
-    yaeti "^0.0.6"
-
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
@@ -29842,12 +30508,13 @@ which-pm-runs@^1.0.0:
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
 which-typed-array@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
-  integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
+  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
   dependencies:
     available-typed-arrays "^1.0.2"
-    es-abstract "^1.17.5"
+    call-bind "^1.0.0"
+    es-abstract "^1.18.0-next.1"
     foreach "^2.0.5"
     function-bind "^1.1.1"
     has-symbols "^1.0.1"
@@ -30096,6 +30763,15 @@ wrap-ansi@^6.0.0, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrapped@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz#c783d9d807b273e9b01e851680a938c87c907242"
@@ -30176,6 +30852,11 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
+ws@7.4.1, ws@^7.1.2, ws@^7.2.3, ws@^7.3.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb"
+  integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==
+
 ws@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
@@ -30198,11 +30879,6 @@ ws@^6.0.0, ws@^6.1.2, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.1.2, ws@^7.2.3, ws@^7.3.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7"
-  integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==
-
 ws@~6.1.0:
   version "6.1.4"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
@@ -30290,9 +30966,9 @@ xo@^0.32.1:
     update-notifier "^4.1.0"
 
 xregexp@^4.3.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz#29660f5d6567cd2ef981dd4a50cb05d22c10719d"
-  integrity sha512-83y4aa8o8o4NZe+L+46wpa+F1cWR/wCGOWI3tzqUso0w3/KAvXy0+Di7Oe/cbNMixDR4Jmi7NEybWU6ps25Wkg==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz#c84a88fa79e9ab18ca543959712094492185fe65"
+  integrity sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag==
   dependencies:
     "@babel/runtime-corejs3" "^7.12.1"
 
@@ -30305,9 +30981,9 @@ xss@^1.0.6:
     cssfilter "0.0.10"
 
 xstate@^4.11.0, xstate@^4.9.1:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.14.0.tgz#dd9f3f0af4acd04a01b3ad60d3d4c66c51ac1b5d"
-  integrity sha512-nz+T5rlPl0Vu1L9NZdI7JYVq57k/pKpyLwmztqgcj/HqUVsopnMKBP6cQJCb4Op9TC8kffyJSMwHDFthuRpooQ==
+  version "4.15.1"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.15.1.tgz#0553453c1cd201fedaf35a3cc518fe56090dbc3a"
+  integrity sha512-8dD/GnTwxUuDr/cY42vi+Enu4mpbuUXWISYJ0a9BC+cIFvqufJsepyDLS6lLsznfUP0GS5Yx9m3IQWFhAoGt/A==
 
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
@@ -30322,20 +30998,20 @@ xtend@~2.1.1:
     object-keys "~0.4.0"
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+
+y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
 
 yaassertion@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/yaassertion/-/yaassertion-1.0.2.tgz#f1a90166e1cc4ad44dbb71487009ebca017e9874"
   integrity sha512-sBoJBg5vTr3lOpRX0yFD+tz7wv/l2UPMFthag4HGTMPrypBRKerjjS8jiEnNMjcAEtPXjbHiKE0UwRR1W1GXBg==
 
-yaeti@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
-  integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=
-
 yallist@^2.0.0, yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -30403,7 +31079,7 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.3:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
@@ -30476,6 +31152,19 @@ yargs@^15.0.0, yargs@^15.0.2, yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.1.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yarn-deduplicate@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-3.1.0.tgz#3018d93e95f855f236a215b591fe8bc4bcabba3e"