Merge pull request #1548 from rollup/gh-1547

ignore external namespace imports when deshadowing

src/ast/scopes/ModuleScope.js

@@ -21,7 +21,7 @@ export default class ModuleScope extends Scope {
 			if ( specifier.module.isExternal ) return;
 
 			const addDeclaration = declaration => {
-				if ( declaration.isNamespace ) {
+				if ( declaration.isNamespace && !declaration.isExternal ) {
 					declaration.module.getExports().forEach( name => {
 						addDeclaration( declaration.module.traceExport(name) );
 					});

test/function/samples/deshadowed-namespaced-external-import-ignored/_config.js

@@ -0,0 +1,12 @@
+module.exports = {
+	description: '#1547',
+	options: {
+		external: ['external']
+	},
+	context: {
+		require: id => {
+			if (id === 'external') return { foo: () => 42 };
+			throw new Error('huh?');
+		}
+	}
+};

test/function/samples/deshadowed-namespaced-external-import-ignored/foo.js

@@ -0,0 +1,2 @@
+import * as ns from 'external';
+export { ns };

test/function/samples/deshadowed-namespaced-external-import-ignored/main.js

@@ -0,0 +1,10 @@
+import { ns } from './foo.js';
+
+assert.equal((() => {
+	function foo() {
+		return ns.foo();
+	}
+
+	return foo();
+})(), 42);
+

test/function/samples/deshadowed-namespaced-external-import-ignored/ns.js

@@ -0,0 +1,3 @@
+export function foo() {
+	return 42;
+}