Merge pull request #233 from mbostock/fix-require-collision

Fix #232 - require collision.

src/transform.js

@@ -91,7 +91,11 @@ export default function transformCommonjs ( code, id, isEntry, ignoreGlobal, ign
 		if ( existing === undefined ) {
 			sources.push( source );
 
-			if ( !name ) name = `require$$${uid++}`;
+			if ( !name ) {
+				do name = `require$$${uid++}`;
+				while ( scope.contains( name ) );
+			}
+
 			required[ source ] = { source, name, importsDefault: false };
 		}
 

test/form/require-collision/input.js

@@ -0,0 +1,5 @@
+(function() {
+  var foo = require("foo");
+  var require$$0 = "FAIL";
+  console.log(foo);
+})();

test/form/require-collision/output.js

@@ -0,0 +1,15 @@
+import 'foo';
+import require$$1 from 'commonjs-proxy:foo';
+
+(function() {
+  var foo = require$$1;
+  var require$$0 = "FAIL";
+  console.log(foo);
+})();
+
+var input = {
+
+};
+
+export default input;
+export { input as __moduleExports };