From c738d8d388f87a8d7988ede5c67b1f88d9564fea Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Sat, 1 Aug 2015 10:09:00 -0700
Subject: [PATCH] Map commonjs named imports back to the correct location -
 fixes #1987

---
 .../src/transformation/modules/common.js      |  3 ++-
 .../imports-named/source-mappings.json        | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 packages/babel/test/fixtures/transformation/es6.modules-common/imports-named/source-mappings.json

diff --git a/packages/babel/src/transformation/modules/common.js b/packages/babel/src/transformation/modules/common.js
index 55aced378f..c23a8434ca 100644
--- a/packages/babel/src/transformation/modules/common.js
+++ b/packages/babel/src/transformation/modules/common.js
@@ -92,7 +92,8 @@ export default class CommonJSFormatter extends DefaultFormatter {
         ]));
       } else {
         // import { foo } from "foo";
-        this.remaps.add(scope, variableName.name, t.memberExpression(ref, specifier.imported));
+        this.remaps.add(scope, variableName.name,
+          t.memberExpression(ref, t.identifier(specifier.imported.name)));
       }
     }
   }
diff --git a/packages/babel/test/fixtures/transformation/es6.modules-common/imports-named/source-mappings.json b/packages/babel/test/fixtures/transformation/es6.modules-common/imports-named/source-mappings.json
new file mode 100644
index 0000000000..1b44ef3d04
--- /dev/null
+++ b/packages/babel/test/fixtures/transformation/es6.modules-common/imports-named/source-mappings.json
@@ -0,0 +1,19 @@
+[{
+  "original": {
+    "line": 6,
+    "column": 0
+  },
+  "generated": {
+    "line": 5,
+    "column": 6
+  }
+}, {
+  "original": {
+    "line": 9,
+    "column": 0
+  },
+  "generated": {
+    "line": 8,
+    "column": 6
+  }
+}]