From 477e5f9df8f96158ebf34e4714261e2d2a28f6d2 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 1 Nov 2018 14:19:26 +0100 Subject: [PATCH 1/7] Don't add `metaString` prop Fixes https://github.com/zeit/next-plugins/issues/307 --- packages/mdx/mdx-ast-to-mdx-hast.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js index c7c5b28ea..b3b5b9fdb 100644 --- a/packages/mdx/mdx-ast-to-mdx-hast.js +++ b/packages/mdx/mdx-ast-to-mdx-hast.js @@ -29,12 +29,12 @@ module.exports = function mdxAstToMdxHast() { if (lang) { props.className = ['language-' + lang] } - - props.metaString = node.lang && node.lang.replace(langRegex, '').trim() + + const metaString = node.lang && node.lang.replace(langRegex, '').trim() const meta = - props.metaString && - props.metaString.split(' ').reduce((acc, cur) => { + metaString && + metaString.split(' ').reduce((acc, cur) => { if (cur.split('=').length > 1) { const t = cur.split('=') acc[t[0]] = t[1] From 372270c0a3bca346e8b6ec0f132cdcb8904022f8 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 1 Nov 2018 14:20:08 +0100 Subject: [PATCH 2/7] Remove `metaString` prop from test assert --- packages/mdx/test/index.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdx/test/index.test.js b/packages/mdx/test/index.test.js index 239172471..8d6b48031 100644 --- a/packages/mdx/test/index.test.js +++ b/packages/mdx/test/index.test.js @@ -82,7 +82,7 @@ COPY start.sh /home/start.sh ) expect(result).toContain( - `props={{"className":"language-dockerfile","metaString":"exec registry=something.com","exec":true,"registry":"something.com"}}` + `props={{"className":"language-dockerfile","exec":true,"registry":"something.com"}}` ) }) From 1cfc15ddbabb0fa2b467a9b9ad60135d3433890d Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Sat, 3 Nov 2018 21:51:49 +0100 Subject: [PATCH 3/7] Replace metaString prop by metastring --- packages/mdx/mdx-ast-to-mdx-hast.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js index b3b5b9fdb..9c9ff2c86 100644 --- a/packages/mdx/mdx-ast-to-mdx-hast.js +++ b/packages/mdx/mdx-ast-to-mdx-hast.js @@ -30,11 +30,11 @@ module.exports = function mdxAstToMdxHast() { props.className = ['language-' + lang] } - const metaString = node.lang && node.lang.replace(langRegex, '').trim() + props.metastring = node.lang && node.lang.replace(langRegex, '').trim() const meta = - metaString && - metaString.split(' ').reduce((acc, cur) => { + props.metastring && + props.metastring.split(' ').reduce((acc, cur) => { if (cur.split('=').length > 1) { const t = cur.split('=') acc[t[0]] = t[1] From ba74efd7640913b8520743f7ce0802e37ff212b7 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Sat, 3 Nov 2018 21:55:06 +0100 Subject: [PATCH 4/7] Fix metastring prop test --- packages/mdx/test/index.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdx/test/index.test.js b/packages/mdx/test/index.test.js index 8d6b48031..37251bcdb 100644 --- a/packages/mdx/test/index.test.js +++ b/packages/mdx/test/index.test.js @@ -82,7 +82,7 @@ COPY start.sh /home/start.sh ) expect(result).toContain( - `props={{"className":"language-dockerfile","exec":true,"registry":"something.com"}}` + `props={{"className":"language-dockerfile","metastring":"exec registry=something.com","exec":true,"registry":"something.com"}}` ) }) From 482ba56627ad84f7c5be964faf302a3f4977cc43 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Sat, 1 Dec 2018 18:58:42 +0100 Subject: [PATCH 5/7] Convert metastring to undefined if null --- packages/mdx/mdx-ast-to-mdx-hast.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js index a39e1c37c..ae144d64d 100644 --- a/packages/mdx/mdx-ast-to-mdx-hast.js +++ b/packages/mdx/mdx-ast-to-mdx-hast.js @@ -29,7 +29,9 @@ function mdxAstToMdxHast() { props.className = ['language-' + lang] } - props.metastring = node.meta + // mdast sets `node.meta` to `null` instead of `undefined` if + // not present which React doesn't like. + props.metastring = node.meta || undefined const meta = node.meta && From d6a47b911a705783184afa61b47301d4aab321f6 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Sat, 1 Dec 2018 19:07:20 +0100 Subject: [PATCH 6/7] Add extra comma to comment --- packages/mdx/mdx-ast-to-mdx-hast.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js index ae144d64d..018b33e1a 100644 --- a/packages/mdx/mdx-ast-to-mdx-hast.js +++ b/packages/mdx/mdx-ast-to-mdx-hast.js @@ -30,7 +30,7 @@ function mdxAstToMdxHast() { } // mdast sets `node.meta` to `null` instead of `undefined` if - // not present which React doesn't like. + // not present, which React doesn't like. props.metastring = node.meta || undefined const meta = From 7c091dce713d84004e2ce7dcbd60e981dfd0c029 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Sun, 2 Dec 2018 12:38:10 +0100 Subject: [PATCH 7/7] Fix lint --- packages/mdx/mdx-ast-to-mdx-hast.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mdx/mdx-ast-to-mdx-hast.js b/packages/mdx/mdx-ast-to-mdx-hast.js index 018b33e1a..7bacc412f 100644 --- a/packages/mdx/mdx-ast-to-mdx-hast.js +++ b/packages/mdx/mdx-ast-to-mdx-hast.js @@ -29,7 +29,7 @@ function mdxAstToMdxHast() { props.className = ['language-' + lang] } - // mdast sets `node.meta` to `null` instead of `undefined` if + // Mdast sets `node.meta` to `null` instead of `undefined` if // not present, which React doesn't like. props.metastring = node.meta || undefined