Merge pull request #411 from rollup/gh-410

prevent resolution of external IDs

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+!test/node_modules
 .gobble*
 dist
 _actual

src/Bundle.js

@@ -31,9 +31,8 @@ export default class Bundle {
 		this.entryModule = null;
 
 		this.resolveId = first(
-			this.plugins
+			[ id => ~this.external.indexOf( id ) ? false : null ]
-				.map( plugin => plugin.resolveId )
+				.concat( this.plugins.map( plugin => plugin.resolveId ).filter( Boolean ) )
-				.filter( Boolean )
 				.concat( resolveId )
 		);
 
@@ -264,7 +263,7 @@ export default class Bundle {
 			if ( this.transformers.length || this.bundleTransformers.length ) {
 				map = collapseSourcemaps( map, usedModules, bundleSourcemapChain );
 			}
-			
+
 			map.sources = map.sources.map( unixizePath );
 		}
 

test/function/external-ids-not-resolved/_config.js

@@ -0,0 +1,15 @@
+module.exports = {
+	description: 'does not attempt to resolve external IDs',
+	options: {
+		external: [ 'external' ],
+		plugins: [
+			{
+				resolveId: function ( importee ) {
+					if ( importee === 'external' ) {
+						throw new Error( 'Attempted to resolve external module ID' );
+					}
+				}
+			}
+		]
+	}
+};

test/function/external-ids-not-resolved/main.js

@@ -0,0 +1,2 @@
+import foo from 'external';
+assert.ok( foo.external );

test/node_modules/external.js

@@ -0,0 +1,3 @@
+module.exports = {
+	external: true
+};