From b900a3e5c239a0d708bbeee32d3d318ef8d4c8d1 Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Thu, 30 Nov 2017 11:50:16 -0800 Subject: [PATCH] Consistently return AST nodes. --- .../src/rewrite-live-references.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/babel-helper-module-transforms/src/rewrite-live-references.js b/packages/babel-helper-module-transforms/src/rewrite-live-references.js index 29c4e9a879..a1dc3e6bfc 100644 --- a/packages/babel-helper-module-transforms/src/rewrite-live-references.js +++ b/packages/babel-helper-module-transforms/src/rewrite-live-references.js @@ -24,7 +24,7 @@ export default function rewriteLiveReferences( imported.set(localName, [source, importName, null]); } for (const localName of data.importsNamespace) { - imported.set(localName, [null, null, localName]); + imported.set(localName, [source, null, localName]); } } @@ -60,8 +60,8 @@ export default function rewriteLiveReferences( scope: programPath.scope, imported, // local / import exported, // local name => exported name list - buildImportReference: ([source, importName, localName]) => { - if (localName) return null; + buildImportReference: ([source, importName, localName], identNode) => { + if (localName) return identNode; const name = metadata.source.get(source).name; @@ -172,7 +172,7 @@ const rewriteReferencesVisitor = { const importData = imported.get(localName); if (importData) { - const ref = buildImportReference(importData) || path.node; + const ref = buildImportReference(importData, path.node); if (path.parentPath.isCallExpression({ callee: path.node })) { path.replaceWith(t.sequenceExpression([t.numericLiteral(0), ref])); @@ -225,8 +225,7 @@ const rewriteReferencesVisitor = { const assignment = path.node; if (importData) { - assignment.left = - buildImportReference(importData) || assignment.left; + assignment.left = buildImportReference(importData, assignment.left); assignment.right = t.sequenceExpression([ assignment.right,