From 5e5bb7b9e0fbcea0a7b620a92861efb29d4d5411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <victorystick@gmail.com>
Date: Fri, 28 Aug 2015 17:57:49 +0200
Subject: [PATCH] Updated ES6 finalizer

---
 src/finalisers/es6.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/finalisers/es6.js b/src/finalisers/es6.js
index 4b19430..c99595d 100644
--- a/src/finalisers/es6.js
+++ b/src/finalisers/es6.js
@@ -1,9 +1,11 @@
+import { keys } from '../utils/object';
 
-function specifiersFor ( scope ) {
-	return scope.getNames()
+function specifiersFor ( externalModule ) {
+	return keys( externalModule.importedByBundle )
 		.filter( notDefault )
+		.sort()
 		.map( name => {
-			const id = scope.lookup( name );
+			const id = externalModule.exports.lookup( name );
 
 			return name !== id.name ? `${name} as ${id.name}` : name;
 		});
@@ -25,13 +27,11 @@ export default function es6 ( bundle, magicString ) {
 			}
 
 			if ( module.needsAll ) {
-				specifiers.push( '* as ' + module.importedByBundle.filter( declaration =>
-					declaration.name === '*' )[0].localName );
+				specifiers.push( '* as ' + module.name );
 			}
 
 			if ( module.needsNamed ) {
-				specifiers.push( '{ ' + specifiersFor( module.exports )
-					.join( ', ' ) + ' }' );
+				specifiers.push( '{ ' + specifiersFor( module ).join( ', ' ) + ' }' );
 			}
 
 			return specifiers.length ?