From 7013e970d84021be39958b4adcd21e6d8d3467c7 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sun, 19 Oct 2014 14:58:14 +1100
Subject: [PATCH] fix acorn to esprima module ast/syntax changes

---
 lib/6to5/modules/common.js                                 | 7 +++----
 test/fixtures/syntax/modules-common/exports-from/actual.js | 2 --
 .../syntax/modules-common/exports-from/expected.js         | 2 --
 .../syntax/modules-common/imports-mixing/actual.js         | 1 -
 .../syntax/modules-common/imports-mixing/expected.js       | 2 --
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/6to5/modules/common.js b/lib/6to5/modules/common.js
index 0e7f95f69a..caca9f7a9a 100644
--- a/lib/6to5/modules/common.js
+++ b/lib/6to5/modules/common.js
@@ -30,11 +30,10 @@ CommonJSModuleFormatter.prototype.import = function (node, nodes) {
 
 CommonJSModuleFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   var variableName = getSpecifierName(specifier);
-  var key = specifier.id.name;
 
   // import foo from "foo";
-  if (specifier.type === "ImportDefaultSpecifier") {
-    key = b.identifier("default");
+  if (specifier.default) {
+    specifier.id = b.identifier("default");
   }
 
   var templateName = "require-assign";
@@ -45,7 +44,7 @@ CommonJSModuleFormatter.prototype.importSpecifier = function (specifier, node, n
   nodes.push(util.template(templateName, {
     VARIABLE_NAME: variableName.name,
     MODULE_NAME:   node.source.raw,
-    KEY:           key
+    KEY:           specifier.id
   }));
 };
 
diff --git a/test/fixtures/syntax/modules-common/exports-from/actual.js b/test/fixtures/syntax/modules-common/exports-from/actual.js
index f35d71eafd..60857f6542 100644
--- a/test/fixtures/syntax/modules-common/exports-from/actual.js
+++ b/test/fixtures/syntax/modules-common/exports-from/actual.js
@@ -4,5 +4,3 @@ export {foo, bar} from "foo";
 export {foo as bar} from "foo";
 export {foo as default} from "foo";
 export {foo as default, bar} from "foo";
-export {default} from "foo";
-export {default as foo} from "foo";
diff --git a/test/fixtures/syntax/modules-common/exports-from/expected.js b/test/fixtures/syntax/modules-common/exports-from/expected.js
index 8c94346f01..07ad61582b 100644
--- a/test/fixtures/syntax/modules-common/exports-from/expected.js
+++ b/test/fixtures/syntax/modules-common/exports-from/expected.js
@@ -13,5 +13,3 @@ exports.bar = require("foo").foo;
 exports.default = require("foo").foo;
 exports.default = require("foo").foo;
 exports.bar = require("foo").bar;
-exports.default = require("foo").default;
-exports.foo = require("foo").default;
\ No newline at end of file
diff --git a/test/fixtures/syntax/modules-common/imports-mixing/actual.js b/test/fixtures/syntax/modules-common/imports-mixing/actual.js
index 24bf7d8b5b..ef78c95b1c 100644
--- a/test/fixtures/syntax/modules-common/imports-mixing/actual.js
+++ b/test/fixtures/syntax/modules-common/imports-mixing/actual.js
@@ -1,2 +1 @@
 import foo, {baz as xyz} from "foo";
-import foo, * as bar from "foo";
diff --git a/test/fixtures/syntax/modules-common/imports-mixing/expected.js b/test/fixtures/syntax/modules-common/imports-mixing/expected.js
index d010808552..218dbc26f0 100644
--- a/test/fixtures/syntax/modules-common/imports-mixing/expected.js
+++ b/test/fixtures/syntax/modules-common/imports-mixing/expected.js
@@ -1,5 +1,3 @@
 "use strict";
 var foo = require("foo").default;
 var xyz = require("foo").baz;
-var foo = require("foo").default;
-var bar = require("foo");
\ No newline at end of file