From 57ba6947c301765d49ccf612639a36c6d552a012 Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Thu, 22 Nov 2018 22:24:02 +0100 Subject: [PATCH] Remove `default` field from `import` nodes Closes GH-313. --- packages/mdx/index.js | 8 ++++++-- packages/remark-mdx/index.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/mdx/index.js b/packages/mdx/index.js index da8eba590..e7b8640c1 100644 --- a/packages/mdx/index.js +++ b/packages/mdx/index.js @@ -25,13 +25,17 @@ const tokenizeEsSyntax = (eat, value) => { const index = value.indexOf(EMPTY_NEWLINE) const subvalue = index !== -1 ? value.slice(0, index) : value - if (isExport(subvalue) || isImport(subvalue)) { + if (isExport(subvalue)) { return eat(subvalue)({ - type: isExport(subvalue) ? 'export' : 'import', + type: 'export', default: isExportDefault(subvalue), value: subvalue }) } + + if (isImport(subvalue)) { + return eat(subvalue)({type: 'import', value: subvalue}) + } } tokenizeEsSyntax.locator = (value, fromIndex) => { diff --git a/packages/remark-mdx/index.js b/packages/remark-mdx/index.js index f4f714719..ed6c7c2cb 100644 --- a/packages/remark-mdx/index.js +++ b/packages/remark-mdx/index.js @@ -69,13 +69,17 @@ function tokenizeEsSyntax(eat, value) { const index = value.indexOf(EMPTY_NEWLINE) const subvalue = index !== -1 ? value.slice(0, index) : value - if (isExport(subvalue) || isImport(subvalue)) { + if (isExport(subvalue)) { return eat(subvalue)({ - type: isExport(subvalue) ? 'export' : 'import', + type: 'export', default: isExportDefault(subvalue), value: subvalue }) } + + if (isImport(subvalue)) { + return eat(subvalue)({type: 'import', value: subvalue}) + } } function tokenizeEsSyntaxLocator(value, fromIndex) {