From 3139482358d4fcadf712ffbbef73dc8f7615a752 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sun, 24 May 2015 18:15:46 +0100
Subject: [PATCH] clean and fix up visitor merging

---
 .../transformation/transformers/internal/modules.js | 12 ------------
 src/babel/traversal/visitors.js                     | 13 ++++++-------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/babel/transformation/transformers/internal/modules.js b/src/babel/transformation/transformers/internal/modules.js
index fca2340d86..0ac74d8a38 100644
--- a/src/babel/transformation/transformers/internal/modules.js
+++ b/src/babel/transformation/transformers/internal/modules.js
@@ -19,17 +19,7 @@ export var metadata = {
   group: "builtin-setup"
 };
 
-export function ImportDeclaration(node, parent, scope, file) {
-  if (node.source) {
-    node.source.value = file.resolveModuleSource(node.source.value);
-  }
-}
-
-export { ImportDeclaration as ExportAllDeclaration };
-
 export function ExportDefaultDeclaration(node, parent, scope) {
-  ImportDeclaration.apply(this, arguments);
-
   var declar = node.declaration;
 
   if (t.isClassDeclaration(declar)) {
@@ -62,8 +52,6 @@ function buildExportSpecifier(id) {
 }
 
 export function ExportNamedDeclaration(node, parent, scope) {
-  ImportDeclaration.apply(this, arguments);
-
   var declar = node.declaration;
 
   if (t.isClassDeclaration(declar)) {
diff --git a/src/babel/traversal/visitors.js b/src/babel/traversal/visitors.js
index 11d8332787..c8b7ab9d7f 100644
--- a/src/babel/traversal/visitors.js
+++ b/src/babel/traversal/visitors.js
@@ -1,9 +1,10 @@
 import * as virtualTypes from "./path/virtual-types";
 import * as messages from "../messages";
 import * as t from "../types";
+import clone from "lodash/lang/clone";
 import esquery from "esquery";
 
-export function explode(visitor, mergeConflicts) {
+export function explode(visitor) {
   if (visitor._exploded) return visitor;
   visitor._exploded = true;
 
@@ -59,17 +60,15 @@ export function explode(visitor, mergeConflicts) {
     var aliases = t.FLIPPED_ALIAS_KEYS[nodeType];
     if (!aliases) continue;
 
-    // clear it form the visitor
+    // clear it from the visitor
     delete visitor[nodeType];
 
     for (var alias of (aliases: Array)) {
       var existing = visitor[alias];
       if (existing) {
-        if (mergeConflicts) {
-          mergePair(existing, fns);
-        }
+        mergePair(existing, fns);
       } else {
-        visitor[alias] = fns;
+        visitor[alias] = clone(fns);
       }
     }
   }
@@ -172,6 +171,6 @@ function shouldIgnoreKey(key) {
 
 function mergePair(dest, src) {
   for (var key in src) {
-    dest[key] = (dest[key] || []).concat(src[key]);
+    dest[key] = [].concat(dest[key] || [], src[key]);
   }
 }